Source Mage code commit list

[Elisamuel Resto <scm AT sourcemage.org>]

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

 ChangeLog               |    6 ++++++
 apache.gpg              |binary
 http/apache22/BUILD     |    3 +++
 http/apache22/CONFIGURE |    3 +++
 http/apache22/HISTORY   |    3 +++
 http/mod_fcgid/BUILD    |    6 ++++++
 http/mod_fcgid/DEPENDS  |    1 +
 http/mod_fcgid/DETAILS  |   22 ++++++++++++++++++++++
 http/mod_fcgid/HISTORY  |    2 ++
 php-pear/php/CONFIGURE  |   13 ++++++++-----
 php-pear/php/HISTORY    |    4 ++++
 11 files changed, 58 insertions(+), 5 deletions(-)

New commits:
commit fbbf3b94249cbd646b5043c94ba004a9b71a40e0
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

    http/apache22: Allow picking of MPM modules

commit 05f78cd7aea2e3ddff295d14a556865aff4c557a
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

    http/mod_fcgid: new spell, FastCGI control daemon for Apache

commit 9c17d42a571f8a46a57bc04395c81002276bb6de
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

    php-pear/php: FastCGI SAPI is now enabled since PHP 5.3.0

commit 2fc4f36e0ea2264ce45b7ec80fdf0e461e402938
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

    php-pear/php: If CGI was picked, dont ask again; if CGI was picked, use it

commit ccdcafc4bc5aeb2ef224f3483f89ed75dcf27b03
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

    apache.gpg: added key id 39FF092C, signer of mod_fcgid tarballs

diff --git a/ChangeLog b/ChangeLog
index 23fc610..ba9593d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-28 Elisamuel Resto <ryuji AT sourcemage.org>
+       * http/mod_fcgid: new spell, FastCGI control daemon for Apache
+
+2010-04-26 Elisamuel Resto <ryuji AT sourcemage.org>
+       * apache.gpg: added key id 39FF092C, signer of mod_fcgid tarballs
+
 2010-04-26 Pol Vinogradov <vin.public AT gmail.com>
        * chat-im/qutim: new spell, multiprotocol Instant messenger based on
          Qt 4
diff --git a/apache.gpg b/apache.gpg
index 274d176..4142fe8 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/http/apache22/BUILD b/http/apache22/BUILD
index e87b05c..32db176 100755
--- a/http/apache22/BUILD
+++ b/http/apache22/BUILD
@@ -1,3 +1,6 @@
+# use user-specific worker
+APACHE22_EXTRA="${APACHE22_EXTRA} --with-mpm=${APACHE22_MPM}" &&
+
 # remove APR and APU and reconfigure to use external ones
 rm  -fr  srclib/apr*/  &&
 
diff --git a/http/apache22/CONFIGURE b/http/apache22/CONFIGURE
index e3712b7..54bc751 100755
--- a/http/apache22/CONFIGURE
+++ b/http/apache22/CONFIGURE
@@ -1,3 +1,6 @@
+message "${PROBLEM_COLOR}Before picking a MPM, please see: 
http://sourcemage.org/ApacheMPM${DEFAULT_COLOR}"; &&
+config_query_list APACHE22_MPM "Which MPM would you like?" prefork worker 
event &&
+
 # Apache2 CONFIGURE script
 #
 # Created 2003-07-21 by Gareth Clay <g.clay AT warwick.ac.uk> with a
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index ba9afc5..eb63005 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2010-04-28 Elisamuel Resto <ryuji AT simplysam.us>
+       * BUILD, CONFIGURE: Allow picking of MPM modules
+
 2010-03-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.2.15, SECURITY_PATCH=9
 
diff --git a/http/mod_fcgid/BUILD b/http/mod_fcgid/BUILD
new file mode 100755
index 0000000..155c932
--- /dev/null
+++ b/http/mod_fcgid/BUILD
@@ -0,0 +1,6 @@
+unset CFLAGS &&
+cd "${SOURCE_DIRECTORY}" &&
+./configure.apxs &&
+make_single &&
+make &&
+make_normal
diff --git a/http/mod_fcgid/DEPENDS b/http/mod_fcgid/DEPENDS
new file mode 100755
index 0000000..341c4e2
--- /dev/null
+++ b/http/mod_fcgid/DEPENDS
@@ -0,0 +1 @@
+depends APACHE2
diff --git a/http/mod_fcgid/DETAILS b/http/mod_fcgid/DETAILS
new file mode 100755
index 0000000..b2de728
--- /dev/null
+++ b/http/mod_fcgid/DETAILS
@@ -0,0 +1,22 @@
+           SPELL=mod_fcgid
+         VERSION=2.3.5
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+         SOURCE2="${SOURCE}.asc"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+   SOURCE_URL[0]="${APACHE_URL}/httpd/mod_fcgid/${SOURCE}"
+  SOURCE2_URL[0]="${SOURCE_URL[0]}.asc"
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG="apache.gpg:${SOURCE2}:UPSTREAM_KEY"
+        WEB_SITE="http://httpd.apache.org/mod_fcgid";
+         ENTERED=20100428
+      LICENSE[0]=APACHE
+        KEYWORDS="apache http fastcgi fcgi"
+           SHORT="FastCGI control daemon module for Apache"
+
+cat << EOF
+mod_fcgid is a high performance alternative to mod_cgi or mod_cgid, which 
starts
+a sufficient number of instances of the CGI program to handle concurrent 
requests,
+and these programs remain running to handle further incoming requests. It is
+favored by the PHP developers, for example, as a preferred alternative to 
running
+mod_php in-process, delivering very similar performance.
+EOF
diff --git a/http/mod_fcgid/HISTORY b/http/mod_fcgid/HISTORY
new file mode 100644
index 0000000..a2d1231
--- /dev/null
+++ b/http/mod_fcgid/HISTORY
@@ -0,0 +1,2 @@
+2010-04-28 Elisamuel Resto <ryuji AT sourcemage.org>
+       * DETAILS, DEPENDS, BUILD: new spell, FastCGI control daemon for 
Apache
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 8c4b411..b74fa79 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -32,11 +32,14 @@ config_query_list PHP5_SAPI "What SAPI do you want to 
use?" \
                             apache 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"
+  PHP5_OPTS="${PHP5_OPTS} --enable-cgi" &&
+
+  if [[ $PHP5_BRANCH == legacy ]]; then
+    config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
+                        "--enable-fastcgi" "--disable-fastcgi"
+  else
+    message "${MESSAGE_COLOR}The FastCGI SAPI is now always enabled since 
PHP 5.3.0${DEFAULT_COLOR}"
+  fi
 else
   config_query_list PHP5_APACHE "Which Apache module to build?" \
                     none handler filter
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index abbbb60..8319dca 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2010-04-28 Elisamuel Resto <ryuji AT sourcemage.org>
+       * CONFIGURE: If CGI SAPI was used, dont ask again; if CGI was picked, 
at least use CGI
+         FastCGI SAPI is now always enabled since PHP 5.3.0
+
 2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
        * BUILD: SQLite (and other DBMS's) dont like -ffast-math (in fact, 
they filter it)
        * PREPARE, DETAILS: suhosin was updated to 0.9.9.1 and now works with 
php 5.3