rpms/netpbm/F-9 netpbm-10.35-ppmdfontfix.patch, NONE, 1.1 netpbm-10.35-ppmfadeusage.patch, NONE, 1.1 netpbm-10.35-ppmrainbowexit.patch, NONE, 1.1 netpbm-10.35-svgtopam.patch, NONE, 1.1 netpbm-10.35-ximtoppmsegfault.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 netpbm-10.23-security.patch, 1.20, 1.21 netpbm.spec, 1.113, 1.114 sources, 1.43, 1.44
Jindrich Novy
jnovy at fedoraproject.org
Wed Apr 1 14:10:59 UTC 2009
Author: jnovy
Update of /cvs/pkgs/rpms/netpbm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10640
Modified Files:
.cvsignore netpbm-10.23-security.patch netpbm.spec sources
Added Files:
netpbm-10.35-ppmdfontfix.patch netpbm-10.35-ppmfadeusage.patch
netpbm-10.35-ppmrainbowexit.patch netpbm-10.35-svgtopam.patch
netpbm-10.35-ximtoppmsegfault.patch
Log Message:
* Wed Apr 1 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-1
- update to 10.35.61
- upstream fixes array bound violation in pbmtog3
- drop .pbmtog3segfault patch, we fixed this some time ago already
and it is in upstream now
- use saner exit status in ppmfade
- remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
- fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak
netpbm-10.35-ppmdfontfix.patch:
--- NEW FILE netpbm-10.35-ppmdfontfix.patch ---
diff -up netpbm-10.35.58/lib/ppmdfont.c.ppmdfontfix netpbm-10.35.58/lib/ppmdfont.c
--- netpbm-10.35.58/lib/ppmdfont.c.ppmdfontfix 2009-01-19 09:23:54.000000000 +0100
+++ netpbm-10.35.58/lib/ppmdfont.c 2009-03-23 13:06:36.000000000 +0100
@@ -62,7 +62,8 @@ static void
readFontHeader(FILE * const ifP,
struct ppmd_fontHeader * const fontHeaderP) {
- fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature), ifP);
+ if (!fread(&fontHeaderP->signature, 1, sizeof(fontHeaderP->signature), ifP))
+ pm_error("Error reading font header.");
fontHeaderP->format = fgetc(ifP);
fontHeaderP->characterCount = fgetc(ifP);
fontHeaderP->firstCodePoint = fgetc(ifP);
netpbm-10.35-ppmfadeusage.patch:
--- NEW FILE netpbm-10.35-ppmfadeusage.patch ---
diff -up netpbm-10.35.60/editor/ppmfade.ppmfadeusage netpbm-10.35.60/editor/ppmfade
--- netpbm-10.35.60/editor/ppmfade.ppmfadeusage 2009-02-27 12:35:26.000000000 +0100
+++ netpbm-10.35.60/editor/ppmfade 2009-02-27 12:39:06.000000000 +0100
@@ -36,6 +36,8 @@ my $mode = $SPREAD; # default fading mo
#
# Check those command line args.
#
+sub usage();
+
if (@ARGV == 0) {
usage();
}
@@ -82,7 +84,7 @@ for ($n = 0; $n < @ARGV; $n++) {
usage();
} else {
print "Unknown argument: $ARGV[$n]\n";
- exit 100;
+ exit 1;
}
}
#
@@ -312,5 +314,5 @@ sub usage() {
print " [-base basename]\n";
print "Notes: Default base: fade\n";
print " The resulting image files will be named fade.NNNN.ppm.\n";
- exit(100);
+ exit 1;
}
netpbm-10.35-ppmrainbowexit.patch:
--- NEW FILE netpbm-10.35-ppmrainbowexit.patch ---
diff -up netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit netpbm-10.35.60/generator/ppmrainbow
--- netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit 2009-02-15 13:04:35.000000000 +0100
+++ netpbm-10.35.60/generator/ppmrainbow 2009-02-26 18:48:34.000000000 +0100
@@ -21,15 +21,16 @@ GetOptions("width=i" => \$Twid,
"norepeat!" => \$norepeat,
"verbose!" => \$verbose);
+$! = 1;
die "invalid width and/or height\n" unless $Twid >= 1 && $Thgt >= 1;
my $verboseCommand = $verbose ? "set -x;" : "";
if (@ARGV < 1) {
- die("You must specify at least one color as an argument");
+ die("You must specify at least one color as an argument\n");
} elsif (@ARGV < 2 && $norepeat) {
die("With the -norepeat option, you must specify at least two colors " .
- "as arguments.");
+ "as arguments.\n");
}
my @colorlist;
@@ -57,7 +58,7 @@ while (@colorlist >= 2) {
my $rc = system("$verboseCommand pgmramp -lr $w $Thgt | " .
"pgmtoppm \"$colorlist[0]-$colorlist[1]\" >$outfile");
if ($rc != 0) {
- die("pgmramp|pgmtoppm failed.");
+ die("pgmramp|pgmtoppm failed.\n");
}
$widthRemaining -= $w;
$n++;
netpbm-10.35-svgtopam.patch:
--- NEW FILE netpbm-10.35-svgtopam.patch ---
diff -up netpbm-10.35.58/converter/other/Makefile.svgtopam netpbm-10.35.58/converter/other/Makefile
--- netpbm-10.35.58/converter/other/Makefile.svgtopam 2009-01-19 09:23:58.000000000 +0100
+++ netpbm-10.35.58/converter/other/Makefile 2009-03-23 13:17:22.000000000 +0100
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
BINARIES += pnmtops
endif
-ifneq ($(XML2_LIBS),NONE)
- BINARIES += svgtopam
-endif
-
MERGEBINARIES = $(BINARIES)
EXTRA_OBJECTS = exif.o rast.o pngtxt.o bmepsoe.o
netpbm-10.35-ximtoppmsegfault.patch:
--- NEW FILE netpbm-10.35-ximtoppmsegfault.patch ---
diff -up netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault netpbm-10.35.58/converter/ppm/ximtoppm.c
--- netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault 2009-01-28 18:37:05.000000000 +0100
+++ netpbm-10.35.58/converter/ppm/ximtoppm.c 2009-01-28 19:01:14.000000000 +0100
@@ -50,6 +50,10 @@ parseCommandLine(int argc, char ** argv,
OPTENT3(0, "alphaout", OPT_STRING,
&cmdlineP->alpha_filename, &alphaoutSpec, 0);
+ opt.opt_table = option_def;
+ opt.short_allowed = FALSE;
+ opt.allowNegNum = FALSE;
+
optParseOptions3(&argc, argv, opt, sizeof(opt), 0);
/* Uses and sets argc, argv, and all of *cmdlineP. */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 23 Jan 2009 19:10:41 -0000 1.39
+++ .cvsignore 1 Apr 2009 14:10:29 -0000 1.40
@@ -1 +1,2 @@
-netpbm-10.35.58.tar.bz2
+netpbm-10.35.60.tar.bz2
+netpbm-10.35.61.tar.bz2
netpbm-10.23-security.patch:
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/netpbm-10.23-security.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- netpbm-10.23-security.patch 23 Jan 2009 19:10:41 -0000 1.20
+++ netpbm-10.23-security.patch 1 Apr 2009 14:10:29 -0000 1.21
@@ -303,27 +303,6 @@
if (samplebuf == NULL)
pm_error ("can't allocate memory for row buffer");
-diff -up netpbm-10.35.46/converter/other/xwdtopnm.c.security netpbm-10.35.46/converter/other/xwdtopnm.c
---- netpbm-10.35.46/converter/other/xwdtopnm.c.security 2008-06-24 08:59:13.000000000 +0200
-+++ netpbm-10.35.46/converter/other/xwdtopnm.c 2008-06-24 09:04:21.000000000 +0200
-@@ -214,6 +214,9 @@ processX10Header(X10WDFileHeader * cons
- *colorsP = pnm_allocrow( 2 );
- PNM_ASSIGN1( (*colorsP)[0], 0 );
- PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
-+ overflow_add(h10P->pixmap_width, 15);
-+ if(h10P->pixmap_width < 0)
-+ pm_error("assert: negative width");
- *padrightP =
- ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
- *bits_per_itemP = 16;
-@@ -560,6 +563,7 @@ processX11Header(X11WDFileHeader * cons
-
- *colsP = h11FixedP->pixmap_width;
- *rowsP = h11FixedP->pixmap_height;
-+ overflow2(h11FixedP->bytes_per_line, 8);
- *padrightP =
- h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel -
- h11FixedP->pixmap_width;
diff -up netpbm-10.35.46/converter/pbm/icontopbm.c.security netpbm-10.35.46/converter/pbm/icontopbm.c
--- netpbm-10.35.46/converter/pbm/icontopbm.c.security 2008-06-24 08:59:23.000000000 +0200
+++ netpbm-10.35.46/converter/pbm/icontopbm.c 2008-06-24 09:04:21.000000000 +0200
@@ -1331,30 +1310,6 @@
MALLOCARRAY(hist, inpam.maxval + 1);
if (hist == NULL)
pm_error("Unable to allocate memory for histogram.");
-diff -up netpbm-10.35.46/editor/pbmclean.c.security netpbm-10.35.46/editor/pbmclean.c
---- netpbm-10.35.46/editor/pbmclean.c.security 2008-06-24 08:58:59.000000000 +0200
-+++ netpbm-10.35.46/editor/pbmclean.c 2008-06-24 09:04:21.000000000 +0200
-@@ -150,7 +150,7 @@ nextrow(FILE * const ifd,
- inrow[0] = inrow[1];
- inrow[1] = inrow[2];
- inrow[2] = shuffle ;
-- if (row+1 < rows) {
-+ if (row <= rows) {
- /* Read the "next" row in from the file. Allocate buffer if needed */
- if (inrow[2] == NULL)
- inrow[2] = pbm_allocrow(cols);
-diff -up netpbm-10.35.46/editor/pbmlife.c.security netpbm-10.35.46/editor/pbmlife.c
---- netpbm-10.35.46/editor/pbmlife.c.security 2008-06-24 08:58:59.000000000 +0200
-+++ netpbm-10.35.46/editor/pbmlife.c 2008-06-24 09:04:21.000000000 +0200
-@@ -54,7 +54,7 @@ char* argv[];
- prevrow = thisrow;
- thisrow = nextrow;
- nextrow = temprow;
-- if ( row < rows - 1 )
-+ if ( row <= rows )
- pbm_readpbmrow( ifp, nextrow, cols, format );
-
- for ( col = 0; col < cols; ++col )
diff -up netpbm-10.35.46/editor/pbmpscale.c.security netpbm-10.35.46/editor/pbmpscale.c
--- netpbm-10.35.46/editor/pbmpscale.c.security 2008-06-24 08:58:59.000000000 +0200
+++ netpbm-10.35.46/editor/pbmpscale.c 2008-06-24 09:04:21.000000000 +0200
@@ -2098,3 +2053,25 @@
#if defined(c_plusplus) && !defined(USE_PROTOTYPES)
#define USE_PROTOTYPES
+diff -up netpbm-10.35.60/converter/other/xwdtopnm.c.security netpbm-10.35.60/converter/other/xwdtopnm.c
+--- netpbm-10.35.60/converter/other/xwdtopnm.c.security 2009-02-15 13:04:43.000000000 +0100
++++ netpbm-10.35.60/converter/other/xwdtopnm.c 2009-02-16 12:15:50.000000000 +0100
+@@ -214,6 +214,10 @@ processX10Header(X10WDFileHeader * cons
+ *colorsP = pnm_allocrow( 2 );
+ PNM_ASSIGN1( (*colorsP)[0], 0 );
+ PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
++ overflow_add(h10P->pixmap_width, 15);
++ if(h10P->pixmap_width < 0)
++ pm_error("assert: negative width");
++ overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
+ *padrightP =
+ (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
+ *bits_per_itemP = 16;
+@@ -608,6 +612,7 @@ processX11Header(X11WDFileHeader * cons
+
+ *colsP = h11FixedP->pixmap_width;
+ *rowsP = h11FixedP->pixmap_height;
++ overflow2(h11FixedP->bytes_per_line, 8);
+ *padrightP =
+ h11FixedP->bytes_per_line * 8 -
+ h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/netpbm.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- netpbm.spec 23 Jan 2009 19:10:41 -0000 1.113
+++ netpbm.spec 1 Apr 2009 14:10:29 -0000 1.114
@@ -1,6 +1,6 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.35.58
+Version: 10.35.61
Release: 1%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -25,7 +25,6 @@
Patch13: netpbm-10.33-multilib.patch
Patch14: netpbm-10.34-pamscale.patch
Patch15: netpbm-10.35-ppmquantall.patch
-Patch16: netpbm-10.35-pbmtog3segfault.patch
Patch17: netpbm-10.35-pbmtomacp.patch
Patch18: netpbm-10.35-glibc.patch
Patch19: netpbm-10.35-gcc43.patch
@@ -34,6 +33,11 @@
Patch22: netpbm-10.35-pnmmontagefix.patch
Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
Patch24: netpbm-10.35-64bitfix.patch
+Patch25: netpbm-10.35-ximtoppmsegfault.patch
+Patch26: netpbm-10.35-ppmfadeusage.patch
+Patch27: netpbm-10.35-ppmrainbowexit.patch
+Patch28: netpbm-10.35-ppmdfontfix.patch
+Patch29: netpbm-10.35-svgtopam.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel
@@ -89,7 +93,6 @@
%patch13 -p1 -b .multilib
%patch14 -p1 -b .pamscale
%patch15 -p1 -b .pqall
-%patch16 -p1 -b .pbmtog3segfault
%patch17 -p1 -b .pbmtomacp
%patch18 -p1 -b .glibc
%patch19 -p1 -b .gcc43
@@ -98,9 +101,11 @@
%patch22 -p1 -b .pnmmontagefix
%patch23 -p1 -b .pnmtofiasco-stdin
%patch24 -p1 -b .64bitfix
-
-##mv shhopt/shhopt.h shhopt/pbmshhopt.h
-##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
+%patch25 -p1 -b .ximtoppmsegfault
+%patch26 -p1 -b .ppmfadeusage
+%patch27 -p1 -b .ppmrainbowexit
+%patch28 -p1 -b .ppmdfontfix
+%patch29 -p1 -b .svgtopam
%build
./configure <<EOF
@@ -217,6 +222,7 @@
%{_includedir}/*.h
%{_libdir}/lib*.so
%{_mandir}/man3/*
+
%files progs
%defattr(-,root,root)
%{_bindir}/*
@@ -225,6 +231,15 @@
%{_datadir}/netpbm/
%changelog
+* Wed Apr 1 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-1
+- update to 10.35.61
+- upstream fixes array bound violation in pbmtog3
+- drop .pbmtog3segfault patch, we fixed this some time ago already
+ and it is in upstream now
+- use saner exit status in ppmfade
+- remove two hunks from security patch breaking pbmclean and pbmlife (#493015)
+- fix ppmdfont and svgtopnm, thanks to Jiri Moskovcak
+
* Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
- update to 10.35.38
- fixes crashes in picttoppm, pbmtomrf, mrftopbm
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 23 Jan 2009 19:10:41 -0000 1.43
+++ sources 1 Apr 2009 14:10:29 -0000 1.44
@@ -1 +1 @@
-f4e789971594212d0be2d8fd1e8a00ac netpbm-10.35.58.tar.bz2
+ea6882cc00d8dc2b580184c25334ad5a netpbm-10.35.61.tar.bz2
More information about the scm-commits
mailing list