rpms/libpng/F-7 .cvsignore, 1.12, 1.13 libpng-pngconf.patch, 1.1, 1.2 libpng.spec, 1.40, 1.41 sources, 1.12, 1.13 libpng-trns-bug.patch, 1.1, NONE

Tom Lane (tgl) fedora-extras-commits at redhat.com
Thu Oct 18 16:59:07 UTC 2007


Author: tgl

Update of /cvs/pkgs/rpms/libpng/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15076

Modified Files:
	.cvsignore libpng-pngconf.patch libpng.spec sources 
Removed Files:
	libpng-trns-bug.patch 
Log Message:
Update to libpng 1.2.22, primarily to fix CVE-2007-5269


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Feb 2007 16:16:04 -0000	1.12
+++ .cvsignore	18 Oct 2007 16:58:33 -0000	1.13
@@ -1 +1 @@
-libpng-1.2.16.tar.bz2
+libpng-1.2.22.tar.bz2

libpng-pngconf.patch:

Index: libpng-pngconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-7/libpng-pngconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libpng-pngconf.patch	12 Feb 2007 16:16:05 -0000	1.1
+++ libpng-pngconf.patch	18 Oct 2007 16:58:33 -0000	1.2
@@ -1,30 +1,30 @@
-diff -Naur libpng-1.2.16.orig/configure libpng-1.2.16/configure
---- libpng-1.2.16.orig/configure	2007-01-31 08:22:51.000000000 -0500
-+++ libpng-1.2.16/configure	2007-02-12 10:29:04.000000000 -0500
-@@ -20558,6 +20558,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 "pnggccrd.c"
+ #include "$srcdir/pnggccrd.c"
  int
  main ()
-diff -Naur libpng-1.2.16.orig/configure.ac libpng-1.2.16/configure.ac
---- libpng-1.2.16.orig/configure.ac	2007-01-31 08:22:41.000000000 -0500
-+++ libpng-1.2.16/configure.ac	2007-02-12 10:29:04.000000000 -0500
+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 @@
  AC_MSG_CHECKING(
    [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
  AC_TRY_COMPILE(
--  [#include "pnggccrd.c"],
+-  [#include "$srcdir/pnggccrd.c"],
 +  [#define PNG_CONFIGURE_LIBPNG
-+   #include "pnggccrd.c"],
++   #include "$srcdir/pnggccrd.c"],
    [return 0;],
    AC_MSG_RESULT(yes)
    LIBPNG_NO_MMX="",
-diff -Naur libpng-1.2.16.orig/pngconf.h libpng-1.2.16/pngconf.h
---- libpng-1.2.16.orig/pngconf.h	2007-01-31 08:22:33.000000000 -0500
-+++ libpng-1.2.16/pngconf.h	2007-02-12 10:31:39.000000000 -0500
+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
 @@ -35,6 +35,25 @@
  #ifdef HAVE_CONFIG_H
  #include "config.h"


Index: libpng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-7/libpng.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libpng.spec	23 May 2007 21:15:20 -0000	1.40
+++ libpng.spec	18 Oct 2007 16:58:33 -0000	1.41
@@ -1,16 +1,15 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.16
-Release: 2%{?dist}
-License: BSD
+Version: 1.2.22
+Release: 1%{?dist}
+License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
 
 Source: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
 Patch0: libpng-multilib.patch
 Patch1: libpng-pngconf.patch
-Patch2: libpng-trns-bug.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -54,7 +53,6 @@
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -93,6 +91,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 18 2007 Tom Lane <tgl at redhat.com> 2:1.2.22-1
+- Update to libpng 1.2.22, primarily to fix CVE-2007-5269
+Related: #324771
+- Update License tag
+
 * Wed May 23 2007 Tom Lane <tgl at redhat.com> 2:1.2.16-2
 - Add patch to fix CVE-2007-2445
 Related: #239542


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Feb 2007 16:16:05 -0000	1.12
+++ sources	18 Oct 2007 16:58:33 -0000	1.13
@@ -1 +1 @@
-7a1ca4f49bcffdec60d50f48460642bd  libpng-1.2.16.tar.bz2
+e50208ad684a5822c74b8a260962a4d4  libpng-1.2.22.tar.bz2


--- libpng-trns-bug.patch DELETED ---




More information about the fedora-extras-commits mailing list