diff options
| author | Vlad Glagolev | 2012-06-01 14:07:33 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2012-06-14 12:28:52 +0400 |
| commit | eaaf4a27ab56986582000deb18df87b40c40d9e9 (patch) | |
| tree | cadf9660b18ca33c242705e195a7e0c20eddd3a7 | |
| parent | aafb1ddc48c42076ab967dfd568977047650fcb3 (diff) | |
php: security update for legacy branch (with backported patches) to 20120526
(cherry picked from commit 9e398219ed19fe907c0b18826ef9ad89bfe564e3)
| -rwxr-xr-x | php-pear/php/DETAILS | 10 | ||||
| -rw-r--r-- | php-pear/php/HISTORY | 6 | ||||
| -rwxr-xr-x | php-pear/php/PRE_BUILD | 5 | ||||
| -rw-r--r-- | php-pear/php/security-20110929.patch.bz2 | bin | 2637 -> 0 bytes |
4 files changed, 16 insertions, 5 deletions
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS index a1613205ab..5c29c5c65f 100755 --- a/php-pear/php/DETAILS +++ b/php-pear/php/DETAILS @@ -13,7 +13,7 @@ if [[ $PHP5_BRANCH == stable ]]; then SOURCE3=$SOURCE2.sig SOURCE3_IGNORE=signature SOURCE3_URL="http://download.suhosin.org/$SOURCE3" - SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY" + SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY" fi elif [[ $PHP5_BRANCH == alpha ]]; then VERSION=5.3.13 @@ -23,7 +23,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then SECURITY_PATCH=17 elif [[ $PHP5_BRANCH == legacy ]]; then VERSION=5.2.17 - SECURITY_PATCH=16 + SECURITY_PATCH=17 SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE @@ -33,9 +33,13 @@ elif [[ $PHP5_BRANCH == legacy ]]; then SOURCE2=suhosin-patch-$VERSIONX-$VERSION2.patch.gz SOURCE2_URL="http://download.suhosin.org/$SOURCE2" SOURCE3=$SOURCE2.sig + SOURCE3_IGNORE=signature SOURCE3_URL="http://download.suhosin.org/$SOURCE3" - SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY" + SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY" fi + SOURCE4=php52-backports-20120526.patch + SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4 + SOURCE4_HASH=sha512:d3650e2a7a33b69c4d55125956a141af702fa61a8e470edb143ab49c5865ba18a34659c90e1c28c70826a7b3659a9eeae063a30ee5f7d0e8d4cf96d76320fa9c else VERSION=5.3.13 SECURITY_PATCH=17 diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index 63b5672c14..043d145c76 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -1,3 +1,9 @@ +2012-06-01 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated backports+security patches to 20120526; fixed + verification bug for suhosin patch + * PRE_BUILD: apply patch for legacy branch + * security-20110929.patch.bz2: removed + 2012-05-09 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 5.3.13, SECURITY_PATCH=17 diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD index b02a0383cf..b3c82e4bce 100755 --- a/php-pear/php/PRE_BUILD +++ b/php-pear/php/PRE_BUILD @@ -2,10 +2,11 @@ default_pre_build && cd "${SOURCE_DIRECTORY}" && if [[ $PHP5_BRANCH == legacy ]]; then - bzcat "$SPELL_DIRECTORY/security-20110929.patch.bz2" | patch -p1 + unpack_file 4 && + patch -p1 < "${SOURCE_CACHE}/${SOURCE4}" fi && if [[ "${PHP5_SUHOSIN}" == "y" ]]; then - verify_source "${SOURCE2}" && + unpack_file 2 && zcat "${SOURCE_CACHE}/${SOURCE2}" | patch -p1 fi diff --git a/php-pear/php/security-20110929.patch.bz2 b/php-pear/php/security-20110929.patch.bz2 Binary files differdeleted file mode 100644 index a387f518e5..0000000000 --- a/php-pear/php/security-20110929.patch.bz2 +++ /dev/null |