sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev (c84e9b70cafc9cef0e79ef4032ab2c83e660940f)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev (c84e9b70cafc9cef0e79ef4032ab2c83e660940f)
- Date: Sun, 2 Oct 2011 10:46:06 -0500
GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:
php-pear/php/DETAILS | 2 +-
php-pear/php/HISTORY | 6 ++++++
php-pear/php/PRE_BUILD | 4 ++++
php-pear/php/security-20110929.patch.bz2 |binary
4 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit c84e9b70cafc9cef0e79ef4032ab2c83e660940f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: security bump (legacy)
(cherry picked from commit 68bae4bcc4b2cfbd1af9a242e7a756adfdbc29a8)
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index a5bc870..e57ebc5 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 5025371..cf2d618 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+2011-10-02 Vlad Glagolev <stealth AT 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 AT 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 3eb0e38..b02a038 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 0000000..a387f51
Binary files /dev/null and b/php-pear/php/security-20110929.patch.bz2 differ
- [SM-Commit] GIT changes to stable-rc-0.60 grimoire by Vlad Glagolev (c84e9b70cafc9cef0e79ef4032ab2c83e660940f), Vlad Glagolev, 10/02/2011
Archive powered by MHonArc 2.6.24.