rpms/netpbm/FC-6 netpbm-10.35-pbmtog3segfault.patch, NONE, 1.1 netpbm-10.23-security.patch, 1.16, 1.17 netpbm-10.27-bmptopnm.patch, 1.3, 1.4 netpbm.spec, 1.82, 1.83
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 29 13:51:21 UTC 2007
- Previous message (by thread): rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.4, 1.5 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.17, 1.18 openoffice.org.spec, 1.921, 1.922
- Next message (by thread): rpms/ntp/FC-6 ntp-4.2.4-bcast.patch, NONE, 1.1 ntp-4.2.4-mlock.patch, NONE, 1.1 ntp-4.2.4-optvalues.patch, NONE, 1.1 ntp-4.2.4-html2man.patch, 1.2, 1.3 ntp.spec, 1.62, 1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/dist/rpms/netpbm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv31100
Modified Files:
netpbm-10.23-security.patch netpbm-10.27-bmptopnm.patch
netpbm.spec
Added Files:
netpbm-10.35-pbmtog3segfault.patch
Log Message:
- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554)
- pbmtog3 won't segfault on 64bit arches (#220739)
- remove bogus man pages (#220112, #220113)
- overflow2() no more conflicts with libgd.so (#216116)
- fix BuildRoot
netpbm-10.35-pbmtog3segfault.patch:
pbmtog3.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE netpbm-10.35-pbmtog3segfault.patch ---
--- netpbm-10.35/converter/pbm/pbmtog3.c.pbmtog3segfault 2006-09-18 12:20:32.000000000 +0200
+++ netpbm-10.35/converter/pbm/pbmtog3.c 2006-12-28 11:43:19.000000000 +0100
@@ -371,7 +371,7 @@
r2 <<= c++; r2 <<= 1; k += c;
}
}
- if (milepost[n - 1] != cols)
+ if (!n || milepost[n - 1] != cols)
milepost[n++] = cols;
*lengthP = n;
}
netpbm-10.23-security.patch:
analyzer/pgmhist.c | 1
analyzer/pgmtexture.c | 9 ++++++
converter/other/gemtopnm.c | 1
converter/other/jpegtopnm.c | 1
converter/other/pbmtopgm.c | 1
converter/other/pngtopnm.c | 19 ++++++++-----
converter/other/pnmtoddif.c | 2 +
converter/other/pnmtojpeg.c | 9 +++++-
converter/other/pnmtops.c | 12 +++++---
converter/other/pnmtorle.c | 2 +
converter/other/pnmtosgi.c | 19 +++++++++++++
converter/other/rletopnm.c | 2 +
converter/other/sgitopnm.c | 6 +++-
converter/other/sirtopnm.c | 1
converter/other/tifftopnm.c | 3 +-
converter/other/xwdtopnm.c | 8 +++++
converter/pbm/icontopbm.c | 6 ++++
converter/pbm/mdatopbm.c | 5 ++-
converter/pbm/mgrtopbm.c | 2 +
converter/pbm/pbmto10x.c | 2 -
converter/pbm/pbmto4425.c | 3 +-
converter/pbm/pbmtoascii.c | 2 +
converter/pbm/pbmtocmuwm.c | 1
converter/pbm/pbmtogem.c | 1
converter/pbm/pbmtogo.c | 1
converter/pbm/pbmtoicon.c | 1
converter/pbm/pbmtolj.c | 4 ++
converter/pbm/pbmtomacp.c | 3 ++
converter/pbm/pbmtomda.c | 1
converter/pbm/pbmtomgr.c | 1
converter/pbm/pbmtoppa/pbm.c | 4 ++
converter/pbm/pbmtoppa/pbmtoppa.c | 1
converter/pbm/pbmtox10bm.c | 1
converter/pbm/pbmtoxbm.c | 1
converter/pbm/pbmtoybm.c | 1
converter/pbm/pbmtozinc.c | 1
converter/pbm/pktopbm.c | 1
converter/pbm/thinkjettopbm.l | 4 ++
converter/pbm/ybmtopbm.c | 1
converter/pgm/lispmtopgm.c | 5 ++-
converter/pgm/psidtopgm.c | 1
converter/ppm/Makefile | 2 -
converter/ppm/ilbmtoppm.c | 28 +++++++++++++++++++
converter/ppm/imgtoppm.c | 2 +
converter/ppm/pcxtoppm.c | 2 +
converter/ppm/picttoppm.c | 2 +
converter/ppm/pjtoppm.c | 21 +++++++++-----
converter/ppm/ppmtoeyuv.c | 1
converter/ppm/ppmtoicr.c | 2 -
converter/ppm/ppmtoilbm.c | 8 ++++-
converter/ppm/ppmtolj.c | 3 +-
converter/ppm/ppmtomitsu.c | 2 +
converter/ppm/ppmtompeg/iframe.c | 20 +++++++-------
converter/ppm/ppmtompeg/parallel.c | 4 ++
converter/ppm/ppmtompeg/psearch.c | 18 ++++++++++++
converter/ppm/ppmtompeg/rgbtoycc.c | 2 +
converter/ppm/ppmtopcx.c | 2 +
converter/ppm/ppmtopict.c | 2 +
converter/ppm/ppmtopj.c | 1
converter/ppm/ppmtopjxl.c | 8 +++++
converter/ppm/ppmtowinicon.c | 8 +++++
converter/ppm/ppmtoxpm.c | 2 +
converter/ppm/qrttoppm.c | 2 -
converter/ppm/sldtoppm.c | 4 ++
converter/ppm/ximtoppm.c | 4 ++
converter/ppm/xpmtoppm.c | 1
converter/ppm/yuvtoppm.c | 1
editor/pamcut.c | 2 +
editor/pamoil.c | 1
editor/pbmclean.c | 2 -
editor/pbmlife.c | 2 -
editor/pbmpscale.c | 1
editor/pbmreduce.c | 1
editor/pnmcut.c | 1
editor/pnmgamma.c | 1
editor/pnmhisteq.c | 1
editor/pnmindex.csh | 3 ++
editor/pnmpad.c | 2 +
editor/pnmpaste.c | 5 +++
editor/pnmremap.c | 2 +
editor/pnmscalefixed.c | 7 ++++
editor/pnmshear.c | 6 ++++
editor/ppmdither.c | 6 +++-
generator/pbmpage.c | 3 ++
generator/pbmtext.c | 15 ++++++++++
generator/pgmcrater.c | 2 -
generator/pgmkernel.c | 2 -
generator/ppmrainbow | 2 -
lib/libpam.c | 3 +-
lib/libpammap.c | 2 +
lib/libpbm1.c | 1
lib/libpbmvms.c | 2 +
lib/libpm.c | 52 ++++++++++++++++++++++++++++++++++++-
lib/pm.h | 7 ++++
other/pnmcolormap.c | 1
urt/README | 5 +++
urt/Runput.c | 10 ++++---
urt/rle.h | 14 +++++++++
urt/rle_addhist.c | 15 +++++++++-
urt/rle_getrow.c | 3 ++
urt/rle_hdr.c | 19 +++++++++++--
urt/rle_open_f.c | 8 ++++-
urt/rle_putcom.c | 6 +++-
urt/scanargs.c | 6 ++--
104 files changed, 458 insertions(+), 65 deletions(-)
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm-10.23-security.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- netpbm-10.23-security.patch 12 Oct 2006 10:31:25 -0000 1.16
+++ netpbm-10.23-security.patch 29 Jan 2007 13:51:18 -0000 1.17
@@ -1388,13 +1388,14 @@
}
--- netpbm-10.34/lib/pm.h.security 2006-05-19 22:39:07.000000000 +0200
+++ netpbm-10.34/lib/pm.h 2006-06-22 12:45:18.000000000 +0200
-@@ -340,4 +340,10 @@
+@@ -340,4 +340,11 @@
#endif
+void *malloc2(int, int);
+void *malloc3(int, int, int);
-+void overflow2(int, int);
++#define overflow2(a,b) __overflow2(a,b)
++void __overflow2(int, int);
+void overflow3(int, int, int);
+void overflow_add(int, int);
+
@@ -1449,7 +1450,7 @@
+ * Maths wrapping
+ */
+
-+void overflow2(int a, int b)
++void __overflow2(int a, int b)
+{
+ if(a < 0 || b < 0)
+ pm_error("object too large");
@@ -1763,7 +1764,7 @@
*/
/*
* rle.h - Global declarations for Utah Raster Toolkit RLE programs.
-@@ -166,6 +169,16 @@
+@@ -166,6 +169,17 @@
*/
extern rle_hdr rle_dflt_hdr;
@@ -1772,7 +1773,8 @@
+ */
+
+extern void overflow_add(int, int);
-+extern void overflow2(int, int);
++#define overflow2(a,b) __overflow2(a,b)
++extern void __overflow2(int, int);
+extern void overflow3(int, int, int);
+extern void *malloc2(int, int);
+extern void *malloc3(int, int, int);
netpbm-10.27-bmptopnm.patch:
bmptopnm.c | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
Index: netpbm-10.27-bmptopnm.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm-10.27-bmptopnm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netpbm-10.27-bmptopnm.patch 28 Feb 2006 12:59:04 -0000 1.3
+++ netpbm-10.27-bmptopnm.patch 29 Jan 2007 13:51:18 -0000 1.4
@@ -1,6 +1,6 @@
---- netpbm-10.32/converter/other/bmptopnm.c.bmptopnm 2006-02-27 15:02:02.000000000 +0100
-+++ netpbm-10.32/converter/other/bmptopnm.c 2006-02-27 15:07:31.000000000 +0100
-@@ -1248,7 +1248,7 @@ readBmp(FILE * const ifP,
+--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100
++++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100
+@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP,
xel ** const colormapP,
bool const verbose) {
@@ -9,12 +9,11 @@
unsigned int pos;
/* Current byte position in the BMP file */
-@@ -1455,7 +1455,7 @@ main(int argc, char ** argv) {
- writeRasterGen(BMPraster, cols, rows, outputType, cBitCount,
- pixelformat, colormap);
+@@ -1278,7 +1278,6 @@ readBmp(FILE * const ifP,
+ BMPreadfileheader(ifP, &bytesRead, &offBits);
+ pos += bytesRead;
}
-- free(colormap);
-+ if (colormap) free(colormap);
- free(BMPraster);
-
- return 0;
+- if(BMPheader.cmapsize != 0)
+ {
+ unsigned int bytesRead;
+ BMPreadinfoheader(ifP, &bytesRead, &BMPheader);
Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- netpbm.spec 12 Oct 2006 10:31:25 -0000 1.82
+++ netpbm.spec 29 Jan 2007 13:51:18 -0000 1.83
@@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats.
Name: netpbm
Version: 10.35
-Release: 7%{?dist}
+Release: 8%{?dist}
License: freeware
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
@@ -22,7 +22,8 @@
Patch13: netpbm-10.33-multilib.patch
Patch14: netpbm-10.34-pamscale.patch
Patch15: netpbm-10.35-ppmquantall.patch
-Buildroot: %{_tmppath}/%{name}-root
+Patch16: netpbm-10.35-pbmtog3segfault.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
BuildRequires: libX11-devel
Obsoletes: libgr
@@ -81,6 +82,7 @@
%patch13 -p1 -b .multilib
%patch14 -p1 -b .pamscale
%patch15 -p1 -b .pqall
+%patch16 -p1 -b .pbmtog3segfault
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -142,11 +144,14 @@
mkdir -p $RPM_BUILD_ROOT%{_mandir}
tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
-# Don't ship man packages for non-existent binaries
-for i in hpcdtoppm.1 pcdovtoppm.1 pnmtojbig.1 \
- ppmsvgalib.1 vidtoppm.1 picttoppm.1 jbigtopnm.1; do
- rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}
+# Don't ship man pages for non-existent binaries and bogus ones
+for i in hpcdtoppm pcdovtoppm pnmtojbig \
+ ppmsvgalib vidtoppm picttoppm jbigtopnm \
+ directory error extendedopacity \
+ pam pbm pgm pnm ppm; do
+ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1
done
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
rm -rf $RPM_BUILD_ROOT/usr/README
@@ -158,7 +163,6 @@
rm -rf $RPM_BUILD_ROOT/usr/config_template
-
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -185,6 +189,13 @@
%{_mandir}/man5/*
%changelog
+* Mon Jan 29 2007 Jindrich Novy <jnovy at redhat.com> 10.35-8
+- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554)
+- pbmtog3 won't segfault on 64bit arches (#220739)
+- remove bogus man pages (#220112, #220113)
+- overflow2() no more conflicts with libgd.so (#216116)
+- fix BuildRoot
+
* Thu Oct 12 2006 Jindrich Novy <jnovy at redhat.com> 10.35-7
- remove note about OSL 1 licensing from COPYRIGHT.PATENT file
- Previous message (by thread): rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.4, 1.5 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.17, 1.18 openoffice.org.spec, 1.921, 1.922
- Next message (by thread): rpms/ntp/FC-6 ntp-4.2.4-bcast.patch, NONE, 1.1 ntp-4.2.4-mlock.patch, NONE, 1.1 ntp-4.2.4-optvalues.patch, NONE, 1.1 ntp-4.2.4-html2man.patch, 1.2, 1.3 ntp.spec, 1.62, 1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list