From fc3c96cb768654404c90a8a2617f33660f352cbe Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:17:31 +0000
Subject: [PATCH] auto-import changelog data from netpbm-10.22-2.src.rpm Fri
 Jul 02 2004 Phil Knirsch <pknirsch@redhat.com> 10.22-2 - Fixed Zero byte
 allocation error in bmptopnm (#123169) - Honour the $TMPDIR in ppmfade
 (#117247) - Fixed nested function bug (#117377) - Fixed several uninitialized
 variables (#117377)

---
 netpbm-10.22-cmapsize.patch | 10 ++++++++++
 netpbm.spec                 | 16 +++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 netpbm-10.22-cmapsize.patch

diff --git a/netpbm-10.22-cmapsize.patch b/netpbm-10.22-cmapsize.patch
new file mode 100644
index 0000000..ee8570d
--- /dev/null
+++ b/netpbm-10.22-cmapsize.patch
@@ -0,0 +1,10 @@
+--- netpbm-10.22/converter/other/bmptopnm.c.cmapsize	2004-07-02 17:59:51.799270546 +0200
++++ netpbm-10.22/converter/other/bmptopnm.c	2004-07-02 18:03:16.995978954 +0200
+@@ -962,6 +962,7 @@
+                    , BMPoffbits(BMPheader.class, BMPheader.cBitCount, 
+                                 BMPheader.cmapsize));
+     }
++    if(BMPheader.cmapsize != 0)
+     {
+         unsigned int bytesRead;
+         BMPreadcolormap(ifP, BMPheader.cBitCount, BMPheader.class, 
diff --git a/netpbm.spec b/netpbm.spec
index 2113ab0..c480212 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.22
-Release: 1
+Release: 2
 License: freeware
 Group: System Environment/Libraries
 Source0: netpbm-nojbig-%{version}.tar.bz2
@@ -13,6 +13,10 @@ Patch4: netpbm-10.18-manpath.patch
 Patch5: netpbm-10.19-message.patch
 Patch6: netpbm-10.22-security2.patch
 Patch7: netpbm-10.19-gcc34.patch
+Patch8: netpbm-10.22-cmapsize.patch
+Patch9: netpbm-10.22-tempdir.patch
+Patch10: netpbm-10.22-nestedfunc.patch
+Patch11: netpbm-10.22-initvar.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
 Obsoletes: libgr
@@ -63,6 +67,10 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch5 -p1 -b .message
 %patch6 -p1 -b .security2
 %patch7 -p1 -b .gcc34
+%patch8 -p1 -b .cmapsize
+%patch9 -p1 -b .tempdir
+%patch10 -p1 -b .nestedfunc
+%patch11 -p1 -b .initvar
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -151,6 +159,12 @@ rm -rf $RPM_BUILD_ROOT/usr/pkginfo
 %{_mandir}/man5/*
 
 %changelog
+* Fri Jul 02 2004 Phil Knirsch <pknirsch@redhat.com> 10.22-2
+- Fixed Zero byte allocation error in bmptopnm (#123169)
+- Honour the $TMPDIR in ppmfade (#117247)
+- Fixed nested function bug (#117377)
+- Fixed several uninitialized variables (#117377)
+
 * Mon Jun 28 2004 Phil Knirsch <pknirsch@redhat.com> 10.22-1
 - Update to latest upstream version 10.22 (also for docs).
 - Removed jbig and hdcp code from tarball.