- update to latest upstream 10.25
- drop initvar patch - update security, misc patch - add bmpbpp patch to use only appropriate bit depths for BMP (#135675)
This commit is contained in:
parent
1f15ca55f3
commit
d0ab408810
@ -1,2 +1,4 @@
|
|||||||
netpbm-nojbig-10.24.tar.bz2
|
netpbm-nojbig-10.24.tar.bz2
|
||||||
netpbmdoc-nojbig-10.24.tar.bz2
|
netpbmdoc-nojbig-10.24.tar.bz2
|
||||||
|
netpbm-nojbig-10.25.tar.bz2
|
||||||
|
netpbmdoc-nojbig-10.25.tar.bz2
|
||||||
|
@ -789,17 +789,6 @@
|
|||||||
|
|
||||||
--- netpbm-10.23/converter/ppm/ppmtompeg/parallel.c.security 2004-08-04 13:39:34.312585960 +0200
|
--- netpbm-10.23/converter/ppm/ppmtompeg/parallel.c.security 2004-08-04 13:39:34.312585960 +0200
|
||||||
+++ netpbm-10.23/converter/ppm/ppmtompeg/parallel.c 2004-08-04 13:39:34.374576536 +0200
|
+++ netpbm-10.23/converter/ppm/ppmtompeg/parallel.c 2004-08-04 13:39:34.374576536 +0200
|
||||||
@@ -376,8 +376,8 @@
|
|
||||||
free(bigBuffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
- bigBuffer = (unsigned char *) malloc(bigBufferSize*
|
|
||||||
- sizeof(unsigned char));
|
|
||||||
+ bigBuffer = (unsigned char *) malloc2(bigBufferSize,
|
|
||||||
+ sizeof(unsigned char));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* now read in the bytes */
|
|
||||||
@@ -708,7 +708,7 @@
|
@@ -708,7 +708,7 @@
|
||||||
|
|
||||||
TransmitPortNum(parallelHostName, portNum, combinePortNum);
|
TransmitPortNum(parallelHostName, portNum, combinePortNum);
|
||||||
@ -2397,18 +2386,6 @@
|
|||||||
pbm_readpbmrow( ifp, nextrow, cols, format );
|
pbm_readpbmrow( ifp, nextrow, cols, format );
|
||||||
|
|
||||||
for ( col = 0; col < cols; ++col )
|
for ( col = 0; col < cols; ++col )
|
||||||
--- netpbm-10.23/editor/pnmenlarge.c.security 2004-07-12 19:23:23.000000000 +0200
|
|
||||||
+++ netpbm-10.23/editor/pnmenlarge.c 2004-08-04 13:39:34.477560880 +0200
|
|
||||||
@@ -51,6 +51,9 @@
|
|
||||||
|
|
||||||
pnm_readpnminit(ifP, &cols, &rows, &maxval, &format);
|
|
||||||
xelrow = pnm_allocrow(cols);
|
|
||||||
+
|
|
||||||
+ overflow2(cols, n);
|
|
||||||
+ overflow2(rows, n);
|
|
||||||
pnm_writepnminit(stdout, cols * n, rows * n, maxval, format, 0);
|
|
||||||
newxelrow = pnm_allocrow(cols * n);
|
|
||||||
|
|
||||||
--- netpbm-10.23/editor/pamcut.c.security 2004-07-12 17:33:40.000000000 +0200
|
--- netpbm-10.23/editor/pamcut.c.security 2004-07-12 17:33:40.000000000 +0200
|
||||||
+++ netpbm-10.23/editor/pamcut.c 2004-08-04 13:39:34.480560424 +0200
|
+++ netpbm-10.23/editor/pamcut.c 2004-08-04 13:39:34.480560424 +0200
|
||||||
@@ -379,6 +379,8 @@
|
@@ -379,6 +379,8 @@
|
||||||
|
40
netpbm.spec
40
netpbm.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: A library for handling different graphics file formats.
|
Summary: A library for handling different graphics file formats.
|
||||||
Name: netpbm
|
Name: netpbm
|
||||||
Version: 10.24
|
Version: 10.25
|
||||||
Release: 3
|
Release: 1
|
||||||
License: freeware
|
License: freeware
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://netpbm.sourceforge.net/
|
URL: http://netpbm.sourceforge.net/
|
||||||
@ -13,13 +13,13 @@ Patch3: netpbm-10.18-manpath.patch
|
|||||||
Patch4: netpbm-10.19-message.patch
|
Patch4: netpbm-10.19-message.patch
|
||||||
Patch5: netpbm-10.22-security2.patch
|
Patch5: netpbm-10.22-security2.patch
|
||||||
Patch6: netpbm-10.22-cmapsize.patch
|
Patch6: netpbm-10.22-cmapsize.patch
|
||||||
Patch7: netpbm-10.22-initvar.patch
|
Patch7: netpbm-10.23-gcc34.patch
|
||||||
Patch8: netpbm-10.23-gcc34.patch
|
Patch8: netpbm-10.23-security.patch
|
||||||
Patch9: netpbm-10.23-security.patch
|
Patch9: netpbm-10.23-pngtopnm.patch
|
||||||
Patch10: netpbm-10.23-pngtopnm.patch
|
Patch10: netpbm-10.23-malloc.patch
|
||||||
Patch11: netpbm-10.23-malloc.patch
|
Patch11: netpbm-10.24-misc.patch
|
||||||
Patch12: netpbm-10.24-misc.patch
|
Patch12: netpbm-10.24-nodoc.patch
|
||||||
Patch13: netpbm-10.24-nodoc.patch
|
Patch13: netpbm-10.25-bmpbpp.patch
|
||||||
Buildroot: %{_tmppath}/%{name}-root
|
Buildroot: %{_tmppath}/%{name}-root
|
||||||
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
|
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
|
||||||
Obsoletes: libgr
|
Obsoletes: libgr
|
||||||
@ -69,13 +69,13 @@ netpbm-progs. You'll also need to install the netpbm package.
|
|||||||
%patch4 -p1 -b .message
|
%patch4 -p1 -b .message
|
||||||
%patch5 -p1 -b .security2
|
%patch5 -p1 -b .security2
|
||||||
%patch6 -p1 -b .cmapsize
|
%patch6 -p1 -b .cmapsize
|
||||||
%patch7 -p1 -b .initvar
|
%patch7 -p1 -b .gcc34
|
||||||
%patch8 -p1 -b .gcc34
|
%patch8 -p1 -b .security
|
||||||
%patch9 -p1 -b .security
|
%patch9 -p1 -b .pngtopnm
|
||||||
%patch10 -p1 -b .pngtopnm
|
%patch10 -p1 -b .malloc
|
||||||
%patch11 -p1 -b .malloc
|
%patch11 -p1 -b .misc
|
||||||
%patch12 -p1 -b .misc
|
%patch12 -p1 -b .nodoc
|
||||||
%patch13 -p1 -b .nodoc
|
%patch13 -p1 -b .bmpbpp
|
||||||
|
|
||||||
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
|
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
|
||||||
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
|
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
|
||||||
@ -97,6 +97,7 @@ netpbm-progs. You'll also need to install the netpbm package.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
TOP=`pwd`
|
TOP=`pwd`
|
||||||
@ -155,7 +156,6 @@ rm -rf $RPM_BUILD_ROOT/usr/pkginfo
|
|||||||
%{_libdir}/lib*.a
|
%{_libdir}/lib*.a
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%files progs
|
%files progs
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
@ -164,6 +164,12 @@ rm -rf $RPM_BUILD_ROOT/usr/pkginfo
|
|||||||
%{_mandir}/man5/*
|
%{_mandir}/man5/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 18 2004 Jindrich Novy <jnovy@redhat.com> 10.25-1
|
||||||
|
- update to latest upstream 10.25
|
||||||
|
- drop initvar patch
|
||||||
|
- update security, misc patch
|
||||||
|
- add bmpbpp patch to use only appropriate bit depths for BMP (#135675)
|
||||||
|
|
||||||
* Thu Sep 23 2004 Jindrich Novy <jnovy@redhat.com> 10.24-3
|
* Thu Sep 23 2004 Jindrich Novy <jnovy@redhat.com> 10.24-3
|
||||||
- added patch to suppress installation of doc.url to /usr/bin #133346
|
- added patch to suppress installation of doc.url to /usr/bin #133346
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user