Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ef3b83214e44df8898e16842c561b9646ea93e32)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ef3b83214e44df8898e16842c561b9646ea93e32)
  • Date: Fri, 13 Mar 2015 18:54:42 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

php-pear/php/DETAILS | 59
+++++++--------------------------------------
php-pear/php/HISTORY | 12 +++++++++
php-pear/php/PREPARE | 13 ++-------
php-pear/php/PRE_BUILD | 13 ---------
php-pear/php/pcre830.patch | 15 -----------
5 files changed, 25 insertions(+), 87 deletions(-)

New commits:
commit ef3b83214e44df8898e16842c561b9646ea93e32
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php: Remove Suhosin patch, it is dead

commit 1d96c2a4aeb45853ba1b77a15d8887d6be7b4870
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php: Remove obsolete patches

commit 6c30e10d4d88565864468c6b2305ca053251e3d4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php 5.6.6 (stable)

commit 1543fb37d9674e9c5c3f21d11ba41ebaf109f7b0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php 5.5.22 (oldstable)

commit d1eec8b67eb6d9c46366d29b4ae66de3cde0fd1f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php 5.4.38 (legacy)

commit 6ba6977a05c3c84357837e5f6d258047eefb3cb6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php: Rename branch, previous => oldstable

commit ef3373bcf5dd958ee7e88fef779494e08da431e6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php: Rewrite branch selection to use a case statement

commit 5bb3a6c58293622b8e53a636afcc5e0081e1b7f5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php: Remove rc and alpha branches

commit ff495a6b94584afc241bc2fdadedddfcd2022366
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

php: Use prepare_select_branch

diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index b1faf4d..a5b95ac 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,58 +1,19 @@
SPELL=php
-if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.4.38
+case "$PHP_BRANCH" in stable)
+ VERSION=5.6.6
SECURITY_PATCH=14
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-
SOURCE_HASH=sha512:92b2901117bbaa6c4749027e4a7dbb2f4bb50a3f60b52583051abdfcddafbe4715025a928ea9a6c70b51352e5e43f7ced626d78f5fff97cb1be34a9864f9ed6e
-elif [[ $PHP5_BRANCH == previous ]]; then
- VERSION=5.3.29
+
SOURCE_HASH=sha512:2b305a3487464b35ae6a3b0cc1d4537649e1e49fd1cd8c2ca8f2b6b7dd7d02f1738b12dca484a0327766b6fe060d1e6a9250b65da5399ecf61e9f579aa486fb6
+;; oldstable)
+ VERSION=5.5.22
SECURITY_PATCH=23
-
SOURCE_HASH=sha512:c22c463df7371bbd97beb258f0a9b9d77ec5c3c733fc565091e2bfcda3da2f1d2ab406047afcc70a6da2331acd2698885328d5a334c9922fa7591852eefda5f7
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-# if [[ $PHP5_SUHOSIN == y ]]; then
-# VERSIONX=5.3.9
-# VERSION2=0.9.10
-# 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="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
-# fi
-elif [[ $PHP5_BRANCH == alpha ]]; then
- VERSION=5.5.0alpha5
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://downloads.php.net/dsp/$SOURCE
-
SOURCE_HASH=sha512:647a60adc47392bfa35b73a26873f6ac68a555ba146201b47a7fae7e76c078d6bf41a93f5f7e60b38c005c81ec74979ef5625673695934ebb01069ea465a9b79
-elif [[ $PHP5_BRANCH == legacy ]]; then
- VERSION=5.2.17
+
SOURCE_HASH=sha512:3eabd6fa2cd10e83fc3c00fb43313feefbb8c2772778dc6f176612fcb449761e22b55053e5b0b7f6954c0c141ab6c799f08bdca1851078511b7ef9376dadefac
+;; legacy)
+ VERSION=5.4.38
SECURITY_PATCH=23
-
SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
+
SOURCE_HASH=sha512:92b2901117bbaa6c4749027e4a7dbb2f4bb50a3f60b52583051abdfcddafbe4715025a928ea9a6c70b51352e5e43f7ced626d78f5fff97cb1be34a9864f9ed6e
+esac
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
- if [[ $PHP5_SUHOSIN == y ]]; then
- VERSIONX=5.2.16
- VERSION2=0.9.7
- 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="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
- fi
- SOURCE4=php52-backports-20130717.patch
- SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
-
SOURCE4_HASH=sha512:ec31a0a99c225e1f9f8df494e8661a879f5017f2b82c5180f225b5d71eb7cdbebfdc888a4c54b3c38ae44bff1fe263142f0cce0ed4787cc9bdd175c42f7f3eaa
-else
-# rc branch
- VERSION=5.3.17
- SECURITY_PATCH=19
-
SOURCE_HASH=sha512:70f5dca6c5e19c38b0586cd2f3854459ca56cac929b6c0cf8fda606b21031576c08214e817411c1c76158b14d09c175b9ef6ff35e17536b9dc80bdfb7d9b8937
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://downloads.php.net/johannes/$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 16c2786..999c44f 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,15 @@
+2015-03-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PRE_BUILD, PREPARE: Suhosin patch removed, dead
+ * DETAILS, PRE_BUILD: Backports removed
+ * pcre830.patch: Removed, not needed anymore
+ * DETAILS: update spell to 5.4.38 (legacy)
+ updated oldstable to 5.5.22
+ updated stable to 5.6.6
+ * DETAILS, PREPARE: Rename branch, previous => oldstable
+ * DETAILS: Rewrite branch selection to use a case statement
+ * DETAILS, PREPARE: Remove rc and alpha branches
+ * PREPARE: Use prepare_select_branch
+
2015-02-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.4.38 (stable); SECURITY_PATCH++
(CVE-2015-0235, CVE-2015-0273)
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index 4e53391..a26656d 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -1,13 +1,6 @@
. ${GRIMOIRE}/FUNCTIONS &&

