summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2011-10-02 19:44:48 +0400
committerVlad Glagolev2011-10-02 22:04:08 +0400
commit5e80151249ce463e1e26aed308949d010e078b5c (patch)
treefb475fd98a70a99146e0163f3a261f5e514c8ca2
parente86e9b20b4b8bd2b1005c736648b73068b6a00a6 (diff)
php: security bump (legacy)
(cherry picked from commit 68bae4bcc4b2cfbd1af9a242e7a756adfdbc29a8)
-rwxr-xr-xphp-pear/php/DETAILS2
-rw-r--r--php-pear/php/HISTORY6
-rwxr-xr-xphp-pear/php/PRE_BUILD4
-rw-r--r--php-pear/php/security-20110929.patch.bz2bin0 -> 2637 bytes
4 files changed, 11 insertions, 1 deletions
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index a5bc87079b..e57ebc5c91 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -21,7 +21,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=15
+ SECURITY_PATCH=16
SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 5025371241..cf2d618f70 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+2011-10-02 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (legacy branch)
+ * PRE_BUILD: apply the patch
+ * security-20110929.patch.bz2: added, backported security fixes from 5.3
+ branch by project php52-backports
+
2011-08-29 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: suhosin patch 5.2.16 applies fine for PHP 5.2.17
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index 3eb0e38008..b02a0383cf 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
+if [[ $PHP5_BRANCH == legacy ]]; then
+ bzcat "$SPELL_DIRECTORY/security-20110929.patch.bz2" | patch -p1
+fi &&
+
if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
verify_source "${SOURCE2}" &&
zcat "${SOURCE_CACHE}/${SOURCE2}" | patch -p1
diff --git a/php-pear/php/security-20110929.patch.bz2 b/php-pear/php/security-20110929.patch.bz2
new file mode 100644
index 0000000000..a387f518e5
--- /dev/null
+++ b/php-pear/php/security-20110929.patch.bz2
Binary files differ