SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
@@ -37,9 +37,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE3_URL="http://download.suhosin.org/$SOURCE3"
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
- SOURCE4=php52-backports-20120826.patch
+ SOURCE4=php52-backports-20120924.patch
SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
-
SOURCE4_HASH=sha512:edff47355256c2270a61b7e01df98067b44ce7be6b7cb70de595fd369e1389c3c6bf7bc0b6ac1309bb0be13e0f8382eb07f3c8ce523671e6b5e76fa91a219c05
+
SOURCE4_HASH=sha512:1753ebbe9c5abadc13dc84ad1cb3baa7369489691016eb4a49fa51120fc7eeb9971ece34767ce4659b4b35b2b9744d7d84c20cf1ba84acab015650c7a1fd9d96
else
VERSION=5.3.17
SECURITY_PATCH=19
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index ed8c39f..85bd433 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated backports+security patches to 20120924;
+ SECUIRTY_PATCH++
+ * PRE_BUILD: apply the patch for legacy php branch
+ * pcre830.patch: added to fix build with external pcre lib >=8.30
+
2012-09-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.3.17
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index b3c82e4..96280bb 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -3,7 +3,8 @@ cd "${SOURCE_DIRECTORY}" &&
if [[ $PHP5_BRANCH == legacy ]]; then
unpack_file 4 &&
- patch -p1 < "${SOURCE_CACHE}/${SOURCE4}"
+ patch -p1 < "${SOURCE_CACHE}/${SOURCE4}" &&
+ patch -p0 < "$SPELL_DIRECTORY/pcre830.patch"
fi &&
if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
diff --git a/php-pear/php/pcre830.patch b/php-pear/php/pcre830.patch
new file mode 100644
index 0000000..c47722a
--- /dev/null
+++ b/php-pear/php/pcre830.patch
@@ -0,0 +1,15 @@
+--- 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 Vlad Glagolev (1f1e4fc840baf6da8e23d104a5b01487bcfb2f8a),
Vlad Glagolev, 10/03/2012