New commits:
commit 0148142a3a04a2daa5c02c5b067a5329b1776d7a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
php: => 5.2.14, 5.3.3 (security); cleaned up
(cherry picked from commit bcf80644e1bad70be75545a29683e284d041dd74)
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index b74fa79..847589f 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -3,7 +3,7 @@ message "${MESSAGE_COLOR}PEAR support will enable the CLI
version and force depe
message "It will also enable some PCRE support (internal
recommended)${DEFAULT_COLOR}" &&
# prior pear enabledness
if list_find "$PHP5_OPTS" "--enable-pear" ; then
- PHP5_PEAR="y"
+ PHP5_PEAR="y"
fi &&
config_query PHP5_PEAR "Do you want PEAR support?" y &&
@@ -46,11 +46,12 @@ else
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}" &&
- PHP5_OPTS="$PHP5_OPTS --enable-cli"
-else
- config_query_option PHP5_OPTS "Enable CLI version?" y \
- "--enable-cli" "--disable-cli"
+ message "${MESSAGE_COLOR}Enabling CLI version for PEAR/CGI/FastCGI
support${DEFAULT_COLOR}" &&
+ PHP5_OPTS="$PHP5_OPTS --enable-cli"
+else
+ config_query_option PHP5_OPTS "Enable CLI version?" y \
+ "--enable-cli" \
+ "--disable-cli"
fi &&
if ! list_find "${PHP5_DBA_DRIVERS}" "none"; then
- if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
- PHP5_OPTS="$PHP5_OPTS --enable-inifile"
- fi
- if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
- PHP5_OPTS="$PHP5_OPTS --enable-flatfile"
- fi
+ if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
+ PHP5_OPTS="$PHP5_OPTS --enable-inifile"
+ fi
+ if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
+ PHP5_OPTS="$PHP5_OPTS --enable-flatfile"
+ fi
fi &&
# get the native simple drivers
local DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
config_query_multi PHP5_DATABASE_DRIVERS "Select vendor specific database
drivers to install (if any)" \
- none all $DB_DRIVERS &&
+ none all $DB_DRIVERS &&
if ! list_find "${PHP5_DATABASE_DRIVERS}" "none"; then
- PHP5_OPTS="$PHP5_OPTS --enable-dba" &&
- for foo in $DB_DRIVERS; do
- if list_find "${PHP5_DATABASE_DRIVERS}" "$foo" || list_find
"${PHP5_DATABASE_DRIVERS}" "all"; then
- PHP5_OPTS="$PHP5_OPTS --with-$foo"
- else
- PHP5_OPTS="$PHP5_OPTS --without-$foo"
- fi
- done
+ PHP5_OPTS="$PHP5_OPTS --enable-dba" &&
+
+ for foo in $DB_DRIVERS; do
+ if list_find "${PHP5_DATABASE_DRIVERS}" "$foo" || list_find
"${PHP5_DATABASE_DRIVERS}" "all"; then
+ PHP5_OPTS="$PHP5_OPTS --with-$foo"
+ else
+ PHP5_OPTS="$PHP5_OPTS --without-$foo"
+ fi
+ done
fi &&
-#ask if they want the PDO drivers for the drivers they selected
+# ask if they want the PDO drivers for the drivers they selected
config_query_option PHP5_OPTS "Enable PHP Data Objects?" y \
"--enable-pdo" "--disable-pdo" &&
if list_find "$PHP5_OPTS" "--enable-pdo"; then
- local PDO_DRIVERS="mysql pgsql sqlite firebird unixODBC iODBC" &&
- for foo in $PDO_DRIVERS; do
- if list_find "${PHP5_DATABASE_DRIVERS}" "$foo" || list_find
"${PHP5_DATABASE_DRIVERS}" "all"; then
- # odbc special case
- if [[ "$foo" == "unixODBC" ]]; then
- config_query_option PHP5_OPTS "Enable PDO
driver for unixodbc?" n "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" ""
- elif [[ "$foo" == "iODBC" ]]; then
- config_query_option PHP5_OPTS "Enable PDO
driver for libiodbc?" n "--with-pdo-odbc=iODBC,${INSTALL_ROOT}/usr" ""
- else
- config_query_option PHP5_OPTS "Enable PDO
driver for $foo?" n "--with-pdo-$foo=${INSTALL_ROOT}/usr" "--without-pdo-$foo"
- fi
- else
- #be sure that the PDO driver is disabled
- PHP5_OPTS="$PHP5_OPTS --without-pdo-$foo"
- fi
- done
+ local PDO_DRIVERS="mysql pgsql sqlite firebird unixODBC iODBC" &&
+
+ for foo in $PDO_DRIVERS; do
+ if list_find "${PHP5_DATABASE_DRIVERS}" "$foo" || list_find
"${PHP5_DATABASE_DRIVERS}" "all"; then
+ # odbc special case
+ if [[ "$foo" == "unixODBC" ]]; then
+ config_query_option PHP5_OPTS "Enable PDO driver for unixodbc?" n
"--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" ""
+ elif [[ "$foo" == "iODBC" ]]; then
+ config_query_option PHP5_OPTS "Enable PDO driver for libiodbc?" n
"--with-pdo-odbc=iODBC,${INSTALL_ROOT}/usr" ""
+ else
+ config_query_option PHP5_OPTS "Enable PDO driver for $foo?" n
"--with-pdo-$foo=${INSTALL_ROOT}/usr" "--without-pdo-$foo"
+ fi
+ else
+ # be sure that the PDO driver is disabled
+ PHP5_OPTS="$PHP5_OPTS --without-pdo-$foo"
+ fi
+ done
fi &&
if list_find "${OPTS}" "--with-imap"; then
- if is_depends_enabled $SPELL openssl; then
- OPTS="$OPTS --with-imap-ssl"
- else
- optional_depends openssl "--with-imap-ssl"
"--without-imap-ssl" \
- "for SSL
support with IMAP (but not elsewhere)"
- fi
+ if is_depends_enabled $SPELL openssl; then
+ OPTS="$OPTS --with-imap-ssl"
+ else
+ optional_depends openssl \
+ "--with-imap-ssl" \
+ "--without-imap-ssl" \
+ "for SSL support with IMAP (but not elsewhere)"
+ fi
fi &&
optional_depends enchant \
"--with-enchant" "--without-enchant" \
@@ -136,17 +137,19 @@ optional_depends icu \
# DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
# PDO_DRIVERS="mysql pgsql firebird unixODBC iODBC"
if list_find "$PHP5_DATABASE_DRIVERS" "mysql" || list_find
"$PHP5_DATABASE_DRIVERS" "all"; then
- depends MYSQL "" &&
- if [[ "${VERSION:0:3}" == "5.3" ]]; then
- config_query PHP5_MYSQLND "Do you want to use the MySQL
Native Driver [mysqlnd]? (expiremental)" n &&
- if [[ "${PHP5_MYSQLND}" == "y" ]]; then
- PHP5_OPTS="$PHP5_OPTS --with-mysql=mysqlnd"
- else
- PHP5_OPTS="$PHP5_OPTS --with-mysql"
- fi
- fi
+ depends MYSQL &&
+
+ if [[ "${VERSION:0:3}" == "5.3" ]]; then
+ config_query PHP5_MYSQLND "Do you want to use the MySQL Native Driver
[mysqlnd]? (expiremental)" n &&
+
+ if [[ "${PHP5_MYSQLND}" == "y" ]]; then
+ PHP5_OPTS="$PHP5_OPTS --with-mysql=mysqlnd"
+ else
+ PHP5_OPTS="$PHP5_OPTS --with-mysql"
+ fi
+ fi
else
- OPTS="$OPTS --without-mysql"
+ OPTS="$OPTS --without-mysql"
fi &&
db_driver_depends "mysqli" "mysql" &&
db_driver_depends "pgsql" "postgresql" &&
@@ -155,26 +158,25 @@ db_driver_depends "sqlite3" "sqlite" &&
db_driver_depends "firebird" "firebird" &&
# unixODBC and iODBC are mutually exclusive... first one in wins?
if list_find "$PHP5_DATABASE_DRIVERS" "unixODBC" || list_find
"$PHP5_DATABASE_DRIVERS" "all"; then
- depends unixodbc "--with-unixODBC=${INSTALL_ROOT}/usr --without-iodbc"
+ depends unixodbc "--with-unixODBC=${INSTALL_ROOT}/usr --without-iodbc"
elif list_find "$PHP5_DATABASE_DRIVERS" "iODBC"; then
- depends unixodbc "--with-iodbc=${INSTALL_ROOT}/usr --without-unixODBC"
+ depends unixodbc "--with-iodbc=${INSTALL_ROOT}/usr --without-unixODBC"
else
- OPTS="$OPTS --without-iodbc --without-unixODBC"
+ OPTS="$OPTS --without-iodbc --without-unixODBC"
fi &&
-#ND
-#DBA drivers
+# DBA drivers
if list_find "${PHP5_OPTS}" "--enable-dba"; then
- for foo in $PHP5_DBA_DRIVERS; do
- if [[ $foo != none ]]; then
- # handle the few special cases
- if [[ "$foo" == "db4" ]]; then
- depends db "--with-db4"
- elif [[ "$foo" != "flatfile" ]] && [[ "$foo" != "inifile" ]];
then
- depends $foo "--with-$foo"
- fi
- fi
- done
+ for foo in $PHP5_DBA_DRIVERS; do
+ if [[ $foo != none ]]; then
+ # handle the few special cases
+ if [[ "$foo" == "db4" ]]; then
+ depends db "--with-db4"
+ elif [[ "$foo" != "flatfile" ]] && [[ "$foo" != "inifile" ]]; then
+ depends $foo "--with-$foo"
+ fi
+ fi
+ done
fi &&
optional_depends openldap \
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index c7baf07..019a921 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,12 +1,12 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.3.2
-
SOURCE_HASH=sha512:7d2b29e6cc652e78d0118dac43862aaaecf85b49f62fad83355639712b7e1bdcabfbd3ebea93759563da3a1f32ae556fb65094ce9d0642030f794867f2d0f6a4
+ VERSION=5.3.3
+ SECURITY_PATCH=10
+
SOURCE_HASH=sha512:eeaf77befbea3a678f330766518836be87ee6fd53b50fbd9c75048a81b33ed87351327d1e7c103092029b17452d2cff5bca7376e107c662cf3ad30137d52479f
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
-
+ SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
- VERSION2=0.9.9.1
+ VERSION2=0.9.10
SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
SOURCE2_URL="http://download.suhosin.org/$SOURCE2"
SOURCE3=$SOURCE2.sig
@@ -15,20 +15,28 @@ if [[ $PHP5_BRANCH == stable ]]; then
SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
fi
elif [[ $PHP5_BRANCH == alpha ]]; then
- VERSION=5.3.2
+ VERSION=5.3.3
SOURCE_HASH=sha512:7d2b29e6cc652e78d0118dac43862aaaecf85b49f62fad83355639712b7e1bdcabfbd3ebea93759563da3a1f32ae556fb65094ce9d0642030f794867f2d0f6a4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
elif [[ $PHP5_BRANCH == legacy ]]; then
- VERSION=5.2.13
- SECURITY_PATCH=11
-
SOURCE_HASH=sha512:6b099c7854dff5047b96ddd52a901ce67cae735142f10dda0ab0808a0d592c957b499d76f4c21d0050f1f6ae1d66fb2fecbd9840af170a97971ad41fdd626191
+ VERSION=5.2.14
+ SECURITY_PATCH=12
+
SOURCE_HASH=sha512:ffe6a6ae707e7a0a00db60bc6c28c286a7f326ca9011940dbd797227ae34ed8e18e026883e865b82f16f57bcadd9ebb2b6dd69eecbc6219d8ccf680fbd71b9c3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
+ if [[ $PHP5_SUHOSIN == y ]]; then
+ VERSION2=0.9.7
+ SOURCE2=suhosin-patch-$VERSION-$VERSION2.patch.gz
+ SOURCE2_URL="http://download.suhosin.org/$SOURCE2"
+ SOURCE3=$SOURCE2.sig
+ SOURCE3_URL="http://download.suhosin.org/$SOURCE3"
+ SOURCE2_GPG="$SOURCE3:suhosin.gpg:UPSTREAM_KEY"
+ fi
else
- VERSION=5.3.2
- SECURITY_PATCH=9
-
SOURCE_HASH=sha512:7d2b29e6cc652e78d0118dac43862aaaecf85b49f62fad83355639712b7e1bdcabfbd3ebea93759563da3a1f32ae556fb65094ce9d0642030f794867f2d0f6a4
+ VERSION=5.3.3
+ SECURITY_PATCH=10
+
SOURCE_HASH=sha512:eeaf77befbea3a678f330766518836be87ee6fd53b50fbd9c75048a81b33ed87351327d1e7c103092029b17452d2cff5bca7376e107c662cf3ad30137d52479f
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 8ba2848..ebaace5 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+2010-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.14 (legacy), 5.3.3 (stable, rc);
+ SECURITY_PATCH for both; updated source urls; returned suhosin
support
+ for lehacy branch
+ * CONFIGURE, INSTALL, DEPENDS: replaced tabs with spaces
+
2010-06-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE3_IGNORE for signature