rpms/netpbm/devel netpbm-10.28-ndebug.patch, NONE, 1.1 netpbm-10.23-security.patch, 1.8, 1.9 netpbm.spec, 1.38, 1.39
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jun 21 14:31:07 UTC 2005
- Previous message (by thread): rpms/jakarta-commons-pool/devel .cvsignore, 1.4, 1.5 jakarta-commons-pool.spec, 1.5, 1.6 sources, 1.3, 1.4
- Next message (by thread): rpms/pango/devel .cvsignore, 1.17, 1.18 pango.spec, 1.30, 1.31 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9039
Modified Files:
netpbm-10.23-security.patch netpbm.spec
Added Files:
netpbm-10.28-ndebug.patch
Log Message:
- fix segfault in pbmtolj caused by unchecked assertions
caused by definition of NDEBUG (#160429)
- drop hunk from .security patch causing dual inclusion
of string.h in pbmtolj.c
netpbm-10.28-ndebug.patch:
pbmtolj.c | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE netpbm-10.28-ndebug.patch ---
--- netpbm-10.28/converter/pbm/pbmtolj.c.ndebug 2005-06-21 16:17:41.000000000 +0200
+++ netpbm-10.28/converter/pbm/pbmtolj.c 2005-06-21 16:18:10.813407544 +0200
@@ -31,6 +31,7 @@
#include "shhopt.h"
#include "mallocvar.h"
#include <string.h>
+#undef NDEBUG
#include <assert.h>
static char *rowBuffer, *prevRowBuffer, *packBuffer, *deltaBuffer;
netpbm-10.23-security.patch:
OPENLICENSE | 163 +++++++++++++++++++++++++++++++
analyzer/pgmhist.c | 1
analyzer/pgmtexture.c | 15 ++
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/pnmtopalm/palmcolormap.c | 2
converter/other/pnmtops.c | 11 +-
converter/other/pnmtorle.c | 2
converter/other/pnmtosgi.c | 19 +++
converter/other/pnmtotiff.c | 7 -
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 | 7 +
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 | 4
converter/ppm/picttoppm.c | 2
converter/ppm/pjtoppm.c | 21 ++-
converter/ppm/ppmtoeyuv.c | 1
converter/ppm/ppmtoicr.c | 2
converter/ppm/ppmtoilbm.c | 9 +
converter/ppm/ppmtolj.c | 1
converter/ppm/ppmtomitsu.c | 2
converter/ppm/ppmtompeg/frame.c | 72 ++++++-------
converter/ppm/ppmtompeg/iframe.c | 18 +--
converter/ppm/ppmtompeg/jpeg.c | 2
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 | 11 +-
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
doc/COPYRIGHT.PATENT | 5
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/pnmcrop.c | 2
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/pnmrotate.c | 8 +
editor/pnmscalefixed.c | 7 +
editor/pnmshear.c | 6 +
editor/ppmdither.c | 6 -
generator/pbmpage.c | 3
generator/pbmtext.c | 14 ++
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 | 54 +++++++++-
lib/pm.h | 6 +
other/pnmcolormap.c | 1
urt/README | 5
urt/Runput.c | 10 +
urt/rle.h | 13 ++
urt/rle_addhist.c | 19 ++-
urt/rle_getrow.c | 17 +--
urt/rle_hdr.c | 19 +++
urt/rle_open_f.c | 8 +
urt/rle_putcom.c | 9 +
urt/scanargs.c | 6 -
112 files changed, 693 insertions(+), 119 deletions(-)
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm-10.23-security.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- netpbm-10.23-security.patch 10 Jun 2005 09:16:43 -0000 1.8
+++ netpbm-10.23-security.patch 21 Jun 2005 14:31:03 -0000 1.9
@@ -1441,14 +1441,6 @@
if ((car >= MAXPKCHAR) || !filename[car]) {
--- netpbm-10.28/converter/pbm/pbmtolj.c.security 2005-04-23 22:24:05.000000000 +0200
+++ netpbm-10.28/converter/pbm/pbmtolj.c 2005-06-10 09:44:00.364583648 +0200
-@@ -32,6 +32,7 @@
- #include "mallocvar.h"
- #include <string.h>
- #include <assert.h>
-+#include <string.h>
-
- static char *rowBuffer, *prevRowBuffer, *packBuffer, *deltaBuffer;
- static int rowBufferSize, rowBufferIndex, prevRowBufferIndex;
@@ -119,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
static void
allocateBuffers(unsigned int const cols) {
Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- netpbm.spec 10 Jun 2005 09:25:59 -0000 1.38
+++ netpbm.spec 21 Jun 2005 14:31:03 -0000 1.39
@@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats.
Name: netpbm
Version: 10.28
-Release: 1
+Release: 2
License: freeware
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
@@ -21,6 +21,7 @@
Patch11: netpbm-10.27-bmptopnm.patch
Patch12: netpbm-10.27-libpm.patch
Patch13: netpbm-10.27-pnmtojpeg.patch
+Patch14: netpbm-10.28-ndebug.patch
Buildroot: %{_tmppath}/%{name}-root
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
Obsoletes: libgr
@@ -78,6 +79,7 @@
%patch11 -p1 -b .bmptopnm
%patch12 -p1 -b .libpm
%patch13 -p1 -b .pnmtojpeg
+%patch14 -p1 -b .ndebug
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -175,6 +177,12 @@
%{_mandir}/man5/*
%changelog
+* Tue Jun 21 2005 Jindrich Novy <jnovy at redhat.com> 10.28-2
+- fix segfault in pbmtolj caused by unchecked assertions
+ caused by definition of NDEBUG (#160429)
+- drop hunk from .security patch causing dual inclusion
+ of string.h in pbmtolj.c
+
* Fri Jun 10 2005 Jindrich Novy <jnovy at redhat.com> 10.28-1
- update to 10.28
- regenerated man pages
- Previous message (by thread): rpms/jakarta-commons-pool/devel .cvsignore, 1.4, 1.5 jakarta-commons-pool.spec, 1.5, 1.6 sources, 1.3, 1.4
- Next message (by thread): rpms/pango/devel .cvsignore, 1.17, 1.18 pango.spec, 1.30, 1.31 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list