From: Chris Larson <clarson@kergoth.com>
Date: Thu, 15 Jul 2004 22:50:20 +0000 (+0000)
Subject: Merge openembedded@openembedded.bkbits.net:packages
X-Git-Tag: Release-2010-05/1~18205
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f375a9c36776ba914b9133e3a1925f1de80d9813;p=openembedded.git

Merge openembedded@openembedded.bkbits.net:packages
into zelda.tuxnami.org:/home/kergoth/code/packages

2004/07/15 17:45:40-05:00 (none)!kergoth
Apply gentoo's patch to libpng, which fixes the security problem noted at
http://www.debian.org/security/2004/dsa-498.

BKrev: 40f70a2cAZAgDDzfw4IH5eAZzBltLg
---

diff --git a/libpng/files/libpng-1.2.5-gentoo.diff b/libpng/files/libpng-1.2.5-gentoo.diff
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libpng/libpng_1.2.5.oe b/libpng/libpng_1.2.5.oe
index bd1d7aae7d..91b3305aef 100644
--- a/libpng/libpng_1.2.5.oe
+++ b/libpng/libpng_1.2.5.oe
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "zlib"
-PR = "r1"
+PR = "r2"
 
 PACKAGES =+ "${PN}12 ${PN}12-dev"
 
@@ -14,7 +14,8 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig \
 		${datadir}/aclocal ${bindir} ${sbindir}
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/png-mng/libpng-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/png-mng/libpng-${PV}.tar.bz2 \
+	   file://libpng-${PV}-gentoo.diff;patch=1"
 
 inherit pkgconfig