[Pkg-php-commits] [php/debian-sid] Revert "pear-config-is-in-etc_pear: fix path to PEAR's config (Closes: #507762)"

[Raphael Geissert]

This reverts commit 7f4064757257cd3fa01308a9e90dd7c69dca3f15.
Patching the .phar file alters its checksum and php then refuses to
unpack it.
---
 debian/patches/pear-config-is-in-etc_pear.patch |   13 -------------
 debian/patches/series                           |    1 -
 2 files changed, 0 insertions(+), 14 deletions(-)
 delete mode 100644 debian/patches/pear-config-is-in-etc_pear.patch

diff --git a/debian/patches/pear-config-is-in-etc_pear.patch b/debian/patches/pear-config-is-in-etc_pear.patch
deleted file mode 100644
index a53a821..0000000
--- a/debian/patches/pear-config-is-in-etc_pear.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: php/pear/install-pear-nozlib.phar
-===================================================================
---- php.orig/pear/install-pear-nozlib.phar
-+++ php/pear/install-pear-nozlib.phar
-@@ -35998,7 +35998,7 @@ if (getenv('PHP_PEAR_SYSCONF_DIR')) {
- } elseif (getenv('SystemRoot')) {
-     define('PEAR_CONFIG_SYSCONFDIR', getenv('SystemRoot'));
- } else {
--    define('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR);
-+    define('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR . DIRECTORY_SEPARATOR . 'pear');
- }
- 
- // Default for master_server
diff --git a/debian/patches/series b/debian/patches/series
index 3ee452b..27d587d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,4 +36,3 @@ gentoo/006_ext-curl-set_opt-crash.patch
 gentoo/009_ob-memory-leaks.patch
 mssql-null-exception.patch
 exif_read_data-segfault.patch
-pear-config-is-in-etc_pear.patch
-- 
1.6.3.3