diff options
| author | root | 2006-06-15 22:35:03 -0500 |
|---|---|---|
| committer | root | 2006-06-15 22:35:03 -0500 |
| commit | d06e680a36e1d9aba9b7a2dc94486b9720f412d6 (patch) | |
| tree | 34b103fde0e21ad73ff4398b764012413933cfec | |
| parent | 040265da0f9384eb1b7ec617dbca9c6e2e2f0a84 (diff) | |
php-pear/php/: 2006/06/15 sync stable from p4
| -rwxr-xr-x | php-pear/php/BUILD | 1 | ||||
| -rwxr-xr-x | php-pear/php/CONFIGURE | 2 | ||||
| -rwxr-xr-x | php-pear/php/DEPENDS | 13 | ||||
| -rw-r--r-- | php-pear/php/HISTORY | 6 |
4 files changed, 10 insertions, 12 deletions
diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD index 74be4366e4..19a09e51f9 100755 --- a/php-pear/php/BUILD +++ b/php-pear/php/BUILD @@ -54,7 +54,6 @@ esac && --enable-dbase \ --enable-sockets \ --with-iconv \ - --with-xmlrpc \ --with-versioning \ --with-mod_charset \ --with-pear \ diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE index ce001c2329..0ca9329460 100755 --- a/php-pear/php/CONFIGURE +++ b/php-pear/php/CONFIGURE @@ -24,4 +24,4 @@ config_query_option PHP4_FCGI 'Enable FastCGI module?' y \ '--disable-fastcgi' && config_query_list PHP4_APACHE 'Which Apache module to build?' \ - handler filter none + none handler filter diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS index 8ec7447248..ef28da9128 100755 --- a/php-pear/php/DEPENDS +++ b/php-pear/php/DEPENDS @@ -4,6 +4,9 @@ depends flex && # optional extensions depend on it, and it"s omnipresent anyway. depends zlib "--with-zlib --with-zlib-dir=/usr" && +# This is required since PHP 5 +depends libxml2 '--enable-xml --with-dom --with-xmlrpc' && + case "$PHP4_APACHE" in handler) depends APACHE;; filter) depends APACHE2;; @@ -95,16 +98,6 @@ optional_depends openldap \ "--without-ldap" \ "for LDAP support" && -optional_depends expat \ - "--enable-xml --with-expat-dir=/usr" \ - "--disable-xml" \ - "for XML parsing" && - -optional_depends libxml2 \ - "--with-dom=/usr" \ - "--without-dom" \ - "for DOM XML support" && - optional_depends libxslt \ "--with-dom-xslt=/usr --with-dom-exslt=/usr" \ "--without-dom-xslt --without-dom-exslt" \ diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index 4d6debcb87..a2f9d721f2 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -4,6 +4,12 @@ http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0208 bug #10889 +2006-04-19 Sergey Lipnevich <sergey@sourcemage.org> + * CONFIGURE: put "none" as first choice in Apache module kinds to be + consistent with sorcery prompts; + * BUILD: remove XMLRPC option; + * DEPENDS: libxml2 mandatory; expat removed; XMLRPC option added. + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS |