[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (0091cbae16b8f897c5ecf8f8c45fc1ca9d11a234)

Elisamuel Resto scm at sourcemage.org
Sat Oct 25 15:38:11 EDT 2008


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

 php-pear/php/DEPENDS  |   32 +++++++++++++++++++++++++++-----
 php-pear/php/DETAILS  |    5 +++++
 php-pear/php/HISTORY  |    7 +++++++
 php-pear/php/PREPARE  |    9 ++++++---
 utils/rsyslog/DETAILS |    8 ++++----
 utils/rsyslog/HISTORY |    3 +++
 6 files changed, 52 insertions(+), 12 deletions(-)

New commits:
commit 0091cbae16b8f897c5ecf8f8c45fc1ca9d11a234
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    php-pear/php: updated RC to 5.2.7RC2

commit 4a1e3dac285f388f0ec3aa39156b66985a7f69c2
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    utils/rsyslog: updated devel branch to 3.21.6

commit eb36d11ea713e3834167f5d1715d47392093ee6f
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    utils/rsyslog: updated beta branch to 3.19.12

commit b100836be8ce5005ba072fb33aa8f56f6cc57847
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    php-pear/php: added option for mysqlnd on 5.3.0 alpha branch

commit 94f33c9bec52fc4f55db982d986a53cd0a3525d9
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    php-pear/php: Added latest RC (5.2.7RC1) to RC; Added alpha version query

diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 7fbc23e..77aa84f 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -98,14 +98,36 @@ if is_depends_enabled $SPELL postgresql && list_find "${PHP5_OPTS}" "--enable-pd
 fi &&
 
 optional_depends mysql \
-                 "--with-mysql" "--without-mysql" \
+                 "" "" \
                  "for MySQL support" &&
 
+if is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" == "5.3" ]]; then
+    config_query PHP5_MYSQLND "Do you want to use the MySQL Native Driver [mysqlnd]? (experimental)" y &&
+
+    if [[ "${PHP5_MYSQLND}" == "y" ]]; then
+        PHP5_OPTS="${PHP5_OPTS} --with-mysql=mysqlnd"
+    else
+        PHP5_OPTS="${PHP5_OPTS} --with-mysql"
+    fi
+elif is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" != "5.3" ]]; then
+    PHP5_OPTS="${PHP5_OPTS} --with-mysql"
+else
+    PHP5_OPTS="${PHP5_OPTS} --without-mysql"
+fi &&
+
 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"
+    if [[ "${VERSION:0:3}" == "5.3" ]] && [[ "${PHP5_MYSQLND}" == "y" ]]; then
+        config_query_option PHP5_OPTS "Do you want to build the MySQLi extension?" n \
+                            "--with-mysqli=mysqlnd" "--without-mysqli" &&
+
+        config_query_option PHP5_OPTS "Do you also want to build the MySQL PDO driver?" n \
+                            "--with-pdo-mysql=mysqlnd" "--without-pdo-mysql"
+    else
+        config_query_option PHP5_OPTS "Do you want to build the MySQLi extension?" n \
+                            "--with-mysqli" "--without-mysqli" &&
+        config_query_option PHP5_OPTS "Do you also want to build the MySQL PDO driver?" n \
+                            "--with-pdo-mysql" "--without-pdo-mysql"
+    fi
 fi &&
 
 optional_depends gdbm \
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index b290360..b64cdda 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,5 +1,10 @@
            SPELL=php
 if [[ "${PHP5_RC}" == "y" ]]; then
+         VERSION=5.2.7RC2
+     SOURCE_HASH=sha512:922e52b54b7c987b6f5797795647f34dfe30cd47cacee0ac76e4dc4e104e4475f56e4e41002daf41e85844ee61a79d639bf1b9ae947018e00ed0ce0976879612
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://downloads.php.net/ilia/$SOURCE
+elif [[ "${PHP5_ALPHA}" == "y" ]]; then
          VERSION=5.3.0alpha2
      SOURCE_HASH=sha512:668b54c410e68432ac8d1e8df34c0b2326fd632643f7548f68ad1b3251595a7a3cf57ef84c2ea16235675d82a09eb08d88915ca002b89f890958d5bf38a42042
           SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index f07f51e..b6eb6c4 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,5 +1,12 @@
+2008-10-25 Elisamuel Resto <ryuji at sourcemage.org>
+	* DETAILS: updated the RC to 5.2.7RC2
+
+2008-10-21 Elisamuel Resto <ryuji at sourcemage.org>
+	* DEPENDS: added option for using mysqlnd on 5.3.0 alpha branch
+
 2008-10-20 Elisamuel Resto <ryuji at sourcemage.org>
 	* DEPENDS: --with-dom -> --enable-dom (Bug #14829)
+	* PREPARE, DETAILS: Added latest RC (5.2.7RC1) to RC; Added alpha version query
 
 2008-10-08 Elisamuel Resto <ryuji at sourcemage.org>
 	* BUILD: fix building of IMAP extension with SSL (Bug #14799)
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index 5a46542..f17b880 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -1,7 +1,10 @@
 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
+    config_query PHP5_ALPHA "Install the latest alpha version?" n
 
+    if [[ "${PHP5_ALPHA}" != "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
+fi
diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index 40b6b3e..663b82c 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -1,10 +1,10 @@
            SPELL=rsyslog
 if [[ "${RSYSLOG_BRANCH}" == "devel" ]]; then
-         VERSION=3.21.5
-     SOURCE_HASH=sha512:0a87b9daa4871307f76754403b64fc0465d8f1dec29df9b5b150fcd9580356681ffd65926296ff099b3a680254af104cebb8edb950125f22ebcc88d8612e8313
+         VERSION=3.21.6
+     SOURCE_HASH=sha512:adbcdaa18b6d28ef6f44065dfcec93abcdeaa680abfa734b0b8787cc75ead59358b19e30dfa40883d0549d74c34c8c779aefbe48850c09375e46e95b3e680fe5
 elif [[ "${RSYSLOG_BRANCH}" == "beta" ]]; then
-         VERSION=3.19.11
-     SOURCE_HASH=sha512:9a25fbc11e816e4f7c7771057de76413ce5e98ecf7e1bc0e69dae0cbe91a5843e119766e6de9026c79cacab48c65bf1fcca4ceb32a2ea67caa8b6a4cdb5e7914
+         VERSION=3.19.12
+     SOURCE_HASH=sha512:c04e2286e65f84e52f262338c71b19bdc9ec5f3c1966482d5dd6bbb9def5a2c4dbc6351d3b31e36eff537bec819ec4c5e36dada116a13ed9cf33c32aa3680e5b
 else
          VERSION=3.18.5
      SOURCE_HASH=sha512:0b6cb1281bb77285ae82f1ae5812b571fba5c4fe75337c50c8445c4076143c969218b22e30ce3b7261d09563f7faa203e3144308519e0e14590b9b7903b6d7d9
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index eba49d7..e55d1ae 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,3 +1,6 @@
+2008-10-25 Elisamuel Resto <ryuji at sourcemage.org>
+	* DETAILS: updated beta branch to 3.19.12; devel branch to 3.21.6
+
 2008-10-15 Elisamuel Resto <ryuji at sourcemage.org>
 	* DETAILS: updated stable branch to 3.18.5
 



More information about the SM-Commit mailing list