diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-07-07 14:37:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-07-07 14:37:03 +0000 |
| commit | 38037af17393590889574b63545b0c6be16b80f9 (patch) | |
| tree | 1c76f3f913699a53218ffbfef1230cecccf7bf41 /media-libs/libpng | |
| parent | Fix for bug #55315 (Manifest recommit) (diff) | |
| download | gentoo-2-38037af17393590889574b63545b0c6be16b80f9.tar.gz gentoo-2-38037af17393590889574b63545b0c6be16b80f9.tar.bz2 gentoo-2-38037af17393590889574b63545b0c6be16b80f9.zip | |
security patch #56307
Diffstat (limited to 'media-libs/libpng')
| -rw-r--r-- | media-libs/libpng/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/libpng/files/digest-libpng-1.2.5-r7 (renamed from media-libs/libpng/files/digest-libpng-1.2.5-r6) | 0 | ||||
| -rw-r--r-- | media-libs/libpng/files/libpng-1.2.5-gentoo.diff | 22 | ||||
| -rw-r--r-- | media-libs/libpng/libpng-1.2.5-r7.ebuild (renamed from media-libs/libpng/libpng-1.2.5-r6.ebuild) | 2 |
4 files changed, 31 insertions, 2 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/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 |