summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2012-02-03 03:31:51 +0400
committerVlad Glagolev2012-02-03 03:53:34 +0400
commit72d73f1a8db010073ebc98232002c6810081173d (patch)
tree0723063465d73bb6731b002e17d1bed5291b5280
parent0661898a35ae9b84fa59f9bac706e56522e83685 (diff)
php: => 5.3.10 (security)stable-0.60-7
(cherry picked from commit 16788790f79b156c3a9a5e52a74e0b4a5dd22a65)
-rwxr-xr-xphp-pear/php/DETAILS20
-rw-r--r--php-pear/php/HISTORY4
2 files changed, 15 insertions, 9 deletions
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 029fcb9808..02837d1d34 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,13 +1,14 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.3.9
- SECURITY_PATCH=15
- SOURCE_HASH=sha512:b3c03223c15045feae83e68b1b276456ed79979cb834ac2080379ff6e9ad64e2aa2ab5fb3e2fd94eb0c3217bd7350c33d0acba9da5675b58caab79216fdec9bf
+ VERSION=5.3.10
+ SECURITY_PATCH=16
+ SOURCE_HASH=sha512:667b0b0871f8edb101115783739c4bfbbf7cbe5c8c090e184a01c4efbad07df882135e23c85fc6630f3ee5d4ec22384b9859942f996708ca6f9a51875b17b527
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
+ VERSIONX=5.3.9
VERSION2=0.9.10
- SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
+ SOURCE2=suhosin-patch-$VERSIONX-$VERSION2.patch.gz
SOURCE2_URL="http://download.suhosin.org/$SOURCE2"
SOURCE3=$SOURCE2.sig
SOURCE3_IGNORE=signature
@@ -15,10 +16,11 @@ if [[ $PHP5_BRANCH == stable ]]; then
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
elif [[ $PHP5_BRANCH == alpha ]]; then
- VERSION=5.3.9
- SOURCE_HASH=sha512:b3c03223c15045feae83e68b1b276456ed79979cb834ac2080379ff6e9ad64e2aa2ab5fb3e2fd94eb0c3217bd7350c33d0acba9da5675b58caab79216fdec9bf
+ VERSION=5.3.10
+ SOURCE_HASH=sha512:667b0b0871f8edb101115783739c4bfbbf7cbe5c8c090e184a01c4efbad07df882135e23c85fc6630f3ee5d4ec22384b9859942f996708ca6f9a51875b17b527
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
+ SECURITY_PATCH=1
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
SECURITY_PATCH=16
@@ -35,9 +37,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
else
- VERSION=5.3.9
- SECURITY_PATCH=15
- SOURCE_HASH=sha512:b3c03223c15045feae83e68b1b276456ed79979cb834ac2080379ff6e9ad64e2aa2ab5fb3e2fd94eb0c3217bd7350c33d0acba9da5675b58caab79216fdec9bf
+ VERSION=5.3.10
+ SECURITY_PATCH=16
+ SOURCE_HASH=sha512:667b0b0871f8edb101115783739c4bfbbf7cbe5c8c090e184a01c4efbad07df882135e23c85fc6630f3ee5d4ec22384b9859942f996708ca6f9a51875b17b527
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 55b47e5829..042930fcf2 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2012-02-03 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 5.3.10; SECURITY_PATCH++ (CVE-2012-0830);
+ added SECURITY_PATCH for alpha branch
+
2012-02-01 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: corrected 5.3 branch build with suhosin patch