Date: Wednesday, August 7, 2013 @ 21:02:02 Author: pierre Revision: 192213
upgpkg: php 5.4.17-2 db 6 rebuild Added: php/trunk/db6.patch Modified: php/trunk/PKGBUILD -----------+ PKGBUILD | 8 ++++++-- db6.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-07 18:29:47 UTC (rev 192212) +++ PKGBUILD 2013-08-07 19:02:02 UTC (rev 192213) @@ -22,7 +22,7 @@ 'php-tidy' 'php-xsl') pkgver=5.4.17 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -31,12 +31,13 @@ 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' + 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'db6.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') md5sums=('1e027e99e2a874310fd518e87e3947af' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' + '60b4c3231f927fe84a9db00ba8442df4' 'e036c721e5ad927cd1613c7475a58b3a' 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') @@ -46,6 +47,7 @@ patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + patch -p0 -i ${srcdir}/db6.patch } build() { @@ -193,6 +195,8 @@ # check() { # cd ${srcdir}/build-php +# export SNMP_TIMEOUT=1 +# export SNMP_RETRIES=0 # make test # } Added: db6.patch =================================================================== --- db6.patch (rev 0) +++ db6.patch 2013-08-07 19:02:02 UTC (rev 192213) @@ -0,0 +1,59 @@ +--- configure 2013-07-03 08:16:15.000000000 +0200 ++++ configure 2013-08-07 19:19:16.797273766 +0200 +@@ -42409,7 +42409,7 @@ + /* end confdefs.h. */ + + #include "$THIS_INCLUDE" +-#if DB_VERSION_MAJOR == 4 || (4 == 4 && DB_VERSION_MAJOR == 5) ++#if DB_VERSION_MAJOR == 4 || (4 == 4 && DB_VERSION_MAJOR >= 5) + yes + #endif + +@@ -42785,7 +42785,7 @@ + /* end confdefs.h. */ + + #include "$THIS_INCLUDE" +-#if DB_VERSION_MAJOR == 3 || (3 == 4 && DB_VERSION_MAJOR == 5) ++#if DB_VERSION_MAJOR == 3 || (3 == 4 && DB_VERSION_MAJOR >= 5) + yes + #endif + +@@ -43161,7 +43161,7 @@ + /* end confdefs.h. */ + + #include "$THIS_INCLUDE" +-#if DB_VERSION_MAJOR == 2 || (2 == 4 && DB_VERSION_MAJOR == 5) ++#if DB_VERSION_MAJOR == 2 || (2 == 4 && DB_VERSION_MAJOR >= 5) + yes + #endif + +--- ext/dba/config.m4 2013-07-03 08:10:53.000000000 +0200 ++++ ext/dba/config.m4 2013-08-07 19:18:55.774448348 +0200 +@@ -245,7 +245,7 @@ + ],[ + AC_EGREP_CPP(yes,[ + #include "$THIS_INCLUDE" +-#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5) ++#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR >= 5) + yes + #endif + ],[ +--- ext/dba/dba_db4.c 2013-07-03 08:10:53.000000000 +0200 ++++ ext/dba/dba_db4.c 2013-08-07 19:19:04.827562638 +0200 +@@ -44,7 +44,7 @@ + { + TSRMLS_FETCH(); + +-#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)) ++#if (DB_VERSION_MAJOR >= 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)) + /* Bug 51086, Berkeley DB 4.8.26 */ + /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test compatibility */ + { +--- ext/dba/tests/dba_db4_handlers.phpt 2013-07-03 08:10:53.000000000 +0200 ++++ ext/dba/tests/dba_db4_handlers.phpt 2013-08-07 20:39:34.640194224 +0200 +@@ -47,4 +47,4 @@ + Test 1 + Success: db4 enabled + Test 2 - full info +-.*Berkeley DB (4|5).* ++.*Berkeley DB (4|5|6).*