diff --git a/.cvsignore b/.cvsignore index ae6f6e9..c19e2d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libpng-1.2.24.tar.bz2 +libpng-1.2.29.tar.bz2 diff --git a/libpng-pngconf.patch b/libpng-pngconf.patch index 16aede6..dbaadcb 100644 --- a/libpng-pngconf.patch +++ b/libpng-pngconf.patch @@ -1,18 +1,7 @@ -diff -Naur libpng-1.2.22.orig/configure libpng-1.2.22/configure ---- libpng-1.2.22.orig/configure 2007-10-13 13:07:47.000000000 -0400 -+++ libpng-1.2.22/configure 2007-10-18 12:23:01.000000000 -0400 -@@ -20721,6 +20721,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#define PNG_CONFIGURE_LIBPNG - #include "$srcdir/pnggccrd.c" - int - main () -diff -Naur libpng-1.2.22.orig/configure.ac libpng-1.2.22/configure.ac ---- libpng-1.2.22.orig/configure.ac 2007-10-13 13:07:35.000000000 -0400 -+++ libpng-1.2.22/configure.ac 2007-10-18 12:23:48.000000000 -0400 -@@ -62,7 +62,8 @@ +diff -Naur libpng-1.2.29.orig/configure.ac libpng-1.2.29/configure.ac +--- libpng-1.2.29.orig/configure.ac 2008-05-08 07:58:11.000000000 -0400 ++++ libpng-1.2.29/configure.ac 2008-05-31 20:21:12.000000000 -0400 +@@ -63,7 +63,8 @@ AC_MSG_CHECKING( [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE]) AC_TRY_COMPILE( @@ -22,9 +11,9 @@ diff -Naur libpng-1.2.22.orig/configure.ac libpng-1.2.22/configure.ac [return 0;], AC_MSG_RESULT(yes) LIBPNG_NO_MMX="", -diff -Naur libpng-1.2.22.orig/pngconf.h libpng-1.2.22/pngconf.h ---- libpng-1.2.22.orig/pngconf.h 2007-10-13 13:07:22.000000000 -0400 -+++ libpng-1.2.22/pngconf.h 2007-10-18 12:21:24.000000000 -0400 +diff -Naur libpng-1.2.29.orig/pngconf.h libpng-1.2.29/pngconf.h +--- libpng-1.2.29.orig/pngconf.h 2008-05-08 07:58:03.000000000 -0400 ++++ libpng-1.2.29/pngconf.h 2008-05-31 20:21:12.000000000 -0400 @@ -35,6 +35,25 @@ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/libpng.spec b/libpng.spec index e0512e6..6620a51 100644 --- a/libpng.spec +++ b/libpng.spec @@ -1,7 +1,7 @@ Summary: A library of functions for manipulating PNG image format files Name: libpng Epoch: 2 -Version: 1.2.24 +Version: 1.2.29 Release: 1%{?dist} License: zlib Group: System Environment/Libraries @@ -91,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.la rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 31 2008 Tom Lane 2:1.2.29-1 +- Update to libpng 1.2.29 (fixes low-priority security issue CVE-2008-1382) +Related: #441839 + * Tue Feb 12 2008 Tom Lane 2:1.2.24-1 - Update to libpng 1.2.24 diff --git a/sources b/sources index 9a16bf1..efd13e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e676c5cc7dfa4ef78affe8fb8f1011d libpng-1.2.24.tar.bz2 +f588cb4ee39e3a333604096f937ea157 libpng-1.2.29.tar.bz2