Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 php-pear/php/BUILD     |    9 +++-
 php-pear/php/CONFIGURE |   84 +++++++++++++++++++++++++++---------------
 php-pear/php/DEPENDS   |   96 
+++++++++++++++++++++++++++++--------------------
 php-pear/php/DETAILS   |   37 ++++++++++--------
 php-pear/php/HISTORY   |   18 +++++++++
 php-pear/php/INSTALL   |   10 +++--
 php-pear/php/PREPARE   |    5 ++
 7 files changed, 169 insertions(+), 90 deletions(-)

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

    php: => 5.4.12 (stable), 5.3.22 (previous), 5.5.0alpha5 (alpha)

diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 655ee2f..a92da7e 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
 cd "${SOURCE_DIRECTORY}" &&
 OPTS="${PHP5_OPTS} ${OPTS}" &&
 
@@ -32,8 +34,11 @@ fi &&
 
 CFLAGS="${CFLAGS//-ffast-math}" &&
 
-OPTS="   --with-exec-dir=${INSTALL_ROOT}/usr/bin \
- --with-config-file-path=${INSTALL_ROOT}/etc \
+if is_version_less "${VERSION}" 5.4; then
+  OPTS="--with-exec-dir=${INSTALL_ROOT}/usr/bin $OPTS"
+fi &&
+
+OPTS="--with-config-file-path=${INSTALL_ROOT}/etc \
                --disable-rpath \
                 --enable-bcmath \
          --enable-inline-optimization \
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index cf387bd..1c3a799 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -1,4 +1,5 @@
-. $GRIMOIRE/config_query_multi.function &&
+. "$GRIMOIRE/FUNCTIONS" &&
+
 message "${MESSAGE_COLOR}PEAR support will enable the CLI version and force 
depends on libxml2" &&
 message "It will also enable some PCRE support (internal 
recommended)${DEFAULT_COLOR}" &&
 # prior pear enabledness
@@ -11,8 +12,11 @@ config_query PHP5_PEAR "Do you want PEAR support?" y &&
 config_query_option PHP5_OPTS "Enable IPv6?" n \
                     "--enable-ipv6" "--disable-ipv6" &&
 
-config_query_option PHP5_OPTS "Enable PHP safe mode?" n \
-                    "--enable-safe-mode" "--disable-safe-mode" &&
+if is_version_less "${VERSION}" 5.4; then
+  config_query_option PHP5_OPTS "Enable PHP safe mode?" n \
+                                "--enable-safe-mode" \
+                                "--disable-safe-mode"
+fi &&
 
 config_query_option PHP5_OPTS "Enable sockets support?" y \
                     "--enable-sockets" "--disable-sockets" &&
@@ -32,9 +36,9 @@ config_query_list PHP5_SAPI "What SAPI do you want to use?" 
\
                             apache cgi none &&
 
 if [[ $PHP5_SAPI == cgi ]]; then
-  PHP5_OPTS="--enable-cgi --without-apxs --without-apxs2 ${PHP5_OPTS}" &&
+  list_add "PHP5_OPTS" "--enable-cgi --without-apxs --without-apxs2" &&
 
-  if [[ $PHP5_BRANCH == legacy ]]; then
+  if is_version_less "${VERSION}" 5.3; then
     config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
                         "--enable-fastcgi" "--disable-fastcgi"
   else
@@ -47,7 +51,7 @@ 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"
+  list_add "PHP5_OPTS" "--enable-cli"
 else
   config_query_option PHP5_OPTS "Enable CLI version?" y \
                                 "--enable-cli" \
@@ -63,51 +67,71 @@ message "${MESSAGE_COLOR}Not recommended: dbm, ndbm. 
NOTE: qdbm conflicts with d
 config_query_multi PHP5_DBA_DRIVERS "Select dbm-style database drivers (if 
any)" none gdbm db4 flatfile inifile qdbm &&
 
 if ! list_find "${PHP5_DBA_DRIVERS}" "none"; then
+  list_add "PHP5_OPTS" "--enable-dba" &&
+  
   if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
