rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

check sqlite3_column_table_name

Browse Source
This commit is contained in:
Remi Collet 2012-09-28 09:35:21 +02:00
parent 250e9e4289
commit 11b30d5b39
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
php-5.4.7-sqlite.patch Normal file
View File

@ -0,0 +1,27 @@
From 05b9b50f09e10038230e1edab43b86afb67c14a8 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 24 Sep 2012 13:53:59 +0200
Subject: [PATCH] Fix Bug #63149, check sqlite3_column_table_name availability
with system SQLite
---
ext/sqlite3/config0.m4 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index ac58b35..1365def 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -50,6 +50,9 @@ if test $PHP_SQLITE3 != "no"; then
PHP_CHECK_LIBRARY(sqlite3,sqlite3_key,[
AC_DEFINE(HAVE_SQLITE3_KEY, 1, [have commercial sqlite3 with crypto support])
])
+ PHP_CHECK_LIBRARY(sqlite3,sqlite3_column_table_name,[
+ AC_DEFINE(SQLITE_ENABLE_COLUMN_METADATA, 1, [have sqlite3 with column metadata enabled])
+ ])
PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension,
[],
--
1.7.10

4
php.spec
View File

@ -78,6 +78,8 @@ Patch8: php-5.4.7-libdb.patch
Patch20: php-5.4.7-imap.patch Patch20: php-5.4.7-imap.patch
# https://bugs.php.net/63171 no odbc call during timeout # https://bugs.php.net/63171 no odbc call during timeout
Patch21: php-5.4.7-odbctimer.patch Patch21: php-5.4.7-odbctimer.patch
# https://bugs.php.net/63149 check sqlite3_column_table_name
Patch22: php-5.4.7-sqlite.patch
# Functional changes # Functional changes
Patch40: php-5.4.0-dlopen.patch Patch40: php-5.4.0-dlopen.patch
@ -585,6 +587,7 @@ support for using the enchant library to PHP.
%patch20 -p1 -b .imap %patch20 -p1 -b .imap
%patch21 -p1 -b .odbctimer %patch21 -p1 -b .odbctimer
%patch22 -p1 -b .tablename
%patch40 -p1 -b .dlopen %patch40 -p1 -b .dlopen
%patch41 -p1 -b .easter %patch41 -p1 -b .easter
@ -1299,6 +1302,7 @@ fi
* Fri Sep 28 2012 Remi Collet <rcollet@redhat.com> 5.4.7-8 * Fri Sep 28 2012 Remi Collet <rcollet@redhat.com> 5.4.7-8
- systemd integration, https://bugs.php.net/63085 - systemd integration, https://bugs.php.net/63085
- no odbc call during timeout, https://bugs.php.net/63171 - no odbc call during timeout, https://bugs.php.net/63171
- check sqlite3_column_table_name, https://bugs.php.net/63149
* Mon Sep 24 2012 Remi Collet <rcollet@redhat.com> 5.4.7-7 * Mon Sep 24 2012 Remi Collet <rcollet@redhat.com> 5.4.7-7
- most failed tests explained (i386, x86_64) - most failed tests explained (i386, x86_64)