diff options
| author | Elisamuel Resto | 2008-05-03 04:11:13 -0400 |
|---|---|---|
| committer | Eric Sandall | 2008-05-13 16:00:12 -0700 |
| commit | c27e14f64b8d231a695c6946c8bf53d1af9639b0 (patch) | |
| tree | 50cb3f9797dd51d6e2fddda08b6c08645910de3e | |
| parent | f47be6e56f8d8947dcc2f5d9b0a4eb7f93a01dd1 (diff) | |
php-pear/php: changed SOURCE_URL for suhosin patch; made PRE_BUILD apply it properly
(cherry picked from commit e1c34e68f57051a5be2802dfb235ce284413ff99)
| -rwxr-xr-x | php-pear/php/DETAILS | 4 | ||||
| -rw-r--r-- | php-pear/php/HISTORY | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | php-pear/php/PRE_BUILD | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS index 32fc5a9674..12220ef49a 100755 --- a/php-pear/php/DETAILS +++ b/php-pear/php/DETAILS @@ -15,9 +15,9 @@ fi if [[ $PHP_SUHOSIN == y ]]; then VERSION2=0.9.6.2 SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz - SOURCE2_URL="http://www.hardened-php.net/suhosin/_media/$SOURCE2" + SOURCE2_URL="http://download.suhosin.org/$SOURCE2" SOURCE3=$SOURCE2.sig - SOURCE3_URL="http://www.hardened-php.net/suhosin/_media/$SOURCE3" + SOURCE3_URL="http://download.suhosin.org/$SOURCE3" SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY" fi SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index 1cf9a7f427..4279f27edf 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -1,3 +1,7 @@ +2008-05-03 Elisamuel Resto <ryuji@sourcemage.org> + * DETAILS: changed the SOURCE_URL for the suhosin patch + * PRE_BUILD: chmod 0755; changed SPOOL_DIRECTORY for SOURCE_CACHE + 2008-05-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 5.2.6, SECURITY_PATCH=7 [Bug 14506] diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD index 8818c50e2b..9dcac0b516 100644..100755 --- a/php-pear/php/PRE_BUILD +++ b/php-pear/php/PRE_BUILD @@ -1,7 +1,8 @@ default_pre_build && cd $SOURCE_DIRECTORY && + if [[ $PHP_SUHOSIN == y ]]; then -verify_source $SOURCE2 && -zcat $SPOOL_DIRECTORY/$SOURCE2 | patch -p1 + verify_source $SOURCE2 && + zcat $SOURCE_CACHE/$SOURCE2 | patch -p1 fi |