-    PHP5_OPTS="$PHP5_OPTS --enable-inifile"
-  fi
+    list_add "PHP5_OPTS" "--enable-inifile"
+  else
+    list_add "PHP5_OPTS" "--disable-inifile"
+  fi &&
+
   if list_find "${PHP5_DBA_DRIVERS}" "flatfile"; then
-    PHP5_OPTS="$PHP5_OPTS --enable-flatfile"
+    list_add "PHP5_OPTS" "--enable-flatfile"
+  else
+    list_add "PHP5_OPTS" "--disable-flatfile"
   fi
+else
+  list_add "PHP5_OPTS" "--disable-dba"
 fi &&
 
 # get the native simple drivers
-local DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
+if is_version_less "${VERSION}" 5.3; then
+  # 5.2 drops SQLite 3 support
+  local DB_DRIVERS="mysql mysqli pgsql sqlite firebird unixODBC iODBC"
+elif is_version_less "${VERSION}" 5.4; then
+  local DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC 
iODBC"
+else
+  # 5.4 drops SQLite 2 support
+  local DB_DRIVERS="mysql mysqli pgsql sqlite3 firebird unixODBC iODBC"
+fi &&
+
 config_query_multi PHP5_DATABASE_DRIVERS "Select vendor specific database 
drivers to install (if any)" \
                                          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
+# for PDO-only drivers
+if list_find "${PHP5_DATABASE_DRIVERS}" "sqlite3" || list_find 
"${PHP5_DATABASE_DRIVERS}" "firebird"; then
+  list_add "PHP5_OPTS" "--enable-pdo"
+else
+  # 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"
 fi &&
 
-# 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" &&
+  local PDO_DRIVERS="mysql pgsql 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" ""
+        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" ""
+        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"
+        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"
+      if [[ "$foo" != "unixODBC" ]] && [[ "$foo" != "iODBC" ]]; then
+        # be sure that the PDO driver is disabled
+        list_add "PHP5_OPTS" "--without-pdo-$foo"
+      fi
     fi
   done
 fi &&
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 60c9928..50b6b7d 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -10,7 +10,7 @@ function db_driver_depends() {
   if list_find "$PHP5_DATABASE_DRIVERS" "$db_driver" || list_find 
"$PHP5_DATABASE_DRIVERS" "all"; then
     depends $db_spell "--with-$db_driver"
   else
-    OPTS="$OPTS --without-$db_driver"
+    list_add "PHP5_OPTS" "--without-$db_driver"
   fi
 }
 
@@ -31,7 +31,7 @@ else
                    "--enable-xml --enable-dom --with-xmlrpc" \
                    "--disable-xml --disable-dom --without-xmlrpc 
--disable-xmlreader --disable-xmlwriter --disable-simplexml" \
                    "For XML support (required for SOAP)"
-fi
+fi &&
 
 optional_depends libxslt \
                  "--with-xsl" "--without-xsl" \
@@ -41,7 +41,7 @@ if is_depends_enabled $SPELL libxml2 ; then
   config_query_option PHP5_OPTS "Enable SOAP support?" n \
                       "--enable-soap" "--disable-soap"
 else
-  PHP5_OPTS="${PHP5_OPTS} --disable-soap"
+  list_add "PHP5_OPTS" "--disable-soap"
 fi &&
 
 optional_depends pth \
@@ -55,16 +55,16 @@ if [[ $PHP5_SAPI == apache ]]; then
   esac &&
 
   if [[ "$(get_spell_provider $SPELL APACHE)" == 'apache1' ]]; then
-    PHP5_OPTS="--with-apxs --without-apxs2 $PHP5_OPTS"
+    list_add "PHP5_OPTS" "--with-apxs --without-apxs2"
   else
-    PHP5_OPTS="--with-apxs2 --without-apxs $PHP5_OPTS"
+    list_add "PHP5_OPTS" "--with-apxs2 --without-apxs"
   fi
 fi &&
 
 if [[ "$PHP5_PCRE" == "none" ]]; then
-  PHP5_OPTS="$PHP5_OPTS --without-pcre-regex --without-pcre"
+ list_add "PHP5_OPTS" "--without-pcre-regex --without-pcre"
 elif [[ "$PHP5_PCRE" == "external" ]]; then
