From 1d96c2a4aeb45853ba1b77a15d8887d6be7b4870 Mon Sep 17 00:00:00 2001
From: Ismael Luceno
Date: Fri, 13 Mar 2015 15:34:03 -0300
Subject: php: Remove obsolete patches

---
 php-pear/php/DETAILS       |  3 ---
 php-pear/php/HISTORY       |  2 ++
 php-pear/php/PRE_BUILD     |  6 ------
 php-pear/php/pcre830.patch | 15 ---------------
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 php-pear/php/pcre830.patch

(limited to 'php-pear')

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 {
-- 
cgit v1.2.3