-config_query_list PHP5_BRANCH "Which branch?" \
+prepare_select_branch \
stable \
- previous \
- legacy \
- rc \
- alpha &&
-
-if [[ $PHP5_BRANCH == legacy ]]; then
- message "For more information on Suhosin patchset see:
http://www.hardened-php.net/suhosin/"; &&
- config_query PHP5_SUHOSIN "Do you want the Suhosin patchset enabled?" n
-fi
+ oldstable \
+ legacy
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
deleted file mode 100755
index 96280bb..0000000
--- a/php-pear/php/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-if [[ $PHP5_BRANCH == legacy ]]; then
- unpack_file 4 &&
- patch -p1 < "${SOURCE_CACHE}/${SOURCE4}" &&
- patch -p0 < "$SPELL_DIRECTORY/pcre830.patch"
-fi &&
-
-if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
- unpack_file 2 &&
- zcat "${SOURCE_CACHE}/${SOURCE2}" | patch -p1
-fi
diff --git a/php-pear/php/pcre830.patch b/php-pear/php/pcre830.patch
deleted file mode 100644
index c47722a..0000000
--- a/php-pear/php/pcre830.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ext/pcre/php_pcre.c.orig
-+++ ext/pcre/php_pcre.c
-@@ -252,10 +252,11 @@
- back the compiled pattern, otherwise go on and compile it. */
- if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void
**)&pce) == SUCCESS) {
- /*
-- * We use a quick pcre_info() check to see whether cache is
corrupted, and if it
-+ * We use a quick pcre_fullinfo() check to see whether cache
is corrupted, and if it
- * is, we flush it and compile the pattern from scratch.
- */
-- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
-+ int count = 0;
-+ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT,
&count) == PCRE_ERROR_BADMAGIC) {
- zend_hash_clean(&PCRE_G(pcre_cache));
- } else {



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ef3b83214e44df8898e16842c561b9646ea93e32), Ismael Luceno, 03/13/2015

Archive powered by MHonArc 2.6.24.

Top of Page