sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (e1c34e68f57051a5be2802dfb235ce284413ff99)

From: Elisamuel Resto <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (e1c34e68f57051a5be2802dfb235ce284413ff99)
Date: Sat, 3 May 2008 03:15:02 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

php-pear/php/DETAILS | 4 ++--
php-pear/php/HISTORY | 4 ++++
php-pear/php/PRE_BUILD | 5 +++--
3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit e1c34e68f57051a5be2802dfb235ce284413ff99
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php: changed SOURCE_URL for suhosin patch; made PRE_BUILD apply
it properly

diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 32fc5a9..12220ef 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 1cf9a7f..4279f27 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2008-05-03 Elisamuel Resto <ryuji AT 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 AT 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
old mode 100644
new mode 100755
index 8818c50..9dcac0b
--- 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

[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (e1c34e68f57051a5be2802dfb235ce284413ff99), Elisamuel Resto, 05/03/2008