From 4fe971b0244ec88137a08b368df6234f287010e3 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Dec 28 2006 11:01:44 +0000
Subject: - pbmtog3 won't segfault on 64bit arches (#220739)


---

diff --git a/netpbm-10.35-pbmtog3segfault.patch b/netpbm-10.35-pbmtog3segfault.patch
new file mode 100644
index 0000000..fef31ab
--- /dev/null
+++ b/netpbm-10.35-pbmtog3segfault.patch
@@ -0,0 +1,11 @@
+--- 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;
+     }
diff --git a/netpbm.spec b/netpbm.spec
index f5be9b9..a98ef1b 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.35
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -22,6 +22,7 @@ Patch12: netpbm-10.33-ppmtompeg.patch
 Patch13: netpbm-10.33-multilib.patch
 Patch14: netpbm-10.34-pamscale.patch
 Patch15: netpbm-10.35-ppmquantall.patch
+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
@@ -81,6 +82,7 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %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
@@ -187,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template
 %{_mandir}/man5/*
 
 %changelog
+* Thu Dec 28 2006 Jindrich Novy <jnovy@redhat.com> 10.35-9
+- pbmtog3 won't segfault on 64bit arches (#220739)
+
 * Tue Dec 19 2006 Jindrich Novy <jnovy@redhat.com> 10.35-8
 - remove bogus man pages (#220112, #220113)
 - overflow2() no more conflicts with libgd.so (#216116)