rpms/netpbm/devel .cvsignore, 1.50, 1.51 netpbm-10.23-security.patch, 1.20, 1.21 netpbm.spec, 1.131, 1.132 sources, 1.54, 1.55

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3555

Modified Files:
	.cvsignore netpbm-10.23-security.patch netpbm.spec sources 
Log Message:
* Mon Feb 16 2009 Jindrich Novy <jnovy at redhat.com> 10.35.60-1
- update to 10.35.60
- update .security patch, minor cleanup
- fixes xwdtopnm for at least some direct color 24/32 images
- fixes memory leak and out of memory crash in libpammap



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	29 Jan 2009 14:21:29 -0000	1.50
+++ .cvsignore	16 Feb 2009 11:28:25 -0000	1.51
@@ -1 +1 @@
-netpbm-10.35.59.tar.bz2
+netpbm-10.35.60.tar.bz2

netpbm-10.23-security.patch:

Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/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 Dec 2008 20:37:42 -0000	1.20
+++ netpbm-10.23-security.patch	16 Feb 2009 11:28:25 -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
@@ -2098,3 +2077,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/devel/netpbm.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- netpbm.spec	29 Jan 2009 14:21:29 -0000	1.131
+++ netpbm.spec	16 Feb 2009 11:28:25 -0000	1.132
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.59
+Version: 10.35.60
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -101,9 +101,6 @@
 %patch24 -p1 -b .64bitfix
 %patch25 -p1 -b .ximtoppmsegfault
 
-##mv shhopt/shhopt.h shhopt/pbmshhopt.h
-##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
-
 %build
 ./configure <<EOF
 
@@ -227,6 +224,12 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Mon Feb 16 2009 Jindrich Novy <jnovy at redhat.com> 10.35.60-1
+- update to 10.35.60
+- update .security patch, minor cleanup
+- fixes xwdtopnm for at least some direct color 24/32 images
+- fixes memory leak and out of memory crash in libpammap
+
 * Thu Jan 29 2009 Jindrich Novy <jnovy at redhat.com> 10.35.59-1
 - update to 10.35.59
 - fixes array bound violation in ilbmtoppm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	29 Jan 2009 14:21:29 -0000	1.54
+++ sources	16 Feb 2009 11:28:25 -0000	1.55
@@ -1 +1 @@
-77aeea6898f28757c5ab0a4ae65f4d5b  netpbm-10.35.59.tar.bz2
+0d3e23ff20836c0fb8e8365284567296  netpbm-10.35.60.tar.bz2