sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79219 by Arwed von Merkatz for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Benoit Papillault" <benoit.papillault AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79219 by Arwed von Merkatz for review
Date: Sat, 13 May 2006 18:05:01 +0100 (BST)

Change 79219 by arwed_von_merkatz@arwed-Otherland on 2006/05/13 18:01:50

dependency fix, bug #10945

Affected files ...

... //sgl/grimoires/stable-rc/0.4/php-pear/php/BUILD#2 integrate
... //sgl/grimoires/stable-rc/0.4/php-pear/php/CONFIGURE#2 integrate
... //sgl/grimoires/stable-rc/0.4/php-pear/php/DEPENDS#2 integrate
... //sgl/grimoires/stable-rc/0.4/php-pear/php/HISTORY#3 integrate
... //sgl/grimoires/stable/0.3/php-pear/php/BUILD#3 integrate
... //sgl/grimoires/stable/0.3/php-pear/php/CONFIGURE#2 integrate
... //sgl/grimoires/stable/0.3/php-pear/php/DEPENDS#2 integrate
... //sgl/grimoires/stable/0.3/php-pear/php/HISTORY#3 integrate

Differences ...

==== //sgl/grimoires/stable-rc/0.4/php-pear/php/BUILD#2 (xtext) ====

@@ -54,7 +54,6 @@
--enable-dbase \
--enable-sockets \
--with-iconv \
- --with-xmlrpc \
--with-versioning \
--with-mod_charset \
--with-pear \

==== //sgl/grimoires/stable-rc/0.4/php-pear/php/CONFIGURE#2 (xtext) ====

@@ -24,4 +24,4 @@
'--disable-fastcgi' &&

config_query_list PHP4_APACHE 'Which Apache module to build?' \
- handler filter none
+ none handler filter

==== //sgl/grimoires/stable-rc/0.4/php-pear/php/DEPENDS#2 (xtext) ====

@@ -4,6 +4,9 @@
# 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 @@
"--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" \

==== //sgl/grimoires/stable-rc/0.4/php-pear/php/HISTORY#3 (text) ====

@@ -1,3 +1,9 @@
+2006-04-19 Sergey Lipnevich <sergey AT 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-04-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: set SECURITY_PATCH=1 for
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0207 and

==== //sgl/grimoires/stable/0.3/php-pear/php/BUILD#3 (xtext) ====

@@ -54,7 +54,6 @@
--enable-dbase \
--enable-sockets \
--with-iconv \
- --with-xmlrpc \
--with-versioning \
--with-mod_charset \
--with-pear \

==== //sgl/grimoires/stable/0.3/php-pear/php/CONFIGURE#2 (xtext) ====

@@ -24,4 +24,4 @@
'--disable-fastcgi' &&

config_query_list PHP4_APACHE 'Which Apache module to build?' \
- handler filter none
+ none handler filter

==== //sgl/grimoires/stable/0.3/php-pear/php/DEPENDS#2 (xtext) ====

@@ -4,6 +4,9 @@
# 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 @@
"--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" \

==== //sgl/grimoires/stable/0.3/php-pear/php/HISTORY#3 (text) ====

@@ -4,6 +4,12 @@
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0208
bug #10889

+2006-04-19 Sergey Lipnevich <sergey AT 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 AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

[SM-Commit] PERFORCE change 79219 by Arwed von Merkatz for review, Perforce Review Daemon, 05/13/2006