summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2010-07-23 12:01:09 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2010-07-25 12:12:41 +0200
commitf2aee21a9ba6c17dbc8bfe041cd78cba337555dc (patch)
treeacdf97d9842b5f73cab5ef00c6f4c666771653f6
parent1ca8d43c15a7ed4d43800e00da08165421ea8b8f (diff)
libpng: update to version 1.2.44 because of CVE-2010-1205 and converted to BBCLASSEXTENDED
* removed insecure versions
-rw-r--r--recipes/libpng/libpng-native.inc5
-rw-r--r--recipes/libpng/libpng-native_1.2.37.bb6
-rw-r--r--recipes/libpng/libpng-native_1.2.40.bb9
-rw-r--r--recipes/libpng/libpng-native_1.2.41.bb6
-rw-r--r--recipes/libpng/libpng-native_1.2.42.bb6
-rw-r--r--recipes/libpng/libpng.inc6
-rw-r--r--recipes/libpng/libpng_1.2.37.bb8
-rw-r--r--recipes/libpng/libpng_1.2.40.bb8
-rw-r--r--recipes/libpng/libpng_1.2.41.bb8
-rw-r--r--recipes/libpng/libpng_1.2.42.bb8
-rw-r--r--recipes/libpng/libpng_1.2.44.bb8
11 files changed, 13 insertions, 65 deletions
diff --git a/recipes/libpng/libpng-native.inc b/recipes/libpng/libpng-native.inc
deleted file mode 100644
index a515346b62..0000000000
--- a/recipes/libpng/libpng-native.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-inherit native
-
-DEPENDS = "zlib-native"
-
-INHIBIT_NATIVE_STAGE_INSTALL = "1"
diff --git a/recipes/libpng/libpng-native_1.2.37.bb b/recipes/libpng/libpng-native_1.2.37.bb
deleted file mode 100644
index 3c36b52138..0000000000
--- a/recipes/libpng/libpng-native_1.2.37.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng-native_1.2.40.bb b/recipes/libpng/libpng-native_1.2.40.bb
deleted file mode 100644
index 6f0222da42..0000000000
--- a/recipes/libpng/libpng-native_1.2.40.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-
-SRC_URI[tarball.md5sum] = "29bbd1c3cbe54b04bfc2bda43067ccb5"
-SRC_URI[tarball.sha256sum] = "a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40"
diff --git a/recipes/libpng/libpng-native_1.2.41.bb b/recipes/libpng/libpng-native_1.2.41.bb
deleted file mode 100644
index 3c36b52138..0000000000
--- a/recipes/libpng/libpng-native_1.2.41.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng-native_1.2.42.bb b/recipes/libpng/libpng-native_1.2.42.bb
deleted file mode 100644
index 3c36b52138..0000000000
--- a/recipes/libpng/libpng-native_1.2.42.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng.inc b/recipes/libpng/libpng.inc
index fc1feb8941..00530718cc 100644
--- a/recipes/libpng/libpng.inc
+++ b/recipes/libpng/libpng.inc
@@ -3,11 +3,14 @@ HOMEPAGE = "http://www.libpng.org/"
LICENSE = "libpng"
SECTION = "libs"
PRIORITY = "required"
+
DEPENDS = "zlib"
INC_PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2;name=tarball"
+BBCLASSEXTEND = "native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2;name=libpng"
S = "${WORKDIR}/libpng-${PV}"
inherit autotools pkgconfig binconfig
@@ -19,3 +22,4 @@ FILES_libpng12 = "${libdir}/libpng12.so.*"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${libdir}/*.a ${libdir}/pkgconfig \
${datadir}/aclocal ${bindir} ${sbindir}"
+
diff --git a/recipes/libpng/libpng_1.2.37.bb b/recipes/libpng/libpng_1.2.37.bb
deleted file mode 100644
index 950ebb4e59..0000000000
--- a/recipes/libpng/libpng_1.2.37.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libpng.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://makefile_fix.patch"
-
-SRC_URI[tarball.md5sum] = "6d1ee0888dbb711214943cb19c294b49"
-SRC_URI[tarball.sha256sum] = "682960b55527b54bada90e959c2d42679444a1db43677c77eb645a29645f86d1"
diff --git a/recipes/libpng/libpng_1.2.40.bb b/recipes/libpng/libpng_1.2.40.bb
deleted file mode 100644
index 80d87bc08c..0000000000
--- a/recipes/libpng/libpng_1.2.40.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libpng.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://makefile_fix.patch"
-
-SRC_URI[tarball.md5sum] = "29bbd1c3cbe54b04bfc2bda43067ccb5"
-SRC_URI[tarball.sha256sum] = "a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40"
diff --git a/recipes/libpng/libpng_1.2.41.bb b/recipes/libpng/libpng_1.2.41.bb
deleted file mode 100644
index 23899150ad..0000000000
--- a/recipes/libpng/libpng_1.2.41.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libpng.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://makefile_fix.patch"
-
-SRC_URI[tarball.md5sum] = "2faa7f8d81e6a35beb991cb75edbf056"
-SRC_URI[tarball.sha256sum] = "a172c5afe4668a31eb090d14be7fc2811a9fec8568a785badd30280f47a27e00"
diff --git a/recipes/libpng/libpng_1.2.42.bb b/recipes/libpng/libpng_1.2.42.bb
deleted file mode 100644
index d37f7e3df2..0000000000
--- a/recipes/libpng/libpng_1.2.42.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libpng.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://makefile_fix.patch"
-
-SRC_URI[tarball.md5sum] = "9a5cbe9798927fdf528f3186a8840ebe"
-SRC_URI[tarball.sha256sum] = "a044c4632a236bbf99527da81977577929a173c1f7f68a70a81ea2ea7cffa6a7"
diff --git a/recipes/libpng/libpng_1.2.44.bb b/recipes/libpng/libpng_1.2.44.bb
new file mode 100644
index 0000000000..4ba7b20602
--- /dev/null
+++ b/recipes/libpng/libpng_1.2.44.bb
@@ -0,0 +1,8 @@
+require libpng.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://makefile_fix.patch"
+
+SRC_URI[libpng.md5sum] = "e3ac7879d62ad166a6f0c7441390d12b"
+SRC_URI[libpng.sha256sum] = "b9ab20f1c2c3bf6c4448fd9bd8a4a8905b918114d5fada56c97bb758a17b7215"