Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (1742c9838d7e96d3730510b04a06931acd996df2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (1742c9838d7e96d3730510b04a06931acd996df2)
  • Date: Wed, 13 Aug 2008 18:39:52 -0500

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

php-pear/php/BUILD | 135 ++++++++------------
php-pear/php/CONFIGURE | 73 ++++++----
php-pear/php/CONFLICTS | 4
php-pear/php/DEPENDS | 313
++++++++++++++++++++++++-----------------------
php-pear/php/DETAILS | 7 -
php-pear/php/HISTORY | 10 +
php-pear/php/INSTALL | 2
php-pear/php/POST_REMOVE | 43 +++---
php-pear/php/PREPARE | 8 +
php-pear/php/PRE_BUILD | 9 -
php-pear/php/PRE_REMOVE | 10 -
php-pear/php/TRIGGERS | 5
12 files changed, 328 insertions(+), 291 deletions(-)

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

php-pear/php: major spell rework from the aparent copy from the old php
spell (now php4)
- CONFLICTS: removed padding
- DETAILS: PATCHLEVEL++
- BUILD, PRE_BUILD, DEPENDS, CONFIGURE, PREPARE: removed padding,
hackish and outdated options and depends, and added more options,
improved and changed logic and ditched the ./configure line for
default_build after integrating the leftover forced switches to $OPTS
- INSTALL, {PRE,POST}_REMOVE: formatting, removed padding
- TRIGGERS: as per Jaka's suggestion, use show_up_depends

diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 3a71a5f..cc6e1b2 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -1,89 +1,72 @@
-#
-# Append options from CONFIGURE to OPTS
-#
-OPTS="$OPTS \
- $PHP4_SAFE \
- $PHP4_CALENDAR \
- $PHP4_PCRE \
- $PHP4_PCNTL \
- $PHP5_MBSTRING \
- $PHP4_FTP \
- $PHP4_FCGI \
-" &&
+cd "${SOURCE_DIRECTORY}" &&
+OPTS="${PHP5_OPTS} ${OPTS}" &&

-#
-# Setup SSL IMAP if wanted
-#
-if echo $OPTS | grep -q -- --with-imap; then
- if spell_ok openssl; then
- OPTS="$OPTS --with-imap-ssl"
- fi
-fi &&
+# 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 "$PHP4_APACHE" in
- handler)
- if httpd -v | grep -q "Apache/2\."; then
- message "${MESSAGE_COLOR}Configuring for Apache 2.x${DEFAULT_COLOR}"
&&
- OPTS="$OPTS --with-apxs2"
- else
- message "${MESSAGE_COLOR}Configuring for Apache 1.x${DEFAULT_COLOR}"
&&
- OPTS="$OPTS --with-apxs"
+# Setup SSL IMAP if desired
+if list_find "${OPTS}" "--with-imap"; then
+ # Setup SSL IMAP if desired
+ local CCLIENT=$(get_spell_provider $SPELL C-CLIENT) &&
+
+ if [[ ! -z "${CCLIENT}" ]]; then
+ if is_depends_enabled $CCLIENT openssl; then
+ message "${MESSAGE_COLOR}Enabling SSL for the IMAP
extension${DEFAULT_COLOR}" &&
+ OPTS="--with-imap-ssl ${OPTS}"
+ fi
fi
+fi &&
+
+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
;;
- filter)
- OPTS="$OPTS --with-apxs2filter"
+
+ filter)
+ OPTS="--with-apxs2filter ${OPTS}"
;;
-esac &&
+esac &&

-#Check for xorg or xserver and pass location of xpm
-if [ "$PHP5_X11LIBS" == "y" ]; then
- if check_if_xorg_modular_libs; then
- OPTS="$OPTS --with-xpm-dir=/usr"
- else
- OPTS="$OPTS --with-xpm-dir=/usr/X11R6/lib"
- fi
+# Check for xorg or xserver and pass location of xpm
+if [[ "${PHP5_X11LIBS}" == "y" ]]; then
+ if check_if_xorg_modular_libs; then
+ OPTS="--with-xpm-dir=${INSTALL_ROOT}/usr ${OPTS}"
+ else
+ OPTS="--with-xpm-dir=${INSTALL_ROOT}/usr/X11R6/lib ${OPTS}"
+ fi
fi &&

