From a04267c22c6991966259a46790fb92ef6c625234 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 17 Jul 2015 15:25:18 +0000 Subject: [PATCH] - updated to 5.4.43 --- php-sqlite3.patch | 24 ------------------------ php.spec | 8 +++----- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 php-sqlite3.patch diff --git a/php-sqlite3.patch b/php-sqlite3.patch deleted file mode 100644 index c933db7..0000000 --- a/php-sqlite3.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urNp php-5.4.17.orig/ext/sqlite3/libsqlite/sqlite3.c php-5.4.17/ext/sqlite3/libsqlite/sqlite3.c ---- php-5.4.17.orig/ext/sqlite3/libsqlite/sqlite3.c 2013-07-03 06:10:53.000000000 +0000 -+++ php-5.4.17/ext/sqlite3/libsqlite/sqlite3.c 2013-07-18 14:37:33.000000000 +0000 -@@ -18139,7 +18139,7 @@ SQLITE_API sqlite3_int64 sqlite3_soft_he - sqlite3_int64 priorLimit; - sqlite3_int64 excess; - #ifndef SQLITE_OMIT_AUTOINIT -- sqlite3_initialize(); -+ if( sqlite3_initialize() ) return 0; - #endif - sqlite3_mutex_enter(mem0.mutex); - priorLimit = mem0.alarmThreshold; -diff -urNp php-5.4.17.orig/ext/sqlite3/php_sqlite3.h php-5.4.17/ext/sqlite3/php_sqlite3.h ---- php-5.4.17.orig/ext/sqlite3/php_sqlite3.h 2013-07-03 06:10:53.000000000 +0000 -+++ php-5.4.17/ext/sqlite3/php_sqlite3.h 2013-07-18 14:37:33.000000000 +0000 -@@ -21,7 +21,7 @@ - #ifndef PHP_SQLITE3_H - #define PHP_SQLITE3_H - --#define PHP_SQLITE3_VERSION "0.7" -+#define PHP_SQLITE3_VERSION "0.7-dev" - - extern zend_module_entry sqlite3_module_entry; - #define phpext_sqlite3_ptr &sqlite3_module_entry diff --git a/php.spec b/php.spec index 200dc0f..a647922 100644 --- a/php.spec +++ b/php.spec @@ -135,13 +135,13 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 5.4.41 +Version: 5.4.43 Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 License: PHP Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2 -# Source0-md5: e00817b920cfc6dde2d01d7a74c654c0 +# Source0-md5: eedfa86393db2ae49a163d1f80aa2c19 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -214,7 +214,6 @@ Patch63: %{orgname}-mysql-nowarning.patch Patch65: system-libzip.patch Patch66: php-db.patch Patch67: php-fileinfo.patch -Patch68: php-sqlite3.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} @@ -313,7 +312,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define intlver 1.1.0 %define jsonver 1.2.1 %define pharver 2.0.1 -%define sqlite3ver 0.7-dev +%define sqlite3ver 0.7 %define zipver 1.11.0 %define zend_zts %{!?with_zts:0}%{?with_zts:1} @@ -1909,7 +1908,6 @@ cp -p php.ini-production php.ini %{?with_system_libzip:%patch65 -p1} %patch66 -p1 %patch67 -p1 -%patch68 -p1 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 -- 2.46.0