Compare commits
118 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
8d2049f118 | ||
|
d560af9955 | ||
|
489c698b1d | ||
|
9ccf0f9982 | ||
|
888b8b48c3 | ||
|
4f665ba9bf | ||
|
8d3174b4d1 | ||
|
40666f8fa9 | ||
|
d3af9c63ce | ||
|
517fbccf6a | ||
|
7fd800a365 | ||
|
5adb8236dc | ||
|
875f742fcb | ||
|
f855568e37 | ||
|
aa18bead3b | ||
|
4c0849c478 | ||
|
c96f2de4d8 | ||
|
f05bb0e3bd | ||
|
9e6e06fc8f | ||
|
db23d54bb9 | ||
|
ccc41bbf68 | ||
|
d5bc677813 | ||
|
ea64c5f86c | ||
|
2dd2c0af88 | ||
|
557b8ffe95 | ||
|
96b6f333be | ||
|
a7f3892536 | ||
|
ac648b1566 | ||
|
ff2b745c35 | ||
|
3c0c83ed69 | ||
|
2d77d7b115 | ||
|
074b2883a2 | ||
|
269c527620 | ||
|
739181cf16 | ||
|
bfdb61b69c | ||
|
c0cffe364d | ||
|
a385283e87 | ||
|
7ca172e1e3 | ||
|
b5cdf29653 | ||
|
104ae86fe1 | ||
|
924fabec46 | ||
|
6f36366739 | ||
|
e9a166363f | ||
|
35503329e3 | ||
|
1f2a5033b3 | ||
|
cd3f5d410f | ||
|
f8910bd07c | ||
|
8d0bc0577d | ||
|
44255d83ea | ||
|
e8eefd366d | ||
|
0223d54764 | ||
|
1e37050770 | ||
|
79949d3643 | ||
|
b73f3ccad5 | ||
|
17bdece183 | ||
|
1b97869958 | ||
|
707156e911 | ||
|
e6c8dda271 | ||
|
76a48b9d0b | ||
|
2ae1afb4d4 | ||
|
13cdb41bde | ||
|
1319c32312 | ||
|
971f1c6e44 | ||
|
a57cff48a4 | ||
|
c2df231825 | ||
|
c4f8819fc1 | ||
|
cdef64b3e7 | ||
|
a96ff9f101 | ||
|
c0835eef7a | ||
|
ef02749f11 | ||
|
edfe3cbeaf | ||
|
1e46db0fdf | ||
|
e46847e060 | ||
|
be6519d704 | ||
|
dfc6d59240 | ||
|
2b83cdb219 | ||
|
9702409130 | ||
|
532affe849 | ||
|
9a2df4e273 | ||
|
7467cdc054 | ||
|
baa6cc3b54 | ||
|
9860be4466 | ||
|
3366e102d2 | ||
|
f068b499ad | ||
|
372776ef5d | ||
|
de83fc9b7d | ||
|
a70c70e4fd | ||
|
91ee426a7c | ||
|
30bd166ad4 | ||
|
ec685a98a9 | ||
|
35ddec975f | ||
|
94502ca73a | ||
|
329a4549a2 | ||
|
0fb8f75253 | ||
|
20918ee3e8 | ||
|
a70605d247 | ||
|
c13cb72c10 | ||
|
cb4ac378ee | ||
|
dd4e12cff5 | ||
|
1bbaae18c3 | ||
|
a56fb3daf6 | ||
|
a52aea9cdd | ||
|
9b9492debc | ||
|
9df6b13fb1 | ||
|
2d99798ce1 | ||
|
6ba364f881 | ||
|
a937f36604 | ||
|
5f26f23569 | ||
|
44627b4e1d | ||
|
a5f81cc95a | ||
|
94506545e7 | ||
|
8d9849f7cf | ||
|
07d75f3b27 | ||
|
83ebd8c14a | ||
|
20385b0c9a | ||
|
c466d54273 | ||
|
d93f23c3d0 | ||
|
e38dd1b2d3 |
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,2 +1,9 @@
|
||||
camlimages-2.2.0-htmlref.tar.gz
|
||||
camlimages-2.2.0.tgz
|
||||
camlimages-3.0.1.tar.gz
|
||||
camlimages-3.0.2.tgz
|
||||
/v4.0.1.tar.gz
|
||||
/4.1.0.tar.gz
|
||||
/4.2.2.tar.gz
|
||||
/4.2.4.tar.gz
|
||||
/4.2.5.tar.gz
|
||||
|
@ -1,40 +0,0 @@
|
||||
diff -ru camlimages-2.2.old/Makefile camlimages-2.2/Makefile
|
||||
--- camlimages-2.2.old/Makefile 2004-10-03 04:49:05.000000000 +1300
|
||||
+++ camlimages-2.2/Makefile 2007-05-04 09:55:10.000000000 +1200
|
||||
@@ -92,15 +92,15 @@
|
||||
installopt: install
|
||||
|
||||
install: all
|
||||
- mkdir -p $(LIBDIR)
|
||||
+ mkdir -p $(DESTDIR)$(LIBDIR)
|
||||
if test -w $(CAMLDIR)/ld.conf \
|
||||
&& test `grep -s -c '^$(LIBDIR)$$' $(CAMLDIR)/ld.conf` = 0; then \
|
||||
echo $(LIBDIR) >> $(CAMLDIR)/ld.conf; \
|
||||
fi
|
||||
- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done
|
||||
- $(CP) Makefile.config $(LIBDIR)
|
||||
- $(CP) config.h $(LIBDIR)
|
||||
- $(RANLIB) $(LIBDIR)/*.a
|
||||
+ for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR)) || exit $$?; done
|
||||
+ $(CP) Makefile.config $(DESTDIR)$(LIBDIR)
|
||||
+ $(CP) config.h $(DESTDIR)$(LIBDIR)
|
||||
+ $(RANLIB) $(DESTDIR)$(LIBDIR)/*.a
|
||||
|
||||
depend:
|
||||
for i in $(BUILDDIRS); do (cd $$i; $(MAKE) depend) || exit $$?; done
|
||||
diff -ru camlimages-2.2.old/Makefile.shared camlimages-2.2/Makefile.shared
|
||||
--- camlimages-2.2.old/Makefile.shared 2004-10-03 03:20:09.000000000 +1300
|
||||
+++ camlimages-2.2/Makefile.shared 2007-05-04 09:53:32.000000000 +1200
|
||||
@@ -45,8 +45,10 @@
|
||||
rm -f *.cm[iox] *.o *.cma *.cmxa *.a *.so *~
|
||||
|
||||
install:: all
|
||||
- - mkdir -p $(LIBDIR)
|
||||
- - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(LIBDIR)
|
||||
+ - mkdir -p $(DESTDIR)$(LIBDIR)
|
||||
+ - mkdir -p $(DESTDIR)$(CAMLDIR)/stublibs
|
||||
+ - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a $(DESTDIR)$(LIBDIR)
|
||||
+ - cp -p *.so $(DESTDIR)$(CAMLDIR)/stublibs
|
||||
|
||||
#######
|
||||
|
24
camlimages-4.2.5-add-g-flag.patch
Normal file
24
camlimages-4.2.5-add-g-flag.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -ur camlspotter-camlimages-8ca76028cff3.old/OMakefile camlspotter-camlimages-8ca76028cff3/OMakefile
|
||||
--- camlspotter-camlimages-8ca76028cff3.old/OMakefile 2017-11-20 10:50:59.000000000 +0000
|
||||
+++ camlspotter-camlimages-8ca76028cff3/OMakefile 2017-11-22 14:19:46.903902025 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
# For release, -warn-error should not be put
|
||||
|
||||
# OCAMLFLAGS= -w A-4-9-35-37-40-41-42-44-45-48
|
||||
-OCAMLFLAGS= -w A-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string
|
||||
+OCAMLFLAGS= -w A-3-4-9-37-40-41-42-44-45-41-48-50 -safe-string -g
|
||||
|
||||
# For the development, -warn-error A is turned on
|
||||
if $(file-exists DEV)
|
||||
diff -ur camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot camlspotter-camlimages-8ca76028cff3/OMyMakeroot
|
||||
--- camlspotter-camlimages-8ca76028cff3.old/OMyMakeroot 2017-11-20 10:50:59.000000000 +0000
|
||||
+++ camlspotter-camlimages-8ca76028cff3/OMyMakeroot 2017-11-22 14:19:32.461902772 +0000
|
||||
@@ -133,7 +133,7 @@
|
||||
OCamlMkLibC(name, files, ldflags) =
|
||||
protected.COBJS=$(addsuffix .o, $(files))
|
||||
dll$(name).so lib$(name).a: $(COBJS)
|
||||
- $(OCAMLMKLIB) -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
|
||||
+ $(OCAMLMKLIB) -g -o $(name) $(LDFLAGS) $(ldflags) $(COBJS)
|
||||
return $(array dll$(name).so, lib$(name).a)
|
||||
|
||||
# If ocamlmklib does not work for you, you can do:
|
33
camlimages-4.2.5-safe-string.patch
Normal file
33
camlimages-4.2.5-safe-string.patch
Normal file
@ -0,0 +1,33 @@
|
||||
--- ./camlspotter-camlimages-8ca76028cff3.old/examples/tiffps/tiffps.ml 2017-11-20 10:50:59.000000000 +0000
|
||||
+++ ./camlspotter-camlimages-8ca76028cff3/examples/tiffps/tiffps.ml 2017-11-22 14:24:13.276888193 +0000
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
(* Scanlined loader *)
|
||||
type scanlined_loader = {
|
||||
- read_next_line: (string -> unit);
|
||||
+ read_next_line: (bytes -> unit);
|
||||
close: (unit -> unit)
|
||||
}
|
||||
|
||||
@@ -410,7 +410,7 @@
|
||||
function x ->
|
||||
let adrs = x * 3 in
|
||||
for i = 0 to 2 do
|
||||
- print_string (sprintf "%02x" (Char.code buf.[adrs+i]))
|
||||
+ print_string (sprintf "%02x" (Char.code (Bytes.get buf (adrs+i))))
|
||||
done
|
||||
else
|
||||
let mono r g b =
|
||||
@@ -418,9 +418,9 @@
|
||||
function x ->
|
||||
let adrs = x * 3 in
|
||||
let m =
|
||||
- mono (Char.code buf.[adrs])
|
||||
- (Char.code buf.[adrs + 1])
|
||||
- (Char.code buf.[adrs + 2]) in
|
||||
+ mono (Char.code (Bytes.get buf adrs))
|
||||
+ (Char.code (Bytes.get buf (adrs + 1)))
|
||||
+ (Char.code (Bytes.get buf (adrs + 2))) in
|
||||
for _i = 0 to 2 do print_string (sprintf "%02x" m) done in
|
||||
if not conf.mirror
|
||||
then for x = x1 to x1 + w - 1 do print_pixel x done
|
@ -1,83 +0,0 @@
|
||||
--- camlimages-2.2.orig/png/pngread.c 2002-03-26 13:15:10.000000000 +0000
|
||||
+++ camlimages-2.2.png/png/pngread.c 2009-10-16 10:46:07.759508515 +0100
|
||||
@@ -13,6 +13,8 @@
|
||||
/***********************************************************************/
|
||||
#include <config.h>
|
||||
|
||||
+#include <limits.h>
|
||||
+
|
||||
#if HAVE_PNG
|
||||
#include <png.h>
|
||||
#endif
|
||||
@@ -33,6 +35,12 @@
|
||||
#define PNG_TAG_INDEX16 2
|
||||
#define PNG_TAG_INDEX4 3
|
||||
|
||||
+/* Test if x or y are negative, or if multiplying x * y would cause an
|
||||
+ * arithmetic overflow.
|
||||
+ */
|
||||
+#define oversized(x, y) \
|
||||
+ ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
|
||||
+
|
||||
value read_png_file_as_rgb24( name )
|
||||
value name;
|
||||
{
|
||||
@@ -88,6 +96,9 @@
|
||||
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
|
||||
&interlace_type, NULL, NULL);
|
||||
|
||||
+ if (oversized (width, height))
|
||||
+ failwith ("png error: image contains oversized or bogus width and height");
|
||||
+
|
||||
if ( color_type == PNG_COLOR_TYPE_GRAY ||
|
||||
color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) {
|
||||
png_set_gray_to_rgb(png_ptr);
|
||||
@@ -109,10 +120,16 @@
|
||||
|
||||
rowbytes = png_get_rowbytes(png_ptr, info_ptr);
|
||||
|
||||
+ if (oversized (rowbytes, height))
|
||||
+ failwith ("png error: image contains oversized or bogus rowbytes and height");
|
||||
+
|
||||
{
|
||||
int i;
|
||||
png_bytep *row_pointers;
|
||||
|
||||
+ if (oversized (sizeof (png_bytep), height))
|
||||
+ failwith ("png error: image contains oversized or bogus height");
|
||||
+
|
||||
row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height);
|
||||
|
||||
res = alloc_tuple(3);
|
||||
@@ -242,6 +259,9 @@
|
||||
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
|
||||
&interlace_type, NULL, NULL);
|
||||
|
||||
+ if (oversized (width, height))
|
||||
+ failwith ("png error: image contains oversized or bogus width and height");
|
||||
+
|
||||
if ( color_type == PNG_COLOR_TYPE_GRAY ||
|
||||
color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) {
|
||||
png_set_gray_to_rgb(png_ptr);
|
||||
@@ -258,6 +278,9 @@
|
||||
|
||||
rowbytes = png_get_rowbytes(png_ptr, info_ptr);
|
||||
|
||||
+ if (oversized (rowbytes, height))
|
||||
+ failwith ("png error: image contains oversized or bogus rowbytes and height");
|
||||
+
|
||||
/*
|
||||
fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr);
|
||||
*/
|
||||
@@ -265,7 +288,10 @@
|
||||
int i;
|
||||
png_bytep *row_pointers;
|
||||
char mesg[256];
|
||||
-
|
||||
+
|
||||
+ if (oversized (sizeof (png_bytep), height))
|
||||
+ failwith ("png error: image contains oversized or bogus height");
|
||||
+
|
||||
row_pointers = (png_bytep*)stat_alloc(sizeof(png_bytep) * height);
|
||||
res = alloc_tuple(3);
|
||||
|
@ -1,39 +0,0 @@
|
||||
--- camlimages-2.2.orig/tiff/tiffread.c 2004-09-21 22:56:44.000000000 +0100
|
||||
+++ camlimages-2.2.tiff/tiff/tiffread.c 2009-10-16 10:47:32.515257997 +0100
|
||||
@@ -18,6 +18,13 @@
|
||||
#include <caml/memory.h>
|
||||
#include <caml/fail.h>
|
||||
|
||||
+#include <limits.h>
|
||||
+#define oversized(x, y) \
|
||||
+ ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
|
||||
+
|
||||
+#define failwith_oversized(lib) \
|
||||
+ failwith("#lib error: image contains oversized or bogus width and height");
|
||||
+
|
||||
#if HAVE_TIFF
|
||||
|
||||
/* These are defined in caml/config.h */
|
||||
@@ -68,6 +75,10 @@
|
||||
TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
|
||||
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
|
||||
|
||||
+ if (oversized (imagewidth, imagelength)) {
|
||||
+ failwith_oversized("tiff");
|
||||
+ }
|
||||
+
|
||||
if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
|
||||
if( imagebits != 8 ){
|
||||
failwith("Sorry, tiff rgb file must be 24bit-color");
|
||||
@@ -156,6 +167,11 @@
|
||||
TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT, &runit);
|
||||
TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres);
|
||||
TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
|
||||
+
|
||||
+ if (oversized (imagewidth, imagelength)) {
|
||||
+ failwith_oversized("tiff");
|
||||
+ }
|
||||
+
|
||||
if( imagesample != 3 || imagebits != 8 ) {
|
||||
failwith("tiff file is not in the 24 bit RGB format");
|
||||
}
|
@ -1,44 +1,48 @@
|
||||
# XXX This indicates a bug somewhere. We are not passing the -g flag
|
||||
# through when creating the libraries. However I cannot see exactly
|
||||
# what is wrong.
|
||||
%undefine _debugsource_packages
|
||||
|
||||
Name: ocaml-camlimages
|
||||
Version: 2.2.0
|
||||
Release: 12%{?dist}
|
||||
Version: 4.2.5
|
||||
Release: 28%{?dist}
|
||||
Summary: OCaml image processing library
|
||||
License: LGPLv2 with exceptions
|
||||
|
||||
Group: Development/Libraries
|
||||
License: LGPL
|
||||
URL: http://pauillac.inria.fr/camlimages/
|
||||
Source0: ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/camlimages-%{version}.tgz
|
||||
URL: http://gallium.inria.fr/camlimages/
|
||||
Source0: https://bitbucket.org/camlspotter/camlimages/get/%{version}.tar.gz
|
||||
|
||||
# This file isn't published any more (that I could find).
|
||||
# It's probably dated but at least should provide some info on how to
|
||||
# use the library.
|
||||
Source1: camlimages-2.2.0-htmlref.tar.gz
|
||||
Patch0: camlimages-2.2.0-stubdest.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4
|
||||
Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch
|
||||
Patch1: camlimages-4.2.5-add-g-flag.patch
|
||||
# Fix an example which has safe-string problems.
|
||||
Patch2: camlimages-4.2.5-safe-string.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=528732
|
||||
Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: lablgtk libpng-devel libjpeg-devel ocaml
|
||||
BuildRequires: libXpm-devel ghostscript-devel freetype-devel
|
||||
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
BuildRequires: rgb
|
||||
BuildRequires: libpng-devel, libjpeg-devel, libexif-devel
|
||||
BuildRequires: libXpm-devel, libgs-devel, freetype-devel
|
||||
BuildRequires: giflib-devel
|
||||
Requires: ocaml
|
||||
%define buildlibs ppm bmp xvthumb jpeg gif png xpm ps graphics freetype
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: gtk2-devel
|
||||
Requires: rgb
|
||||
|
||||
%description
|
||||
CamlImages is an image processing library for Objective CAML, which provides:
|
||||
basic functions for image processing and loading/saving, various image file
|
||||
formats (hence providing a translation facility from format to format),
|
||||
and an interface with the Caml graphics library allows to display images
|
||||
in the Graphics module screen and to mix them with Caml drawings
|
||||
|
||||
In addition, the library can handle huge images that cannot be (or can hardly
|
||||
be) stored into the main memory (the library then automatically creates swap
|
||||
files and escapes them to reduce the memory usage).
|
||||
This is an image processing library, which provides some basic
|
||||
functions of image processing and loading/saving various image file
|
||||
formats. In addition the library can handle huge images that cannot be
|
||||
(or can hardly be) stored into the memory (the library automatically
|
||||
creates swap files and escapes them to reduce the memory usage).
|
||||
|
||||
%package devel
|
||||
Summary: Development files for camlimages
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
%description devel
|
||||
The camlimages-devel package provides libraries and headers for
|
||||
developing applications using camlimages
|
||||
@ -46,71 +50,261 @@ developing applications using camlimages
|
||||
Includes documentation provided by ocamldoc
|
||||
|
||||
%prep
|
||||
%setup -q -n camlimages-2.2 -a 1
|
||||
%patch0 -p1
|
||||
%setup -q -n camlspotter-camlimages-8ca76028cff3
|
||||
%setup -q -T -D -a 1 -n camlspotter-camlimages-8ca76028cff3
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
sed -i -e 's|LIBRARYDIRS=ppm bmp xvthumb jpeg tiff gif png xpm ps graphics freetype|LIBRARYDIRS=%buildlibs|' Makefile.build.in
|
||||
%patch2 -p2
|
||||
|
||||
%build
|
||||
%configure
|
||||
make
|
||||
omake CFLAGS="$RPM_OPT_FLAGS" --verbose
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.o
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.cmo
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/camlimages/*.mli
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# These rules work if the library uses 'ocamlfind install' to install itself.
|
||||
export DESTDIR=$RPM_BUILD_ROOT
|
||||
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
|
||||
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
|
||||
omake install
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
|
||||
cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc Announce Announce-2.2 CHANGES LICENSE README doc/
|
||||
%doc README.md License.txt
|
||||
%{_libdir}/ocaml/camlimages
|
||||
%exclude %{_libdir}/ocaml/camlimages/*.a
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%exclude %{_libdir}/ocaml/camlimages/*.cmxa
|
||||
%endif
|
||||
# There aren't any *.cmx files
|
||||
#%exclude %{_libdir}/ocaml/camlimages/*.cmx
|
||||
%exclude %{_libdir}/ocaml/camlimages/*.mli
|
||||
%{_libdir}/ocaml/stublibs/*.so
|
||||
%{_libdir}/ocaml/stublibs/*.so.owner
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc htmlref/
|
||||
%{_libdir}/ocaml/camlimages
|
||||
%{_docdir}/%{name}/htmlref/
|
||||
%{_libdir}/ocaml/camlimages/*.a
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%{_libdir}/ocaml/camlimages/*.cmxa
|
||||
%endif
|
||||
# There aren't any *.cmx files
|
||||
#%{_libdir}/ocaml/camlimages/*.cmx
|
||||
%{_libdir}/ocaml/camlimages/*.mli
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 16 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-12
|
||||
- ocaml-camlimages: TIFF reader multiple integer overflows
|
||||
(CVE 2009-3296 / RHBZ#528732).
|
||||
- Changed dep back to 'lablgtk' so this can build.
|
||||
* Mon Mar 1 19:41:31 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-28
|
||||
- OCaml 4.12.0 build
|
||||
|
||||
* Fri Jul 3 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-10
|
||||
- ocaml-camlimages: PNG reader multiple integer overflows
|
||||
(CVE 2009-2295 / RHBZ#509531).
|
||||
- Changed dep from 'lablgtk' to 'ocaml-lablgtk'.
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri May 04 2007 Nigel Jones <dev@nigelj.com> 2.2.0-7
|
||||
- Change to Makefile patch to move .so files to stublibs
|
||||
- Rename to ocaml-camlimages
|
||||
- Other changes per review
|
||||
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-26
|
||||
- OCaml 4.11.1 rebuild
|
||||
|
||||
* Thu May 03 2007 Nigel Jones <dev@nigelj.com> 2.2.0-6
|
||||
- Include .*a files just to make sure
|
||||
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-25
|
||||
- OCaml 4.11.0 rebuild
|
||||
|
||||
* Thu May 03 2007 Nigel Jones <dev@nigelj.com> 2.2.0-5
|
||||
- Revert -4 changes
|
||||
- Remove excludedirs patch, replace with a sed
|
||||
- Provide html documentation generated from running ocaml-ocamldoc
|
||||
* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 4.2.5-24
|
||||
- {Build,}Require rgb not xorg-x11-server-utils
|
||||
|
||||
* Thu Apr 26 2007 Nigel Jones <dev@nigelj.com> 2.2.0-4
|
||||
- Add Provides: camlimages-static, and LICENSE to -devel docs
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Apr 12 2007 Nigel Jones <dev@nigelj.com> 2.2.0-3
|
||||
- Remove .a & .o files
|
||||
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-22
|
||||
- OCaml 4.11.0+dev2-2020-04-22 rebuild
|
||||
|
||||
* Wed Apr 11 2007 Nigel Jones <dev@nigelj.com> 2.2.0-2
|
||||
- Add missing dependencies
|
||||
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-21
|
||||
- OCaml 4.11.0 pre-release attempt 2
|
||||
|
||||
* Tue Apr 10 2007 Nigel Jones <dev@nigelj.com> 2.2.0-1
|
||||
- Initial spec file
|
||||
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-20
|
||||
- OCaml 4.11.0 pre-release
|
||||
|
||||
* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-19
|
||||
- Update all OCaml dependencies for RPM 4.16.
|
||||
|
||||
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-18
|
||||
- OCaml 4.10.0 final.
|
||||
|
||||
* Thu Feb 06 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-17
|
||||
- Remove bogus "lablgtk" dependency.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-15
|
||||
- OCaml 4.10.0+beta1 rebuild.
|
||||
|
||||
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-14
|
||||
- OCaml 4.09.0 for riscv64
|
||||
|
||||
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-13
|
||||
- OCaml 4.09.0 (final) rebuild.
|
||||
|
||||
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-12
|
||||
- OCaml 4.08.1 (final) rebuild.
|
||||
|
||||
* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-11
|
||||
- Rebuild against new ocaml-lablgtk.
|
||||
|
||||
* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-10
|
||||
- OCaml 4.08.1 (rc2) rebuild.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-6
|
||||
- OCaml 4.07.0 (final) rebuild.
|
||||
|
||||
* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-5
|
||||
- OCaml 4.07.0-rc1 rebuild.
|
||||
|
||||
* Sun Feb 11 2018 Sandro Mani <manisandro@gmail.com> - 4.2.5-4
|
||||
- Rebuild (giflib)
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2.5-3
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.5-1
|
||||
- New upstream version 4.2.5.
|
||||
- New version fixes compatibility with latest lablgtk.
|
||||
|
||||
* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.4-2
|
||||
- OCaml 4.06.0 rebuild.
|
||||
|
||||
* Wed Aug 09 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.4-1
|
||||
- New upstream version 4.2.4.
|
||||
- Replace opt test with ocaml_native_compiler.
|
||||
- Pass -g option to ocamlopt so debuginfo is generated correctly.
|
||||
|
||||
* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-7
|
||||
- OCaml 4.05.0 rebuild.
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-4
|
||||
- OCaml 4.04.2 rebuild.
|
||||
|
||||
* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-3
|
||||
- OCaml 4.04.1 rebuild.
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 4.2.2-1
|
||||
- New upstream version 4.2.2.
|
||||
- Drop patch for exif handling which is included upstream.
|
||||
- Drop patch for warn-error since this is fixed upstream.
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sun Aug 16 2015 Bruno Wolff III <bruno@wolff.to> - 4.1.0-18
|
||||
- devel shouldn't cover all doc files
|
||||
|
||||
* Tue Aug 11 2015 Bruno Wolff III <bruno@wolff.to> - 4.1.0-17
|
||||
- Don't use %%doc to copy over htmlref for -devel package
|
||||
|
||||
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-16
|
||||
- Bump release and rebuild.
|
||||
|
||||
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-15
|
||||
- OCaml 4.02.3 rebuild.
|
||||
|
||||
* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-14
|
||||
- Enable bytecode compilation.
|
||||
|
||||
* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-13
|
||||
- ocaml-4.02.2 final rebuild.
|
||||
|
||||
* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-12
|
||||
- ocaml-4.02.2 rebuild.
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-10
|
||||
- ocaml-4.02.1 rebuild.
|
||||
|
||||
* Fri Oct 31 2014 Bruno Wolff III <bruno@wolff.to> - 4.1.0-9
|
||||
- Rebuild to link with updated dependencies
|
||||
|
||||
* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-8
|
||||
- ocaml-4.02.0 final rebuild.
|
||||
|
||||
* Tue Aug 19 2014 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-7
|
||||
- Kill -warn-error A so we can build on OCaml 4.02.
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Tue Jul 15 2014 Bruno Wolff III <bruno@wolff.to> - 4.1.0-5
|
||||
- Rebuild for ocaml update
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Dec 25 2013 Ville Skyttä <ville.skytta@iki.fi> - 4.1.0-3
|
||||
- Fix -debuginfo, enable exif and rgb.txt support (#1009155).
|
||||
|
||||
* Fri Sep 27 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-2
|
||||
- Try to get actual debug output
|
||||
|
||||
* Sun Sep 15 2013 Bruno Wolff III <bruno@wolff.to> - 4.1.0-1
|
||||
- Update to 4.1.0
|
||||
- Enable debug output
|
||||
- Patch for recent libpng is no longer needed
|
||||
|
||||
* Sat Sep 14 2013 Bruno Wolff III <bruno@wolff.to> - 4.0.1-13
|
||||
- Rebuild for OCaml 4.01.0
|
||||
|
||||
* Sun Aug 11 2013 Bruno Wolff III <bruno@wolff.to> - 4.0.1-12
|
||||
- Move to unversioned doc directory
|
||||
- Fixes FTBFS bug 992390
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 4.0.1-9
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 4.0.1-8
|
||||
- rebuild against new libjpeg
|
||||
|
||||
* Wed Oct 17 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-7
|
||||
- Rebuild for ocaml 4.0.1
|
||||
|
||||
* Sun Jul 29 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-6
|
||||
- Rebuild for ocaml 4.0.0 final
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jun 08 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-4
|
||||
- Rebuild for new ocaml
|
||||
|
||||
* Fri May 11 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-3
|
||||
- Rebuild for new libtiff
|
||||
|
||||
* Sat Mar 10 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-2
|
||||
- Fixup "should fixes" from review
|
||||
|
||||
* Sun Jan 29 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-1
|
||||
- Resurrect ocaml-camlimages
|
||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
fb1633c9c8df0b2b2d0f892d8c4ac2ee camlimages-2.2.0-htmlref.tar.gz
|
||||
d933eb58c7983f70b1a000fa01893aa4 camlimages-2.2.0.tgz
|
||||
SHA512 (camlimages-2.2.0-htmlref.tar.gz) = 20cc6b7d92494f2e38700e9c9aed0d9663bed857662037a532241e60a80c5a2dcb308426007c50dfcfbf718098e930fd886ecdc22d5b8c168d08b4f287ab4d02
|
||||
SHA512 (4.2.5.tar.gz) = 8ca5f4f9c49dc2ad86dac3da640422f45816f510ace5fba975eda0046e4973b624d13022b50a4d5f93d425d0fe1e126ca7a008f3421b8383f43ca7c27442bceb
|
||||
|
Loading…
Reference in New Issue
Block a user