[SM-Commit] GIT changes to stable-rc-0.59 grimoire by George Sherwood (9bcad08b1a5f749ff18311559388718b57fdeff0)

George Sherwood scm at sourcemage.org
Sun Aug 21 12:05:52 EDT 2011


GIT changes to stable-rc-0.59 grimoire by George Sherwood <gsherwood at sourcemage.org>:

 php-pear/php/CONFIGURE |    8 ++++----
 php-pear/php/DEPENDS   |   17 ++++++++++++++---
 php-pear/php/DETAILS   |   16 ++++++++--------
 php-pear/php/HISTORY   |    7 +++++++
 4 files changed, 33 insertions(+), 15 deletions(-)

New commits:
commit 9bcad08b1a5f749ff18311559388718b57fdeff0
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: George Sherwood <gsherwood at sourcemage.org>

    php 5.3.7, SECURITY_PATCH=13
    (cherry picked from commit 368c96485f6b9864e0b3650a7ec0831411308384)

commit d01e268c6bca09338353de7ed97cb324ea83345c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    php: corrected apache configure flags and int gd deps
    (cherry picked from commit bceec202fc1f32778f61d2b08846596372f43724)

diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 847589f..cf387bd 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -29,10 +29,10 @@ config_query_option PHP5_OPTS "Enable pcntl support (Only affects CLI/CGI)" n \
 message "${MESSAGE_COLOR}Apache-based and *CGI SAPIs are mutually exclusive (though both FastCGI and CGI can be enabled at the same time)${DEFAULT_COLOR}" &&
 
 config_query_list PHP5_SAPI "What SAPI do you want to use?" \
-                            apache cgi &&
+                            apache cgi none &&
 
 if [[ $PHP5_SAPI == cgi ]]; then
-  PHP5_OPTS="${PHP5_OPTS} --enable-cgi" &&
+  PHP5_OPTS="--enable-cgi --without-apxs --without-apxs2 ${PHP5_OPTS}" &&
 
   if [[ $PHP5_BRANCH == legacy ]]; then
     config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
@@ -40,9 +40,9 @@ if [[ $PHP5_SAPI == cgi ]]; then
   else
     message "${MESSAGE_COLOR}The FastCGI SAPI is now always enabled since PHP 5.3.0${DEFAULT_COLOR}"
   fi
-else
+elif [[ $PHP5_SAPI == apache ]]; then
   config_query_list PHP5_APACHE "Which Apache module to build?" \
-                    none handler filter
+                                handler filter
 fi &&
 
 if [[ "${PHP5_PEAR}" == "y" ]] || list_find "$PHP5_OPTS" "--enable-cgi" || list_find "$PHP5_OPTS" "--enable-fastcgi" ; then
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 96fdf3a..60c9928 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -51,8 +51,14 @@ optional_depends pth \
 if [[ $PHP5_SAPI == apache ]]; then
   case "${PHP5_APACHE}" in
     handler) depends APACHE;;
-    filter) depends APACHE2;;
-  esac
+    filter) depends APACHE2 '--with-apxs2 --without-apxs';;
+  esac &&
+
+  if [[ "$(get_spell_provider $SPELL APACHE)" == 'apache1' ]]; then
+    PHP5_OPTS="--with-apxs --without-apxs2 $PHP5_OPTS"
+  else
+    PHP5_OPTS="--with-apxs2 --without-apxs $PHP5_OPTS"
+  fi
 fi &&
 
 if [[ "$PHP5_PCRE" == "none" ]]; then
@@ -220,6 +226,10 @@ if [[ "${PHP5_GD}" != "none" ]]; then
                      "--without-xpm" \
                      "for XPM image support" &&
 
+  if [[ "${PHP5_GD}" == "internal" ]]; then
+    depends JPEG "--with-jpeg-dir=${INSTALL_ROOT}/usr" &&
+    depends libpng "--with-png-dir=${INSTALL_ROOT}/usr"
+  else
     optional_depends JPEG \
                      "--with-jpeg-dir=${INSTALL_ROOT}/usr" \
                      "--without-jpeg-dir" \
@@ -228,7 +238,8 @@ if [[ "${PHP5_GD}" != "none" ]]; then
     optional_depends libpng \
                      "--with-png-dir=${INSTALL_ROOT}/usr" \
                      "--without-png-dir" \
-                     "for PNG support (for GD)" &&
+                     "for PNG support (for GD)"
+  fi &&
 
     optional_depends t1lib \
                      "--with-t1lib=${INSTALL_ROOT}/usr" \
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 37a8971..2dcb692 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
            SPELL=php
 if [[ $PHP5_BRANCH == stable ]]; then
-         VERSION=5.3.6
-  SECURITY_PATCH=12
-     SOURCE_HASH=sha512:deb24febcd3b19787a26953229ecd67d1f4b57314c31a8a11ae9d8dfe142b8ae9ccfadf333ff21c30e1f8b7c9b22c484d2da55fd826d07b9a2093ef9bbac9ec9
+         VERSION=5.3.7
+  SECURITY_PATCH=13
+     SOURCE_HASH=sha512:235c124abb2be9b1b8c6855d3ba5739ce9a49ab0419b1c5f4febedf3e0192d6ab56e7a087bb8cc41cbbc55803d0f886916952c61d8327f146bf2a664f33ebbf1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
    if [[ $PHP5_SUHOSIN == y ]]; then
@@ -15,8 +15,8 @@ if [[ $PHP5_BRANCH == stable ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
    fi
 elif [[ $PHP5_BRANCH == alpha ]]; then
-         VERSION=5.3.6
-     SOURCE_HASH=sha512:deb24febcd3b19787a26953229ecd67d1f4b57314c31a8a11ae9d8dfe142b8ae9ccfadf333ff21c30e1f8b7c9b22c484d2da55fd826d07b9a2093ef9bbac9ec9
+         VERSION=5.3.7
+     SOURCE_HASH=sha512:235c124abb2be9b1b8c6855d3ba5739ce9a49ab0419b1c5f4febedf3e0192d6ab56e7a087bb8cc41cbbc55803d0f886916952c61d8327f146bf2a664f33ebbf1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 elif [[ $PHP5_BRANCH == legacy ]]; then
@@ -34,9 +34,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
      SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
   fi
 else
-         VERSION=5.3.6
-  SECURITY_PATCH=12
-     SOURCE_HASH=sha512:deb24febcd3b19787a26953229ecd67d1f4b57314c31a8a11ae9d8dfe142b8ae9ccfadf333ff21c30e1f8b7c9b22c484d2da55fd826d07b9a2093ef9bbac9ec9
+         VERSION=5.3.7
+  SECURITY_PATCH=13
+     SOURCE_HASH=sha512:235c124abb2be9b1b8c6855d3ba5739ce9a49ab0419b1c5f4febedf3e0192d6ab56e7a087bb8cc41cbbc55803d0f886916952c61d8327f146bf2a664f33ebbf1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
 fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index fd5f13f..23d967c 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,10 @@
+2011-08-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 5.3.7, SECURITY_PATCH=13
+
+2011-08-11 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, CONFIGURE: corrected apache flags; moved 'none' SAPI selector
+	  to a proper place; fixed dependencies for internal gd
+
 2011-03-18 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to version 5.3.6
 


More information about the SM-Commit mailing list