From 1eb9c0f0a0eb5df9ef0871e7262ec08039361b01 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Wed, 5 Apr 2006 11:23:26 +0000
Subject: [PATCH] - update to 10.33 - drop upstreamed .ppmdepth patch - fix
 segfault in ppmtompeg when encoding jpeg images (#185970)

---
 .cvsignore                   |  2 ++
 netpbm-10.33-ppmtompeg.patch | 13 +++++++++++++
 netpbm.spec                  | 13 +++++++++----
 sources                      |  4 ++--
 4 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 netpbm-10.33-ppmtompeg.patch

diff --git a/.cvsignore b/.cvsignore
index f767047..4228169 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -18,3 +18,5 @@ netpbmdoc-10.31.tar.bz2
 netpbm-10.31.tar.bz2
 netpbm-10.32.tar.bz2
 netpbmdoc-10.32.tar.bz2
+netpbm-10.33.tar.bz2
+netpbmdoc-10.33.tar.bz2
diff --git a/netpbm-10.33-ppmtompeg.patch b/netpbm-10.33-ppmtompeg.patch
new file mode 100644
index 0000000..d5506d1
--- /dev/null
+++ b/netpbm-10.33-ppmtompeg.patch
@@ -0,0 +1,13 @@
+--- netpbm-10.33/converter/ppm/ppmtompeg/fsize.c.ppmtompeg	1995-07-03 23:57:05.000000000 +0200
++++ netpbm-10.33/converter/ppm/ppmtompeg/fsize.c	2006-04-05 12:44:04.000000000 +0200
+@@ -117,8 +117,8 @@
+     Fsize_Validate(&Fsize_x, &Fsize_y);
+ 
+     if ((Fsize_x==0) || (Fsize_y==0)) {
+-      fprintf(stderr,"Frame %d:  size is zero!\n",id);
+-/*      exit(1); */
++      fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id);
++      exit(1);
+     }
+ 
+ #ifdef BLEAH
diff --git a/netpbm.spec b/netpbm.spec
index 37b7c4e..6971ad1 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
-Version: 10.32
-Release: 2
+Version: 10.33
+Release: 1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -21,7 +21,7 @@ Patch10: netpbm-10.28-CAN-2005-2471.patch
 Patch11: netpbm-10.29-pnmtopng.patch
 Patch12: netpbm-10.30-rgbtxt.patch
 Patch13: netpbm-10.31-xwdfix.patch
-Patch14: netpbm-10.32-pnmdepth.patch
+Patch14: netpbm-10.33-ppmtompeg.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
 Obsoletes: libgr
@@ -79,7 +79,7 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch11 -p1 -b .pnmtopng
 %patch12 -p1 -b .rgbtxt
 %patch13 -p1 -b .xwdfix
-%patch14 -p1 -b .pnmdepth
+%patch14 -p1 -b .ppmtompeg
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -178,6 +178,11 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template
 %{_mandir}/man5/*
 
 %changelog
+* Wed Apr  5 2006 Jindrich Novy <jnovy@redhat.com> 10.33-3
+- update to 10.33
+- drop upstreamed .ppmdepth patch
+- fix segfault in ppmtompeg when encoding jpeg images (#185970)
+
 * Mon Apr  3 2006 Jindrich Novy <jnovy@redhat.com> 10.32-2
 - fix broken symlink in upstream: pnmsdepth -> pamdepth  (#187667)
 
diff --git a/sources b/sources
index bbf6d0a..c1a57e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f5e96eb9e3692c24b56dd011c2ca2948  netpbm-10.32.tar.bz2
-a36f6786359883186369d61a84b25ae6  netpbmdoc-10.32.tar.bz2
+2393ee1de99356c704007706ede73d43  netpbm-10.33.tar.bz2
+21f91a8f9e508b9428455cb24e0f41c1  netpbmdoc-10.33.tar.bz2