Skip to Content.
Sympa Menu

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

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 (bceec202fc1f32778f61d2b08846596372f43724)
  • Date: Wed, 10 Aug 2011 19:20:29 -0500

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

http/apache22/DEPENDS | 6 ++++--
http/apache22/HISTORY | 3 +++
libs/apr-util/HISTORY | 3 +++
libs/apr-util/PRE_SUB_DEPENDS | 5 +++++
libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS | 5 +++++
libs/apr-util/SUB_DEPENDS | 6 ++++++
php-pear/php/CONFIGURE | 8 ++++----
php-pear/php/DEPENDS | 17 ++++++++++++++---
php-pear/php/HISTORY | 4 ++++
9 files changed, 48 insertions(+), 9 deletions(-)

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

php: corrected apache configure flags and int gd deps

commit 689d88cca8e8f073a9158798b04b745e5cf3cda5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apache22: improved dependency check

commit 186b39e1658dbfb18997eb5e3cfcba21ba8e94b8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apr-util: added LDAP subdependency

diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index af158fc..46d5d82 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -1,8 +1,10 @@
-#depends apr "--with-apr=${INSTALL_ROOT}/usr" &&
-#depends apr-util "--with-apr-util=${INSTALL_ROOT}/usr" &&
depends apr &&
depends apr-util &&

+if list_find "$OPTS" "ldap"; then
+ depends -sub LDAP apr-util
+fi &&
+
optional_depends openssl \
'--enable-ssl' \
'--disable-ssl' \
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 22a3116..09d50bb 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: force LDAP version of apr-util if any ldap module is
selected
+
2011-05-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.19; SECURITY_PATCH++ (CVE-2011-1928)
swapped source urls; modified short desc
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 1c0f808..150cd32 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added LDAP subdependency
+
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: fixed dependency flags

diff --git a/libs/apr-util/PRE_SUB_DEPENDS b/libs/apr-util/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/SUB_DEPENDS b/libs/apr-util/SUB_DEPENDS
new file mode 100755
index 0000000..a7d6161
--- /dev/null
+++ b/libs/apr-util/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) message "apr-util with OpenLDAP support requested, forcing openldap
dependency" &&
+ depends openldap "--with-ldap";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
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/HISTORY b/php-pear/php/HISTORY
index fd5f13f..0201766 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+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




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (bceec202fc1f32778f61d2b08846596372f43724), Vlad Glagolev, 08/10/2011

Archive powered by MHonArc 2.6.24.

Top of Page