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

Raphael Geissert atomo64 at gmail.com
Sun Feb 7 23:20:27 UTC 2010


---
 debian/patches/pear-config-is-in-etc_pear.patch |   13 +++++++++++++
 debian/patches/series                           |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)
 create 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
new file mode 100644
index 0000000..a53a821
--- /dev/null
+++ b/debian/patches/pear-config-is-in-etc_pear.patch
@@ -0,0 +1,13 @@
+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 27d587d..3ee452b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,4 @@ 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





More information about the Pkg-php-commits mailing list