-#check to see if internal GD requested
-if [ "$PHP5_GD" == "internal" ]; then
- OPTS="--with-gd --enable-gd-native-ttf $OPTS"
+# Check to see if internal GD requested
+if [[ "${PHP5_GD}" == "internal" ]]; then
+ OPTS="--with-gd --enable-gd-native-ttf ${OPTS}"
fi &&

-./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --with-exec-dir=${INSTALL_ROOT}/usr/bin \
- --with-config-file-path=${INSTALL_ROOT}/etc \
- --enable-cli \
- --disable-static \
- --disable-debug \
- --disable-rpath \
- --enable-inline-optimization \
- --enable-pic \
- --enable-bcmath \
- --enable-magic-quotes \
- --enable-sysvsem \
- --enable-sysvshm \
- --enable-force-cgi-redirect \
- --enable-wddx \
- --enable-filepro \
- --enable-dbase \
- --enable-sockets \
- --with-iconv \
- --with-versioning \
- --with-mod_charset \
- --with-pear \
- --enable-pdo \
- --with-layout=GNU \
- $OPTS &&
-make &&
+OPTS=" --with-exec-dir=${INSTALL_ROOT}/usr/bin \
+ --with-config-file-path=${INSTALL_ROOT}/etc \
+ --with-pear=${INSTALL_ROOT}/usr/share/pear \
+ --enable-cli \
+ --disable-rpath \
+ --enable-bcmath \
+ --enable-inline-optimization \
+ --with-layout=GNU \
+ ${OPTS}" &&
+default_build &&

# safety precaution against earlier PHP installations removing httpd.conf
-pushd "$INSTALL_LOGS" &>/dev/null
-local each
-for each in $SPELL-*; do
- if test -f "$each"; then
- sedit 's|.*/httpd\.conf.*||g' "$each"
- fi
-done
+pushd "${INSTALL_LOGS}" &>/dev/null &&
+local log &&
+for log in ${SPELL}-*; do
+ if [[ -f "${log}" ]]; then
+ sedit 's|.*/httpd\.conf.*||g' "${log}"
+ fi
+done &&
popd &>/dev/null
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index c806f55..b3e22cd 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -1,38 +1,53 @@
-message "For more information on Suhosin patchset goto
http://www.hardened-php.net/suhosin/"; &&
-config_query PHP_SUHOSIN "Do you want tho suhosin patchset enabled?" n &&
-config_query_option PHP4_SAFE "Enable PHP safe mode?" n \
- "--enable-safe-mode" \
- "--disable-safe-mode" &&
+config_query_option PHP5_OPTS "Enable PHP safe mode?" n \
+ "--enable-safe-mode" "--disable-safe-mode" &&

-config_query_option PHP4_FTP "Enable FTP support?" y \
- "--enable-ftp" \
- "--disable-ftp" &&
+config_query_option PHP5_OPTS "Enable sockets support?" y \
+ "--enable-sockets" "--disable-sockets" &&

-config_query_option PHP4_CALENDAR "Enable calendar support?" y \
- "--enable-calendar" \
- "--disable-calendar" &&
+config_query_option PHP5_OPTS "Enable FTP support?" y \
+ "--enable-ftp" "--disable-ftp" &&

-config_query_option PHP4_PCRE "Enable perl regular expressions?" y \
- "--with-pcre-regex" \
- "--without-pcre-regex" &&
+config_query_option PHP5_OPTS "Enable calendar support?" y \
+ "--enable-calendar" "--disable-calendar" &&

-config_query_option PHP4_PCNTL "Enable experimental pcntl support
(CLI/CGI only)" n \
- "--enable-pcntl" \
- "--disable-pcntl" &&
+config_query_option PHP5_OPTS "Enable perl regular expressions?" y \
+ "--with-pcre-regex" "--without-pcre-regex" &&

-# needs --enable-force-cgi-redirect in BUILD
-config_query_option PHP4_FCGI 'Enable FastCGI module?' y \
- '--enable-fastcgi' \
- '--disable-fastcgi' &&
+config_query_option PHP5_OPTS "Enable pcntl support (CLI/CGI only)" n \
+ "--enable-pcntl" "--disable-pcntl" &&

