[SM-Commit] GIT changes to master grimoire by Arjan Bouter (0172d3fceb41e769736b86387cf26066e500f49c)

Arjan Bouter scm at sourcemage.org
Wed Jul 29 19:10:10 EDT 2009


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 ftp/curl/DETAILS         |    1 +
 ftp/curl/HISTORY         |    3 +++
 ftp/curl/PRE_SUB_DEPENDS |    6 ++++++
 ftp/curl/SUB_DEPENDS     |    8 ++++++++
 php-pear/php/DEPENDS     |    5 +++--
 php-pear/php/HISTORY     |    3 ++-
 6 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit c3d1894b787a55af0b25a152f85d0bdd58f9c61b
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    php: added sub-depends on curl with c-ares disabled when curl is used
    for url streams in core php functions. fixes bug 14830

commit 30b3801e9f7042ae4de0d23fb5dd39eb071fa1f4
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    curl: added sub-depends for with and without c-ares

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 0f64e0f..da4f910 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
   SOURCE2_URL[0]=$SOURCE_URL.asc
       SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
+      PATCHLEVEL=1
         WEB_SITE=http://curl.haxx.se/
          ENTERED=20010922
       LICENSE[0]=MIT
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 7aeb4fe..558b8ac 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2009-07-29 Arjan Bouter <abouter at sourcemage.org>
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: added c-ares options for php
+
 2009-05-18 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 7.19.5
 
diff --git a/ftp/curl/PRE_SUB_DEPENDS b/ftp/curl/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..4006468
--- /dev/null
+++ b/ftp/curl/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    ARES) is_depends_enabled $SPELL c-ares;;
+    NO_ARES) is_depends_enabled $SPELL c-ares && return 1;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+       return 1;;
+esac
diff --git a/ftp/curl/SUB_DEPENDS b/ftp/curl/SUB_DEPENDS
new file mode 100755
index 0000000..26976f9
--- /dev/null
+++ b/ftp/curl/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+    ARES) message "Curl with c-ares requested, forcing c-ares dependency" &&
+          depends c-ares "--enable-ares=$INSTALL_ROOT/usr" ;;
+ NO_ARES) message "Curl without c-ares requested, forcing disabled c-ares dependency" &&
+          optional_depends c-ares "--disable-ares" ;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1 ;;
+esac
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 204c162..b967707 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -42,7 +42,7 @@ case "${PHP5_APACHE}" in
 esac &&
 
 optional_depends pcre \
-                 "--with-pcre-regex --with-pcre=${INSTALL_ROOT}/usr" \
+                 "--with-pcre-regex=${INSTALL_ROOT}/usr --with-pcre=${INSTALL_ROOT}/usr" \
                  "--without-pcre-regex --without-pcre" \
                  "for perl regular expressions support (required for PEAR)" &&
 
@@ -85,7 +85,8 @@ optional_depends curl \
 
 if is_depends_enabled $SPELL curl; then
     config_query_option PHP5_OPTS "Do you want to use cURL for URL streams in core PHP functions?" n \
-                        "--with-curlwrappers" "--without-curlwrappers"
+                        "--with-curlwrappers" "--without-curlwrappers" &&
+    depends -sub NO_ARES curl
 fi &&
 
 optional_depends gmp \
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 507b2b8..893720c 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -2,7 +2,8 @@
 	* BUILD, CONFIGURE: moved options to DEPENDS
 	  and added some missing options.
 	* DEPENDS: almost rewritten to minimise irrelevant questions,
-	  added some missing options
+	  added some missing options.
+	  added sub-depends for curl without c-ares (fixes bug 14830)
 
 2009-07-02 Eric Sandall <sandalle at sourcemage.org>
 	* INSTALL: php.ini-dist -> php.ini-production (Bug #15278)



More information about the SM-Commit mailing list