-  depends pcre "--with-pcre-regex=${INSTALL_ROOT}/usr 
--with-pcre=${INSTALL_ROOT}/usr"
+  depends pcre "--with-pcre-regex=${INSTALL_ROOT}/usr" 
 fi &&
 
 optional_depends C-CLIENT \
@@ -75,9 +75,9 @@ optional_depends openssl \
                  "--with-openssl" "--without-openssl" \
                  "for OpenSSL support" &&
 
-if list_find "${OPTS}" "--with-imap"; then
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL C-CLIENT); then
   if is_depends_enabled $SPELL openssl; then
-    OPTS="$OPTS --with-imap-ssl"
+    list_add "PHP5_OPTS" "--with-imap-ssl"
   else
     optional_depends openssl \
                      "--with-imap-ssl" \
@@ -88,10 +88,6 @@ fi &&
 
 optional_depends MAIL-TRANSPORT-AGENT "" "" "for SMTP support" &&
 
-optional_depends enchant \
-                 "--with-enchant" "--without-enchant" \
-                 "use enchant for spelling functions?" &&
-
 optional_depends aspell \
                  "--with-pspell" "--without-pspell" \
                  "use aspell for spelling functions" &&
@@ -100,9 +96,15 @@ optional_depends mhash \
                  "--with-mhash" "--without-mhash" \
                  "for hash functions support" &&
 
-optional_depends oniguruma \
-                 "--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
-                 "for external oniguruma" &&
+if is_version_less 5.2.9999 "${VERSION}"; then
+  optional_depends enchant \
+                   "--with-enchant" "--without-enchant" \
+                   "use enchant for spelling functions?" &&
+
+  optional_depends oniguruma \
+                   "--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
+                   "for external oniguruma"
+fi &&
 
 optional_depends libmcrypt \
                  "--with-mcrypt" "--without-mcrypt" \
@@ -145,30 +147,49 @@ optional_depends icu \
 if list_find "$PHP5_DATABASE_DRIVERS" "mysql" || list_find 
"$PHP5_DATABASE_DRIVERS" "all"; then
   depends MYSQL &&
 
-  if [[ "${VERSION:0:3}" == "5.3" ]]; then
+  if is_version_less 5.2.9999 "${VERSION}"; 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"
+      list_add "PHP5_OPTS" "--with-mysql=mysqlnd"
     else
-      PHP5_OPTS="$PHP5_OPTS --with-mysql"
+      list_add "PHP5_OPTS" "--with-mysql=${INSTALL_ROOT}/usr"
     fi
   fi
 else
-  OPTS="$OPTS --without-mysql"
+  list_add "PHP5_OPTS" "--without-mysql"
 fi &&
+
 db_driver_depends "mysqli" "MYSQL" &&
 db_driver_depends "pgsql" "postgresql" &&
-db_driver_depends "sqlite" "sqlite2" &&
-db_driver_depends "sqlite3" "sqlite" &&
-db_driver_depends "firebird" "firebird" &&
+
+if is_version_less "${VERSION}" 5.4; then
+  db_driver_depends "sqlite" "sqlite2"
+fi &&
+
+if is_version_less 5.2.9999 "${VERSION}"; then
+  db_driver_depends "sqlite3" "sqlite"
+fi &&
+
+if list_find "${PHP5_DATABASE_DRIVERS}" "firebird"; then
+  depends firebird "--with-pdo-firebird=${INSTALL_ROOT}/usr"
+else
+  list_add "PHP5_OPTS" "--without-pdo-firebird"
+fi &&
+
+if list_find "${PHP5_DATABASE_DRIVERS}" "sqlite3"; then
+  depends sqlite "--with-pdo-sqlite=${INSTALL_ROOT}/usr"
+else
+  list_add "PHP5_OPTS" "--without-pdo-sqlite"
+fi &&
+
 # 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"
 elif list_find "$PHP5_DATABASE_DRIVERS" "iODBC"; then
   depends unixodbc "--with-iodbc=${INSTALL_ROOT}/usr --without-unixODBC"
 else
-  OPTS="$OPTS --without-iodbc --without-unixODBC"
+  list_add "PHP5_OPTS" "--without-iodbc --without-unixODBC"
 fi &&
 
 # DBA drivers