-config_query_option PHP5_MBSTRING "Enable multibyte support?" n \
- "--enable-mbstring" \
- "--disable-mbstring" &&
+message "${MESSAGE_COLOR}Both FastCGI and CGI can be enabled at the same
time${DEFAULT_COLOR}" &&

-config_query_list PHP4_APACHE 'Which Apache module to build?' \
- none handler filter &&
+config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
+ "--enable-fastcgi" "--disable-fastcgi" &&

-config_query PHP5_X11LIBS "Would you like to use libxpm? (Requires
X11-libs)" n &&
+config_query_option PHP5_OPTS "Enable CGI SAPI?" y \
+ "--enable-cgi" "--disable-cgi" &&

-config_query_list PHP5_GD "Which GD library to use?" \
- none internal external
+config_query_option PHP5_OPTS "Enable multibyte support?" n \
+ "--enable-mbstring" "--disable-mbstring" &&
+
+config_query_option PHP5_OPTS "Enable the PDO driver?" y \
+ "--enable-pdo" "--disable-pdo" &&
+
+config_query_option PHP5_OPTS "Enable shmop support?" n \
+ "--enable-shmop" "--disable-shmop" &&
+
+config_query_option PHP5_OPTS "Enable System V message queues support?" n \
+ "--enable-sysvmsg" "--disable-sysvmsg" &&
+
+config_query_option PHP5_OPTS "Enable System V semaphore support?" n \
+ "--enable-sysvsem" "--disable-sysvsem" &&
+
+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 &&
+
+if [[ "${PHP5_GD}" != "none" ]]; then
+ config_query PHP5_X11LIBS "Would you like to support XPM image files?
(requires: X11-LIBS)" n
+fi
diff --git a/php-pear/php/CONFLICTS b/php-pear/php/CONFLICTS
index 52b56f4..a51827b 100755
--- a/php-pear/php/CONFLICTS
+++ b/php-pear/php/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts php-dev &&
-conflicts php4
+conflicts php-dev &&
+conflicts php4
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index e013903..735c34f 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -1,159 +1,172 @@
-source $GRIMOIRE/FUNCTIONS &&
+. "${GRIMOIRE}/FUNCTIONS" &&

-depends flex &&
-depends readline "--with-readline=/usr" &&
+depends flex &&

-# Officially ZLib is optional, but we require it because some other
-# optional extensions depend on it, and it"s omnipresent anyway.
-depends zlib "--with-zlib --with-zlib-dir=/usr" &&
+# Officially these are optional, but we require them because some other
+# optional extensions depend on it, and they're omnipresent anyway
+depends readline "--with-readline" &&
+depends zlib "--with-zlib" &&

-# This is required since PHP 5
-depends libxml2 '--enable-xml --with-dom --with-xmlrpc' &&
+# This is required since PHP5
+depends libxml2 "--enable-xml --with-dom --with-xmlrpc" &&

-case "$PHP4_APACHE" in
- handler) depends APACHE;;
- filter) depends APACHE2;;
-esac &&
+case "${PHP5_APACHE}" in
+ handler) depends APACHE;;
+ filter) depends APACHE2;;
+esac &&

-if [ "$PHP5_X11LIBS" == "y" ]; then
- depends X11-LIBS
- if check_if_xorg_modular_libs; then
- depends libxpm
- fi
-fi &&
+if [[ "${PHP5_GD}" == "external" ]]; then
+ depends gd "--with-gd=${INSTALL_ROOT}/usr --enable-gd-native-ttf"
+fi &&
+
+# Query for external PCRE library if PCRE support is enabled
+if list_find "${PHP5_OPTS}" "--with-pcre-regex"; then
+ optional_depends pcre \
+ "--with-pcre-dir=${INSTALL_ROOT}/usr" "" \
+ "to use an external PCRE library"
+fi &&
+
+optional_depends C-CLIENT \
+ "--with-imap=${INSTALL_ROOT}/usr" "--without-imap" \
+ "for IMAP support" &&
+
+optional_depends MAIL-TRANSPORT-AGENT \
+ "" "" \
+ "for SMTP support" &&
+
+optional_depends bzip2 \
+ "--with-bz2" "--without-bz2" \
+ "for compression support" &&
+
+optional_depends aspell \
+ "--with-pspell" "--without-pspell" \
+ "for spelling functions" &&
+
+optional_depends mhash \
+ "--with-mhash" "--without-mhash" \
+ "for hash functions support" &&
+
+optional_depends libmcrypt \
+ "--with-mcrypt" "--without-mcrypt" \
+ "for crypto library" &&
+
+optional_depends curl \
+ "--with-curl" "--without-curl" \
+ "for cURL URL stream functions" &&

