security patch #56307

5 files changed, 46 insertions, 7 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 7a699bd04bb8..9c5612e013ed 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.41 2004/06/24 23:13:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.42 2004/07/07 14:37:03 vapier Exp $
+
+*libpng-1.2.5-r7 (07 Jul 2004)
+
+  07 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  files/libpng-1.2.5-gentoo.diff, -libpng-1.2.5-r6.ebuild,
+  +libpng-1.2.5-r7.ebuild:
+  Version bump to fix security bug #56307.
 
 *libpng-1.2.5-r6 (13 May 2004)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index bd499f968fa2..26aa1e9cc45e 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,7 +1,17 @@
-MD5 f479b9a8243b46093a80e7613341ac73 libpng-1.2.5-r6.ebuild 1445
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e66ae1d0c3cd402badd8e16ae2f1e5e0 ChangeLog 7912
+MD5 e3c8d82dd1a7ce415d925e45096293ee libpng-1.2.5-r7.ebuild 1443
 MD5 c3f6e4decd490e5d6e65ab197228ec66 libpng-1.0.15-r2.ebuild 1845
-MD5 768780e33f51aa0395f66720302e2944 ChangeLog 7702
-MD5 0f74a3acf75488cf44f857e870379d0d files/digest-libpng-1.0.15-r2 66
-MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r6 65
+MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r7 65
 MD5 41148c3ecb7b1ff7b2e1e57f4663db1a files/libpng-1.0.15-gentoo.diff 2413
-MD5 7a28937fe675b4e9de1b24d6bb129468 files/libpng-1.2.5-gentoo.diff 2570
+MD5 b664d38f024a7b21f299727e4aa76d2e files/libpng-1.2.5-gentoo.diff 3470
+MD5 0f74a3acf75488cf44f857e870379d0d files/digest-libpng-1.0.15-r2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA7AqrHTu7gpaalycRAjxQAKDfhwl4+giyJW5nWSl2nPQnrW9XGACg523u
+yNnUJlMlj3tAdGoD9aD4s/c=
+=zOB4
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r6 b/media-libs/libpng/files/digest-libpng-1.2.5-r7
index 794c1d47d26f..794c1d47d26f 100644
--- a/media-libs/libpng/files/digest-libpng-1.2.5-r6
+++ b/media-libs/libpng/files/digest-libpng-1.2.5-r7
diff --git a/media-libs/libpng/files/libpng-1.2.5-gentoo.diff b/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
index 3229b89a21d6..4104e86568b5 100644
--- a/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
+++ b/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
@@ -13,6 +13,28 @@
  
 --- libpng3-1.2.5.orig/pngrtran.c
 +++ libpng3-1.2.5/pngrtran.c
+@@ -1889,8 +1889,8 @@
+          /* This changes the data from GG to GGXX */
+          if (flags & PNG_FLAG_FILLER_AFTER)
+          {
+-            png_bytep sp = row + (png_size_t)row_width;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 2;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 1; i < row_width; i++)
+             {
+                *(--dp) = hi_filler;
+@@ -1907,8 +1907,8 @@
+          /* This changes the data from GG to XXGG */
+          else
+          {
+-            png_bytep sp = row + (png_size_t)row_width;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 2;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 0; i < row_width; i++)
+             {
+                *(--dp) = *(--sp);
 @@ -1930,7 +1930,7 @@
           if (flags & PNG_FLAG_FILLER_AFTER)
           {
diff --git a/media-libs/libpng/libpng-1.2.5-r6.ebuild b/media-libs/libpng/libpng-1.2.5-r7.ebuild
index 1c6cefc3b230..fe68e8d7f0df 100644
--- a/media-libs/libpng/libpng-1.2.5-r6.ebuild
+++ b/media-libs/libpng/libpng-1.2.5-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r6.ebuild,v 1.2 2004/06/24 23:13:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r7.ebuild,v 1.1 2004/07/07 14:37:03 vapier Exp $
 
 inherit flag-o-matic eutils gcc