@@ -220,10 +241,9 @@ if [[ "${PHP5_GD}" == "external" ]]; then
 fi &&
 
 if [[ "${PHP5_GD}" != "none" ]]; then
-
     optional_depends libxpm \
                      "--with-xpm-dir=${INSTALL_ROOT}/usr" \
-                     "--without-xpm" \
+                     "--without-xpm-dir" \
                      "for XPM image support" &&
 
   if [[ "${PHP5_GD}" == "internal" ]]; then
@@ -241,18 +261,18 @@ if [[ "${PHP5_GD}" != "none" ]]; then
                      "for PNG support (for GD)"
   fi &&
 
-    optional_depends t1lib \
-                     "--with-t1lib=${INSTALL_ROOT}/usr" \
-                     "--without-t1lib" \
-                     "for t1lib support" &&
+  optional_depends t1lib \
+                   "--with-t1lib=${INSTALL_ROOT}/usr" \
+                   "--without-t1lib" \
+                   "for t1lib support" &&
 
-    optional_depends freetype2 \
-                     "--with-freetype-dir=${INSTALL_ROOT}/usr" \
-                     "--without-freetype-dir" \
-                     "for freetype2 support" &&
+  optional_depends freetype2 \
+                   "--with-freetype-dir=${INSTALL_ROOT}/usr" \
+                   "--without-freetype-dir" \
+                   "for freetype2 support" &&
 
-    optional_depends font-jis-misc \
-                     "--enable-gd-jis-conv" \
-                     "--disable-gd-jis-conv" \
-                     "for JIS-mapped Japanese font support"
+  optional_depends font-jis-misc \
+                   "--enable-gd-jis-conv" \
+                   "--disable-gd-jis-conv" \
+                   "for JIS-mapped Japanese font support"
 fi
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 6c07afa..609fae9 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,26 +1,30 @@
            SPELL=php
 if [[ $PHP5_BRANCH == stable ]]; then
-         VERSION=5.3.17
+         VERSION=5.4.12
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
+     
SOURCE_HASH=sha512:c4e87ff0d9457114f8428479e41cb69ffc4f4cc98a92fb0359e6130edb09b0af17ff344b3409f2f7850177591f288658f9a2797eac9962c9fb4f9eb58be64c21
+elif [[ $PHP5_BRANCH == previous ]]; then
+         VERSION=5.3.22
   SECURITY_PATCH=19
-     
SOURCE_HASH=sha512:70f5dca6c5e19c38b0586cd2f3854459ca56cac929b6c0cf8fda606b21031576c08214e817411c1c76158b14d09c175b9ef6ff35e17536b9dc80bdfb7d9b8937
+     
SOURCE_HASH=sha512:ab6fbb7cd2c9c0bff2dcc4198622f63c88c5047f7931b367ceb99e030204128fb2f7b3d2eb3578d2f4b6d5b11167976a66fc4d73db442e0e64a2a6376586f9d7
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-   if [[ $PHP5_SUHOSIN == y ]]; then
-        VERSIONX=5.3.9
-        VERSION2=0.9.10
-         SOURCE2=suhosin-patch-$VERSIONX-$VERSION2.patch.gz
-     SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
-         SOURCE3=$SOURCE2.sig
-  SOURCE3_IGNORE=signature
-     SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
-     SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
-   fi
+#   if [[ $PHP5_SUHOSIN == y ]]; then
+#        VERSIONX=5.3.9
+#        VERSION2=0.9.10
+#         SOURCE2=suhosin-patch-$VERSIONX-$VERSION2.patch.gz
+#     SOURCE2_URL="http://download.suhosin.org/$SOURCE2";
+#         SOURCE3=$SOURCE2.sig
+#  SOURCE3_IGNORE=signature
+#     SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
+#     SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
+#   fi
 elif [[ $PHP5_BRANCH == alpha ]]; then
-         VERSION=5.3.17
-     
SOURCE_HASH=sha512:70f5dca6c5e19c38b0586cd2f3854459ca56cac929b6c0cf8fda606b21031576c08214e817411c1c76158b14d09c175b9ef6ff35e17536b9dc80bdfb7d9b8937
+         VERSION=5.5.0alpha5
           SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