-if [ "$PHP5_GD" == "external" ]; then
- depends gd "--with-gd=/usr --enable-gd-native-ttf"
+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"
fi &&

-optional_depends C-CLIENT \
- "--with-imap" \
- "--without-imap" \
- "for IMAP support" &&
-
-optional_depends MAIL-TRANSPORT-AGENT \
- "" \
- "" \
- "for SMTP support" &&
-
-optional_depends bzip2 \
- "--with-bz2=/usr" \
- "--without-bz2" \
- "for compression support" &&
-
-optional_depends aspell \
- "--with-pspell=/usr" \
- "--without-pspell" \
- "for spelling functions" &&
-
-optional_depends mhash \
- "--with-mhash=/usr" \
- "--without-mhash" \
- "for hash functions support" &&
-
-optional_depends libmcrypt \
- "--with-mcrypt=/usr" \
- "--without-mcrypt" \
- "for crypto library" &&
-
-optional_depends libmcal \
- "--with-mcal=/usr" \
- "--without-mcal" \
- "for MCAL calendaring library" &&
-
-optional_depends curl \
- "--with-curl=/usr" \
- "--without-curl" \
- "for transferring files using URL syntax" &&
-
-optional_depends gmp \
- "--with-gmp=/usr" \
- "--without-gmp" \
- "GNU multi precision library support" &&
-
-optional_depends openssl \
- "--with-openssl=/usr" \
- "--without-openssl" \
- "for OpenSSL support" &&
-
-optional_depends gettext \
- "--with-gettext=/usr" \
- "--without-gettext" \
- "for GNU gettext support" &&
-
-optional_depends firebird \
- '--with-pdo-firebird=/usr/firebird' \
- '--without-pdo-firebird' \
- 'for native Firebird support' &&
-
-optional_depends unixodbc \
- '--with-unixODBC=/usr' \
- '--without-unixODBC' \
- 'for ODBC database support' &&
-
-optional_depends libiodbc \
- '--with-iodbc=/usr' \
- '--without-iobc' \
- 'for ODBC database support' &&
-
-optional_depends postgresql \
- "--with-pgsql=/usr" \
- "--without-pgsql" \
- "for native Postgresql support" &&
-
-optional_depends mysql \
- "--with-mysql=/usr" \
- "--without-mysql" \
- "for native MySQL support" &&
-
-optional_depends gdbm \
- "--with-gdbm=/usr" \
- "--without-gdbm" \
- "database routines that use extensive hashing" &&
-
-optional_depends sqlite \
- '--with-sqlite --enable-sqlite-utf8' \
- '--without-sqlite' \
- 'for SQLite support' &&
-
-optional_depends mm \
- "--with-mm=/usr" \
- "--without-mm" \
- "for sharing memory between related processes" &&
-
-optional_depends openldap \
- "--with-ldap=/usr" \
- "--without-ldap" \
- "for LDAP support" &&
-
-optional_depends libxslt \
- "--with-dom-xslt=/usr --with-dom-exslt=/usr" \
- "--without-dom-xslt --without-dom-exslt" \
- "for DOM XSLT support" &&
-
-optional_depends t1lib \
- "--with-t1lib=/usr/share/t1lib" \
- "--without-tlib" \
- "for t1lib support" &&
-
-optional_depends jpeg \
- "--with-jpeg-dir=/usr" \
- "--without-jpeg-dir" \
- "for JPEG support (also required for GD)" &&
-
-optional_depends libpng \
- "--with-png-dir=/usr" \
- "--without-png-dir" \
- "for PNG support (also required for GD)" &&
-
-optional_depends re2c \
- "" \
- "" \
- "to regenerate PHP parsers" &&
-
-if [ "$PHP5_GD" != "none" ]; then
- optional_depends freetype2 \
- "--with-freetype-dir=/usr" \
- "--without-freetype-dir" \
- "for freetype2 support"
+optional_depends gmp \
+ "--with-gmp" "--without-gmp" \
+ "GNU multi-precision library support" &&
+
+optional_depends openssl \
+ "--with-openssl" "--without-openssl" \
+ "for OpenSSL support" &&
+
+optional_depends gettext \
+ "--with-gettext" "--without-gettext" \
+ "for GNU gettext support" &&
+
+optional_depends firebird \
+ "--with-pdo-firebird=${INSTALL_ROOT}/usr/firebird"
"--without-pdo-firebird" \
+ "for native Firebird support" &&
+
+optional_depends unixodbc \
+ "--with-unixODBC=${INSTALL_ROOT}/usr" "--without-unixODBC" \
+ "for ODBC database support" &&
+
+if is_depends_enabled $SPELL unixodbc && list_find "${PHP5_OPTS}"
"--enable-pdo"; then
+ config_query_option PHP5_OPTS "Do you also want to build the unixODBC
PDO driver?" n \
+ "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr"
"--without-pdo-odbc"
+fi &&
+
+optional_depends libiodbc \
+ "--with-iodbc" "--without-iodbc" \
+ "for ODBC database support" &&
+
+optional_depends postgresql \
+ "--with-pgsql" "--without-pgsql" \
+ "for native Postgresql support" &&
+
+if is_depends_enabled $SPELL postgresql && list_find "${PHP5_OPTS}"
"--enable-pdo"; then
+ config_query_option PHP5_OPTS "Do you also want to build the PostgreSQL
PDO driver?" n \
+ "--with-pdo-pgsql" "--without-pdo-pgsql"
+fi &&
+
+optional_depends mysql \
+ "--with-mysql" "--without-mysql" \
+ "for MySQL support" &&
+
+if is_depends_enabled $SPELL mysql && list_find "${PHP5_OPTS}"
"--enable-pdo"; then
+ config_query_option PHP5_OPTS "Do you also want to build the MySQL PDO
driver?" n \
+ "--with-pdo-mysql" "--without-pdo-mysql" &&
+ config_query_option PHP5_OPTS "Do you want to build the MySQLi
extension?" n \
+ "--with-mysqli" "--without-mysqli"
+fi &&
+
+optional_depends gdbm \
+ "--with-gdbm" "--without-gdbm" \
+ "database routines that use extensive hashing" &&
+
+optional_depends sqlite2 \
+ "--with-sqlite=${INSTALL_ROOT}/usr --enable-sqlite-utf8"
"--without-sqlite" \
+ "for SQLite 2.x support" &&
+
+if list_find "${PHP5_OPTS}" "--enable-pdo"; then
+ config_query_option PHP5_OPTS "Do you also want to build the SQLite 3.x
PDO driver (requires: sqlite)?" y \
+ "--with-pdo-sqlite=${INSTALL_ROOT}/usr"
"--without-pdo-sqlite" &&
+
+ if ! list_find "${PHP5_OPTS}" "--without-pdo-sqlite"; then
+ depends sqlite
+ fi
+fi &&
+
+optional_depends mm \
+ "--with-mm" "--without-mm" \
+ "for sharing memory between related processes" &&
+
+optional_depends openldap \
+ "--with-ldap" "--without-ldap" \
+ "for LDAP support" &&
+
+optional_depends libxslt \
+ "--with-xsl" "--without-xsl" \
+ "for XSLT support" &&
+
+optional_depends t1lib \
+ "--with-t1lib" "--without-t1lib" \
+ "for T1lib support" &&
+
+optional_depends re2c \
+ "" "" \
+ "to regenerate PHP parsers" &&
+
+optional_depends libexif \
+ "--enable-exif" "--disable-exif" \
+ "for image metadata support" &&
+
+if [[ "${PHP5_GD}" != "none" ]]; then
+ if [[ "${PHP5_X11LIBS}" == "y" ]]; then
+ depends X11-LIBS &&
+
+ if check_if_xorg_modular_libs; then
+ depends libxpm "--with-xpm-dir=${INSTALL_ROOT}/usr"
+ fi
+ fi &&
+
+ optional_depends jpeg \
+ "--with-jpeg-dir=${INSTALL_ROOT}/usr"
"--without-jpeg-dir" \
+ "for JPEG support (for GD)" &&
+
+ optional_depends libpng \
+ "--with-png-dir=${INSTALL_ROOT}/usr"
"--without-png-dir" \
+ "for PNG support (for GD)" &&
+
+ optional_depends freetype2 \
+ "--with-freetype-dir=${INSTALL_ROOT}/usr"
"--without-freetype-dir" \
+ "for freetype2 support"
fi
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 382d0fc..0e76ab0 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,5 +1,5 @@
SPELL=php
-if [[ "$PHP_RC" == y ]]; then
+if [[ "${PHP5_RC}" == "y" ]]; then
VERSION=5.3.0alpha1
SECURITY_PATCH=6

