rpms/optipng/F-9 optipng-0.6.2.1.diff, NONE, 1.1 optipng.spec, 1.9, 1.10

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/optipng/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10529

Modified Files:
	optipng.spec 
Added Files:
	optipng-0.6.2.1.diff 
Log Message:
* Wed Feb 25 2009 Till Maas <opensource at till.name> - 0.6.2.1-1
- Update to new release to fix array overflow
- Red Hat Bugzilla #487364


optipng-0.6.2.1.diff:

--- NEW FILE optipng-0.6.2.1.diff ---
diff -ru optipng-0.6.2/lib/pngxtern/gif/gifread.c optipng-0.6.2.1/lib/pngxtern/gif/gifread.c
--- optipng-0.6.2/lib/pngxtern/gif/gifread.c	2006-08-10 20:17:00.000000000 -0400
+++ optipng-0.6.2.1/lib/pngxtern/gif/gifread.c	2009-02-20 03:11:00.000000000 -0500
@@ -219,8 +219,7 @@
  **/
 static void GIFReadNextExtension(struct GIFExtension *ext, FILE *stream)
 {
-    unsigned char *ptr;
-    unsigned int len;
+    unsigned int offset, len;
     int count, label;
 
     GIF_FGETC(label, stream);
@@ -233,7 +232,7 @@
         return;
     }
 
-    ptr = ext->Buffer;
+    offset = 0;
     len = ext->BufferSize;
     for ( ;; )
     {
@@ -243,10 +242,10 @@
             ext->BufferSize += 1024;
             ext->Buffer = realloc(ext->Buffer, ext->BufferSize);
         }
-        count = ReadDataBlock(ptr, stream);
+        count = ReadDataBlock(ext->Buffer + offset, stream);
         if (count == 0)
             break;
-        ptr += count;
+        offset += count;
         len -= count;
     }
 }
diff -ru optipng-0.6.2/src/optipng.c optipng-0.6.2.1/src/optipng.c
--- optipng-0.6.2/src/optipng.c	2008-11-09 23:56:00.000000000 -0500
+++ optipng-0.6.2.1/src/optipng.c	2008-11-11 13:57:00.000000000 -0500
@@ -542,6 +542,7 @@
 static void
 app_init(void)
 {
+    setvbuf(stdout, NULL, _IONBF, 0);
     if (options.log_name != NULL)
     {
         /* Open the log file, line-buffered. */
diff -ru optipng-0.6.2/src/proginfo.h optipng-0.6.2.1/src/proginfo.h
--- optipng-0.6.2/src/proginfo.h	2008-11-09 23:56:00.000000000 -0500
+++ optipng-0.6.2.1/src/proginfo.h	2009-02-22 23:38:00.000000000 -0500
@@ -1,5 +1,5 @@
 #define PROGRAM_NAME        "OptiPNG"
 #define PROGRAM_DESCRIPTION "Advanced PNG optimizer"
-#define PROGRAM_VERSION     "0.6.2"
-#define PROGRAM_COPYRIGHT   "Copyright (C) 2001-2008 Cosmin Truta"
+#define PROGRAM_VERSION     "0.6.2.1"
+#define PROGRAM_COPYRIGHT   "Copyright (C) 2001-2009 Cosmin Truta"
 #define PROGRAM_URI         "http://optipng.sourceforge.net/"


Index: optipng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/optipng/F-9/optipng.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- optipng.spec	12 Nov 2008 12:33:54 -0000	1.9
+++ optipng.spec	25 Feb 2009 17:45:15 -0000	1.10
@@ -1,12 +1,14 @@
 Name:           optipng
-Version:        0.6.2
+Version:        0.6.2.1
 Release:        1%{?dist}
 Summary:        PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib
 URL:            http://optipng.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/optipng/%{name}-0.6.2.tar.gz
+Patch0:         http://downloads.sourceforge.net/optipng/optipng-0.6.2.1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel libpng-devel
@@ -19,7 +21,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.6.2
 
 # Ensure system libs and headers are used; as of 0.6.1 pngxtern will use
 # the bundled headers if present even with -with-system-*, causing failures.
@@ -27,6 +29,8 @@
 
 %define makefile gcc.mak
 
+%patch0 -p1
+
 %build
 ./configure -with-system-zlib -with-system-libpng
 cd src/
@@ -54,6 +58,10 @@
 
 
 %changelog
+* Wed Feb 25 2009 Till Maas <opensource at till.name> - 0.6.2.1-1
+- Update to new release to fix array overflow
+- Red Hat Bugzilla #487364
+
 * Wed Nov 12 2008 Till Maas <opensource at till.name> - 0.6.2-1
 - Update to new release to fix buffer overflow
 - Red Hat Bugzilla #471206