diff options
| author | Ismael Luceno | 2015-03-13 15:34:03 -0300 |
|---|---|---|
| committer | Ismael Luceno | 2015-03-13 20:53:58 -0300 |
| commit | 1d96c2a4aeb45853ba1b77a15d8887d6be7b4870 (patch) | |
| tree | a5b5b7eb9d3132df9d51d7b43ed034dad2387aa8 | |
| parent | 6c30e10d4d88565864468c6b2305ca053251e3d4 (diff) | |
php: Remove obsolete patches
| -rwxr-xr-x | php-pear/php/DETAILS | 3 | ||||
| -rw-r--r-- | php-pear/php/HISTORY | 2 | ||||
| -rwxr-xr-x | php-pear/php/PRE_BUILD | 6 | ||||
| -rw-r--r-- | php-pear/php/pcre830.patch | 15 |
4 files changed, 2 insertions, 24 deletions
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS index 72220a2487..f9f4b52717 100755 --- a/php-pear/php/DETAILS +++ b/php-pear/php/DETAILS @@ -31,9 +31,6 @@ case "$PHP_BRANCH" in stable) # 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 esac 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 2b7ac0c556..e7511ad354 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -1,4 +1,6 @@ 2015-03-13 Ismael Luceno <ismael@sourcemage.org> + * 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 diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD index 96280bb9f3..40cfae8f6a 100755 --- a/php-pear/php/PRE_BUILD +++ b/php-pear/php/PRE_BUILD @@ -1,12 +1,6 @@ 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 diff --git a/php-pear/php/pcre830.patch b/php-pear/php/pcre830.patch deleted file mode 100644 index c47722a3fe..0000000000 --- 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 { |