summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-03-04 23:23:54 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-03-05 00:04:00 +0100
commit70c732de4a75c4bc51a8f7c83130eef631eaae55 (patch)
tree95f997b8989e9fcd1e158250ce27183be8eb7cbd
parente874add03c391a79319f1177773d89882ba6357a (diff)
php-5.2.11: Upgrade to 5.2.12 to fix various issues
Fix CVE-2009-3557, CVE-2009-3558, CVE-2009-4017, CVE-2009-4142 and CVE-2009-4143.
-rw-r--r--conf/checksums.ini4
-rw-r--r--recipes/php/php-5.2.12/acinclude-xml2-config.patch (renamed from recipes/php/php-5.2.11/acinclude-xml2-config.patch)0
-rw-r--r--recipes/php/php-5.2.12/imap-fix-autofoo.patch (renamed from recipes/php/php-5.2.11/imap-fix-autofoo.patch)0
-rw-r--r--recipes/php/php-5.2.12/pear-makefile.patch (renamed from recipes/php/php-5.2.11/pear-makefile.patch)0
-rw-r--r--recipes/php/php.inc2
-rw-r--r--recipes/php/php_5.2.12.bb (renamed from recipes/php/php_5.2.11.bb)3
6 files changed, 4 insertions, 5 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4ed537935c..eb097a22ae 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -21998,10 +21998,6 @@ sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
md5=e6029fafcee029edcfa2ceed7a005333
sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
-[http://us2.php.net/distributions/php-5.2.11.tar.bz2]
-md5=286bf34630f5643c25ebcedfec5e0a09
-sha256=9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23
-
[http://us2.php.net/distributions/php-5.2.5.tar.bz2]
md5=1fe14ca892460b09f06729941a1bb605
sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
diff --git a/recipes/php/php-5.2.11/acinclude-xml2-config.patch b/recipes/php/php-5.2.12/acinclude-xml2-config.patch
index bf519d2934..bf519d2934 100644
--- a/recipes/php/php-5.2.11/acinclude-xml2-config.patch
+++ b/recipes/php/php-5.2.12/acinclude-xml2-config.patch
diff --git a/recipes/php/php-5.2.11/imap-fix-autofoo.patch b/recipes/php/php-5.2.12/imap-fix-autofoo.patch
index 3695b7bc42..3695b7bc42 100644
--- a/recipes/php/php-5.2.11/imap-fix-autofoo.patch
+++ b/recipes/php/php-5.2.12/imap-fix-autofoo.patch
diff --git a/recipes/php/php-5.2.11/pear-makefile.patch b/recipes/php/php-5.2.12/pear-makefile.patch
index 487f507a02..487f507a02 100644
--- a/recipes/php/php-5.2.11/pear-makefile.patch
+++ b/recipes/php/php-5.2.12/pear-makefile.patch
diff --git a/recipes/php/php.inc b/recipes/php/php.inc
index 0f9a42077a..6f30690440 100644
--- a/recipes/php/php.inc
+++ b/recipes/php/php.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.php.net"
SECTION = "console/network"
LICENSE = "PHP"
-SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
+SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2;name=src\
file://acinclude-xml2-config.patch;patch=1"
S = "${WORKDIR}/php-${PV}"
diff --git a/recipes/php/php_5.2.11.bb b/recipes/php/php_5.2.12.bb
index 5b4871cbc7..9ae606bdc5 100644
--- a/recipes/php/php_5.2.11.bb
+++ b/recipes/php/php_5.2.12.bb
@@ -8,6 +8,9 @@ PR = "r4"
SRC_URI += "file://pear-makefile.patch;patch=1 \
file://imap-fix-autofoo.patch;patch=1 \
"
+SRC_URI[src.md5sum] = "5b7077e366c7eeab34da31dd860a1923"
+SRC_URI[src.sha256sum] = "e65756a8412726a491ca48da1e0693eaeb3f38f19fb6cbc8f53005cab1f2491a"
+
export THREADS="pthread"
export LIBS=" -lpthread "