[packages/php] add info about db version linked in cdb ext
glen
glen at pld-linux.org
Wed Nov 11 14:46:56 CET 2015
commit 55cbf8a65b2f72168b7ced30c2951379852c5f1b
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Nov 11 15:26:14 2015 +0200
add info about db version linked in cdb ext
patch adopted from remi's repo
https://raw.githubusercontent.com/remicollet/remirepo/master/php/php70/php-7.0.0-libdb.patch
libdb-info.patch | 24 ++++++++++++++++++++++++
php.spec | 2 ++
2 files changed, 26 insertions(+)
---
diff --git a/php.spec b/php.spec
index 39e20df..e9fc00b 100644
--- a/php.spec
+++ b/php.spec
@@ -221,6 +221,7 @@ Patch67: mysql-lib-ver-mismatch.patch
Patch68: php-mysql-ssl-context.patch
Patch69: fpm-conf-split.patch
Patch70: mysqlnd-ssl.patch
+Patch71: libdb-info.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -2000,6 +2001,7 @@ exit 1
%patch67 -p1
#%patch68 -p1 DROP or update to 7.0 APIs
%patch70 -p1
+%patch71 -p1
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
diff --git a/libdb-info.patch b/libdb-info.patch
new file mode 100644
index 0000000..ee25732
--- /dev/null
+++ b/libdb-info.patch
@@ -0,0 +1,24 @@
+--- php-7.0.0beta1/ext/dba/dba.c.libdb 2015-07-08 02:24:59.119020904 +0200
++++ php-7.0.0beta1/ext/dba/dba.c 2015-07-08 07:01:43.158767655 +0200
+@@ -52,6 +52,10 @@
+ #include "php_qdbm.h"
+ #include "php_tcadb.h"
+
++#ifdef DB4_INCLUDE_FILE
++#include DB4_INCLUDE_FILE
++#endif
++
+ /* {{{ arginfo */
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
+ ZEND_ARG_INFO(0, path)
+@@ -545,6 +549,10 @@ PHP_MINFO_FUNCTION(dba)
+
+ php_info_print_table_start();
+ php_info_print_table_row(2, "DBA support", "enabled");
++#ifdef DB_VERSION_STRING
++ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING);
++ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL));
++#endif
+ if (handlers.s) {
+ smart_str_0(&handlers);
+ php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/55cbf8a65b2f72168b7ced30c2951379852c5f1b
More information about the pld-cvs-commit
mailing list