SOURCE_HASH=sha512:c9cfb6dc128e7bcbcd16d45b13f8b9145eda03bb112140718d371f5cc8dc667ec80d100d00759035f282586e40502dbd86effddb4bd8b11220072ef60d4620ec
@@ -12,7 +12,8 @@ else
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
fi
-if [[ $PHP_SUHOSIN == y ]]; then
+
+if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
VERSION2=0.9.6.2
SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
@@ -20,7 +21,9 @@ if [[ $PHP_SUHOSIN == y ]]; then
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
+
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ PATCHLEVEL=1
WEB_SITE=http://www.php.net/
ENTERED=20011024
LICENSE[0]=http://www.php.net/license/3_0.txt
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index ebad5f1..e13cba6 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,4 +1,14 @@
2008-08-13 Elisamuel Resto <ryuji AT sourcemage.org>
+ * CONFLICTS: removed padding
+ * DETAILS: PATCHLEVEL++
+ * BUILD, PRE_BUILD, DEPENDS, CONFIGURE, PREPARE: removed padding,
+ hackish and outdated options and depends, and added more options,
+ improved and changed logic and ditched the ./configure line for
+ default_build after integrating the leftover forced switches to
$OPTS
+ * INSTALL, {PRE,POST}_REMOVE: formatting, removed padding
+ * TRIGGERS: as per Jaka's suggestion, use show_up_depends
+
+2008-08-13 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated the RC to 5.3.0alpha1