-  SECURITY_PATCH=19
+   SOURCE_URL[0]=http://downloads.php.net/dsp/$SOURCE
+     
SOURCE_HASH=sha512:647a60adc47392bfa35b73a26873f6ac68a555ba146201b47a7fae7e76c078d6bf41a93f5f7e60b38c005c81ec74979ef5625673695934ebb01069ea465a9b79
 elif [[ $PHP5_BRANCH == legacy ]]; then
          VERSION=5.2.17
   SECURITY_PATCH=21
@@ -41,6 +45,7 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
      SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
     
SOURCE4_HASH=sha512:cce9b47afd100ff0b650972fa6c7b0ed1c255da95bb8427238d336fee05fc7125cf9aacf5b9503986c3c45d57ca075e5b805dd0a2eb857917281ae4c4d715fad
 else
+# rc branch
          VERSION=5.3.17
   SECURITY_PATCH=19
      
SOURCE_HASH=sha512:70f5dca6c5e19c38b0586cd2f3854459ca56cac929b6c0cf8fda606b21031576c08214e817411c1c76158b14d09c175b9ef6ff35e17536b9dc80bdfb7d9b8937
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 0027eb6..8c17d2c 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,21 @@
+2013-02-27 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: switched stable to 5.4 (5.4.12); updated spell to 5.3.22
+         (previous), 5.5.0alpha5 (alpha)
+       * PREPARE: added 'previous' (previous stable) 5.3 branch; apply 
suhosin
+         patch only for legacy branch
+       * INSTALL: install php.ini according to php version
+       * BUILD: '--with-exec-dir' doesn't apply to 5.4 (and above)
+       * DEPENDS: PHP5_OPTS="... $PHP_OPTS" -> list_add "PHP5_OPTS" to avoid
+         duplicate entries; added missing '&&'; removed deprecated
+         '--with-pcre' flag; fixed imap dependency selection; enchant and
+         oniguruma apply only to 5.3 and above; fixed mysqlnd configuration;
+         fixed libxpm disable flag; corrected firebird and sqlite 2/3 
options;
+         cleaned up
+       * CONFIGURE: PHP5_OPTS="... $PHP_OPTS" -> list_add "PHP5_OPTS" to 
avoid
+         duplicate entries; safe mode switch is available only for php < 5.4;
+         fixed dba switch; fixed sqlite 2/3 selection according to php 
version;
+         dropped duplicate db driver loop; removed odbc disable switches
+
 2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated backports+security patches to 20121114;
          SECUIRTY_PATCH++
diff --git a/php-pear/php/INSTALL b/php-pear/php/INSTALL
index 83a6d6c..db83e72 100755
--- a/php-pear/php/INSTALL
+++ b/php-pear/php/INSTALL
@@ -1,7 +1,11 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
 default_install &&
 
-if [[ "${VERSION:0:3}" == "5.3" ]]; then
-  install_config_file $SOURCE_DIRECTORY/php.ini-production /etc/php.ini
+if is_version_less "${VERSION}" 5.3; then
+  install_config_file "$SOURCE_DIRECTORY/php.ini-recommended" \
+                      "$INSTALL_ROOT/etc/php.ini"
 else
-  install_config_file $SOURCE_DIRECTORY/php.ini-recommended /etc/php.ini
+  install_config_file "$SOURCE_DIRECTORY/php.ini-production" \
+                      "$INSTALL_ROOT/etc/php.ini"
 fi
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index 353276b..4e53391 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -1,10 +1,13 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+
 config_query_list PHP5_BRANCH "Which branch?" \
                               stable \
+                              previous \
                               legacy \
                               rc     \
                               alpha &&
 
-if [[ $PHP5_BRANCH != alpha ]] && [[ $PHP5_BRANCH != rc ]]; then
+if [[ $PHP5_BRANCH == legacy ]]; then
   message "For more information on Suhosin patchset see: 
http://www.hardened-php.net/suhosin/"; &&
   config_query PHP5_SUHOSIN "Do you want the Suhosin patchset enabled?" n
 fi