Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8ab6360060ff3da7e1fa23ab0c5e894495ab5f67)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8ab6360060ff3da7e1fa23ab0c5e894495ab5f67)
  • Date: Tue, 19 Jan 2010 11:08:49 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

php-pear/php/BUILD | 28 +++++++++++++++-------------
php-pear/php/CONFIGURE | 21 +++++++++++++--------
php-pear/php/DEPENDS | 6 ++++--
php-pear/php/HISTORY | 4 ++--
php-pear/php/PREPARE | 4 ++--
5 files changed, 36 insertions(+), 27 deletions(-)

New commits:
commit 8ab6360060ff3da7e1fa23ab0c5e894495ab5f67
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php: fixed compilation of apache/*cgi sapis

diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 9f7d7c5..3c02aae 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -1,27 +1,29 @@
cd "${SOURCE_DIRECTORY}" &&
OPTS="${PHP5_OPTS} ${OPTS}" &&

-# If the CGI or FastCGI SAPI (or both) are selected, enable
'force-cgi-redirect'
-if list_find "${OPTS}" "--enable-cgi" || list_find "${OPTS}"
"--enable-fastcgi"; then
+if [[ $PHP5_SAPI == cgi ]]; then
+ # If the CGI or FastCGI SAPI (or both) are selected, enable
'force-cgi-redirect'
+ if list_find "${OPTS}" "--enable-cgi" || list_find "${OPTS}"
"--enable-fastcgi"; then
message "${MESSAGE_COLOR}CGI or FastCGI SAPI enabled, enabling
force-cgi-redirect${DEFAULT_COLOR}" &&
OPTS="--enable-force-cgi-redirect ${OPTS}"
-fi &&
-
-case "${PHP5_APACHE}" in
+ fi
+else
+ case "${PHP5_APACHE}" in
handler)
- if httpd -v | grep -q "Apache/2\."; then
- message "${MESSAGE_COLOR}Configuring for Apache
2.x${DEFAULT_COLOR}" &&
- OPTS="--with-apxs2 ${OPTS}"
- else
- message "${MESSAGE_COLOR}Configuring for Apache
1.x${DEFAULT_COLOR}" &&
- OPTS="--with-apxs ${OPTS}"
- fi
+ if httpd -v | grep -q "Apache/2\."; then
+ message "${MESSAGE_COLOR}Configuring for Apache 2.x${DEFAULT_COLOR}"
&&
+ OPTS="--with-apxs2 ${OPTS}"
+ else
+ message "${MESSAGE_COLOR}Configuring for Apache 1.x${DEFAULT_COLOR}"
&&
+ OPTS="--with-apxs ${OPTS}"
+ fi
;;

filter)
OPTS="--with-apxs2filter ${OPTS}"
;;
-esac &&
+ esac
+fi &&

# Check to see if internal GD requested
if [[ "${PHP5_GD}" == "internal" ]]; then
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 3bb4130..8c4b411 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -26,13 +26,21 @@ config_query_option PHP5_OPTS "Enable calendar support?"
y \
config_query_option PHP5_OPTS "Enable pcntl support (Only affects CLI/CGI)"
n \
"--enable-pcntl" "--disable-pcntl" &&

-message "${MESSAGE_COLOR}Both FastCGI and CGI can be enabled at the same
time${DEFAULT_COLOR}" &&
+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_option PHP5_OPTS "Enable FastCGI SAPI?" n \
- "--enable-fastcgi" "--disable-fastcgi" &&
+config_query_list PHP5_SAPI "What SAPI do you want to use?" \
+ apache cgi &&

-config_query_option PHP5_OPTS "Enable CGI SAPI?" y \
- "--enable-cgi" "--disable-cgi" &&
+if [[ $PHP5_SAPI == cgi ]]; then
+ config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
+ "--enable-fastcgi" "--disable-fastcgi" &&
+
+ config_query_option PHP5_OPTS "Enable CGI SAPI?" y \
+ "--enable-cgi" "--disable-cgi"
+else
+ config_query_list PHP5_APACHE "Which Apache module to build?" \
+ none handler filter
+fi &&

if [[ "${PHP5_PEAR}" == "y" ]] || list_find "$PHP5_OPTS" "--enable-cgi" ||
list_find "$PHP5_OPTS" "--enable-fastcgi" ; then
message "${MESSAGE_COLOR}Enabling CLI version for PEAR/CGI/FastCGI
support${DEFAULT_COLOR}" &&
@@ -113,9 +121,6 @@ config_query_option PHP5_OPTS "Enable System V semaphore
support?" n \
config_query_option PHP5_OPTS "Enable System V shared memory support?" n \
"--enable-sysvshm" "--disable-sysvshm" &&

-config_query_list PHP5_APACHE "Which Apache module to build?" \
- none handler filter &&
-
config_query_list PHP5_GD "Which GD library to use?" \
none internal external &&

diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index f5fece4..057a9ce 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -47,10 +47,12 @@ optional_depends pth \
"--with-tsrm-pth=${INSTALL_ROOT}/usr"
"--with-tsrm-pthreads" \
"use GNU Portable Threads instead of POSIX threads" &&

-case "${PHP5_APACHE}" in
+if [[ $PHP5_SAPI == apache ]]; then
+ case "${PHP5_APACHE}" in
handler) depends APACHE;;
filter) depends APACHE2;;
-esac &&
+ esac
+fi &&

if [[ "$PHP5_PCRE" == "none" ]]; then
PHP5_OPTS="$PHP5_OPTS --without-pcre-regex --without-pcre"
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 0c1f362..55b0108 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,6 +1,6 @@
2010-01-19 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated PHP5_BRANCH=legacy to 5.2.12
- SECURITY_PATCH++
+ * DETAILS: updated legacy to 5.2.12, SECURITY_PATCH++
+ * BUILD, CONFIGURE, DEPENDS: apache and cgi sapis are mutually
exclusive

2009-11-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.3.1
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index 776a928..99fb3b0 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -6,6 +6,6 @@ config_query_list PHP5_BRANCH "Which branch?" \

if [[ $PHP5_BRANCH != alpha ]] && [[ $PHP5_BRANCH != rc ]]; then
message "For more information on Suhosin patchset see:
http://www.hardened-php.net/suhosin/"; &&
- message "${MESSAGE_COLOR}Currently the Suhosin Patchset forces version 5.2
of php${DEFAULT_COLOR}" &&
- config_query PHP5_SUHOSIN "Do you want tho suhosin patchset enabled?" n
+ message "${MESSAGE_COLOR}Currently the Suhosin patchset forces version 5.2
of php${DEFAULT_COLOR}" &&
+ config_query PHP5_SUHOSIN "Do you want the Suhosin patchset enabled?" n
fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8ab6360060ff3da7e1fa23ab0c5e894495ab5f67), Vlad Glagolev, 01/19/2010

Archive powered by MHonArc 2.6.24.

Top of Page