2008-05-03 Elisamuel Resto <ryuji AT sourcemage.org>
diff --git a/php-pear/php/INSTALL b/php-pear/php/INSTALL
index 71c8fec..567f8b6 100755
--- a/php-pear/php/INSTALL
+++ b/php-pear/php/INSTALL
@@ -1,3 +1,3 @@
-default_install &&
+default_install &&

install_config_file php.ini-dist /etc/php.ini
diff --git a/php-pear/php/POST_REMOVE b/php-pear/php/POST_REMOVE
index a9a4b6d..9267ad0 100755
--- a/php-pear/php/POST_REMOVE
+++ b/php-pear/php/POST_REMOVE
@@ -1,23 +1,26 @@
-if [ -f /etc/httpd/httpd.conf.sorcerybackup ]
-then
- mv /etc/httpd/httpd.conf.sorcerybackup \
- /etc/httpd/httpd.conf
-fi &&
+## TODO
+# How about we print a warning instead of doing this fugly voodoo?

-if [ -e /etc/httpd/httpd.conf ]
-then
- cp /etc/httpd/httpd.conf /tmp/httpd.conf
- grep -v "LoadModule php5_module libexec/libphp5.so"
/tmp/httpd.conf > /tmp/conf.tmp1
- grep -v "AddType application/x-httpd-php .php .html"
/tmp/conf.tmp1 > /tmp/conf.tmp2
- grep -v "AddModule mod_php5.c" /tmp/conf.tmp2 > /etc/httpd/httpd.conf
- rm -f /tmp/httpd.conf /tmp/conf.tmp*
-fi &&
+if [[ -f /etc/httpd/httpd.conf.sorcerybackup ]]; then
+ mv -v /etc/httpd/httpd.conf.sorcerybackup /etc/httpd/httpd.conf
+fi &&

