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 (file)
index 0000000..e69de29

diff --git a/libpng/libpng_1.2.5.oe b/libpng/libpng_1.2.5.oe
index bd1d7aa..91b3305 100644 (file)
--- 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