Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c3613b6929c01d6b45e4b275086c450bc7f38359)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c3613b6929c01d6b45e4b275086c450bc7f38359)
  • Date: Fri, 18 Sep 2009 13:39:35 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

php-pear/php/DETAILS | 29 ++++++++++++++---------------
php-pear/php/HISTORY | 4 ++++
php-pear/php/PREPARE | 18 +++++++++---------
3 files changed, 27 insertions(+), 24 deletions(-)

New commits:
commit c3613b6929c01d6b45e4b275086c450bc7f38359
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: added branching, updated legacy to .11

diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index e3ecf50..5ed8cb2 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,36 +1,35 @@
SPELL=php
-if [[ $PHP5_RC == y ]]; then
+if [[ $PHP5_BRANCH == stable ]]; then
VERSION=5.3.0

SOURCE_HASH=sha512:ff9cf8653b56b9320c3b40da4611d291adf186c83931c710a645a3021a5b99398fe867889daf785a6bd1c423395f1fd40566c9676d829ab6f1e711a886c66024
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/ilia/$SOURCE
-elif [[ $PHP5_ALPHA == y ]]; then
+elif [[ $PHP5_BRANCH == alpha ]]; then
VERSION=5.3.0

SOURCE_HASH=sha512:ff9cf8653b56b9320c3b40da4611d291adf186c83931c710a645a3021a5b99398fe867889daf785a6bd1c423395f1fd40566c9676d829ab6f1e711a886c66024
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
-else
- VERSION=5.3.0
- SECURITY_PATCH=9
-
SOURCE_HASH=sha512:ff9cf8653b56b9320c3b40da4611d291adf186c83931c710a645a3021a5b99398fe867889daf785a6bd1c423395f1fd40566c9676d829ab6f1e711a886c66024
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-fi
-
-if [[ $PHP5_SUHOSIN == y ]]; then
- VERSION=5.2.10
- SECURITY_PATCH=9
-
SOURCE_HASH=sha512:df1de653a2cadb335c8cc684baa2ab3cd9614c7d8a2231beed164d9375aa181e94f501ce15267fa9b8c009b106e9797cd30382cde58e1106cd24a30c6203b213
+elif [[ $PHP5_BRANCH == legacy ]]; then
+ VERSION=5.2.11
+ SECURITY_PATCH=10
+
SOURCE_HASH=sha512:80aefe55ab89cce6bc1d4b38818c3c2bc4030d9077ee9e50b167e85965d5564acc485400b9098e9e46590232aef003275c35a6b5cdc36d3aa1dcfcac7744275b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
+ if [[ $PHP5_SUHOSIN == y ]]; then
VERSION2=0.9.7
SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
SOURCE3=$SOURCE2.sig
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
+ fi
+else
+ VERSION=5.3.0
+ SECURITY_PATCH=9
+
SOURCE_HASH=sha512:ff9cf8653b56b9320c3b40da4611d291adf186c83931c710a645a3021a5b99398fe867889daf785a6bd1c423395f1fd40566c9676d829ab6f1e711a886c66024
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
fi
-
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.php.net/
ENTERED=20011024
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index b0f44a6..07e6606 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2009-09-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated legacy to 5.2.11
+ * PREPARE: added branching
+
2009-09-14 David Kowis <dkowis AT shlrm.org>
* CONFIGURE: added database driver selection, configured most of
spell here. Added smarter question for PCRE
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index 56af4b1..776a928 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -1,11 +1,11 @@
-config_query PHP5_RC "Install latest Release Candidate version?" n &&
+config_query_list PHP5_BRANCH "Which branch?" \
+ stable \
+ legacy \
+ rc \
+ alpha &&

-if [[ "${PHP5_RC}" != "y" ]]; then
- config_query PHP5_ALPHA "Install the latest alpha version?" n
-
- if [[ "${PHP5_ALPHA}" != "y" ]]; then
- message "For more information on Suhosin patchset see:
http://www.hardened-php.net/suhosin/"; &&
- message "${MESSAGE_COLOR}Currently the Suhosin Patchset
forces version 5.2 of php${DEFAULT_COLOR}" &&
- config_query PHP5_SUHOSIN "Do you want tho suhosin patchset
enabled?" n
- fi
+if [[ $PHP5_BRANCH != alpha ]] && [[ $PHP5_BRANCH != rc ]]; then
+ message "For more information on Suhosin patchset see:
http://www.hardened-php.net/suhosin/"; &&
+ message "${MESSAGE_COLOR}Currently the Suhosin Patchset forces version 5.2
of php${DEFAULT_COLOR}" &&
+ config_query PHP5_SUHOSIN "Do you want tho suhosin patchset enabled?" n
fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c3613b6929c01d6b45e4b275086c450bc7f38359), Vlad Glagolev, 09/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page