-if [ -e /etc/httpsd/httpd.conf ]
-then
- cp /etc/httpsd/httpd.conf /tmp/httpd.conf
- grep -v "LoadModule php5_module libexec/libphp5.so"
/tmp/httpd.conf > /tmp/conf.tmp1
- grep -v "AddType application/x-httpd-php .php .html"
/tmp/conf.tmp1 > /tmp/conf.tmp2
- grep -v "AddModule mod_php5.c" /tmp/conf.tmp2 > /etc/httpsd/httpd.conf
- rm -f /tmp/httpd.conf /tmp/conf.tmp*
+if [[ -f /etc/httpsd/httpd.conf.sorcerybackup ]]; then
+ mv -v /etc/httpsd/httpd.conf.sorcerybackup /etc/httpsd/httpd.conf
+fi &&
+
+if [[ -e /etc/httpd/httpd.conf ]]; then
+ cp -v /etc/httpd/httpd.conf /tmp/httpd.conf
+ grep -v "LoadModule php5_module libexec/libphp5.so" /tmp/httpd.conf >
/tmp/conf.tmp1
+ grep -v "AddType application/x-httpd-php .php .phtml" /tmp/conf.tmp1 >
/tmp/conf.tmp2
+ grep -v "AddModule mod_php5.c" /tmp/conf.tmp2 >/etc/httpd/httpd.conf
+ rm -f /tmp/httpd.conf /tmp/conf.tmp*
+fi &&
+
+if [[ -e /etc/httpsd/httpd.conf ]]; then
+ cp -v /etc/httpsd/httpd.conf /tmp/httpd.conf
+ grep -v "LoadModule php5_module libexec/libphp5.so" /tmp/httpd.conf >
/tmp/conf.tmp1
+ grep -v "AddType application/x-httpd-php .php .phtml" /tmp/conf.tmp1 >
/tmp/conf.tmp2
+ grep -v "AddModule mod_php5.c" /tmp/conf.tmp2 > /etc/httpsd/httpd.conf
+ rm -f /tmp/httpd.conf /tmp/conf.tmp*
fi
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index 2e04582..5a46542 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -1 +1,7 @@
-config_query PHP_RC 'Install latest Release Candidate version?' n
+config_query PHP5_RC "Install latest Release Candidate version?" n &&
+
+if [[ "${PHP5_RC}" != "y" ]]; then
+ message "For more information on Suhosin patchset see:
http://www.hardened-php.net/suhosin/"; &&
+ config_query PHP5_SUHOSIN "Do you want tho suhosin patchset enabled?" n
+fi
+
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index 9dcac0b..3eb0e38 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -1,8 +1,7 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "${SOURCE_DIRECTORY}" &&

-if [[ $PHP_SUHOSIN == y ]]; then
- verify_source $SOURCE2 &&
- zcat $SOURCE_CACHE/$SOURCE2 | patch -p1
+if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
+ verify_source "${SOURCE2}" &&
+ zcat "${SOURCE_CACHE}/${SOURCE2}" | patch -p1
fi
-
diff --git a/php-pear/php/PRE_REMOVE b/php-pear/php/PRE_REMOVE
index d4230f9..77913ee 100755
--- a/php-pear/php/PRE_REMOVE
+++ b/php-pear/php/PRE_REMOVE
@@ -1,5 +1,7 @@
-if [ -f /etc/httpd/httpd.conf ]
-then
- cp /etc/httpd/httpd.conf \
- /etc/httpd/httpd.conf.sorcerybackup
+if [[ -f "${INSTALL_ROOT}/etc/httpd/httpd.conf" ]]; then
+ cp -v "${INSTALL_ROOT}/etc/httpd/httpd.conf"
"${INSTALL_ROOT}/etc/httpd/httpd.conf.sorcerybackup"
+fi &&
+
+if [[ -f "${INSTALL_ROOT}/etc/httpsd/httpd.conf" ]]; then
+ cp -v "${INSTALL_ROOT}/etc/httpsd/httpd.conf"
"${INSTALL_ROOT}/etc/httpsd/httpd.conf.sorcerybackup"
fi
diff --git a/php-pear/php/TRIGGERS b/php-pear/php/TRIGGERS
index 02b1510..f44e5a2 100755
--- a/php-pear/php/TRIGGERS
+++ b/php-pear/php/TRIGGERS
@@ -1 +1,4 @@
-on_cast mysql check_self
+local dep
+for dep in $(show_up_depends $SPELL 1); do
+ on_cast ${dep} check_self
+done



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (1742c9838d7e96d3730510b04a06931acd996df2), Elisamuel Resto, 08/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page