diff options
| -rw-r--r-- | APM-pr38.patch | 75 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-apm.spec | 9 |
3 files changed, 5 insertions, 81 deletions
diff --git a/APM-pr38.patch b/APM-pr38.patch deleted file mode 100644 index 191288f..0000000 --- a/APM-pr38.patch +++ /dev/null @@ -1,75 +0,0 @@ -From ba6e8150b4d90220d89f77d5188918960bf0b3b4 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Tue, 29 Mar 2016 13:29:03 +0200 -Subject: [PATCH] fix php5/ZTS build - ---- - apm.c | 2 +- - driver_mysql.c | 2 +- - driver_socket.c | 2 +- - driver_sqlite3.c | 2 +- - php_apm.h | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/apm.c b/apm.c -index 5c64e67..624369c 100644 ---- a/apm.c -+++ b/apm.c -@@ -566,7 +566,7 @@ static void process_event(int event_type, int type, char * error_filename, uint - #define FETCH_HTTP_GLOBALS(name) (tmp = PG(http_globals)[TRACK_VARS_##name]) - #endif - --void extract_data() -+void extract_data(TSRMLS_D) - { - zval *tmp; - -diff --git a/driver_mysql.c b/driver_mysql.c -index d8f3a30..1f2390b 100644 ---- a/driver_mysql.c -+++ b/driver_mysql.c -@@ -140,7 +140,7 @@ static void apm_driver_mysql_insert_request(TSRMLS_D) - struct in_addr ip_addr; - MYSQL *connection; - -- extract_data(); -+ extract_data(TSRMLS_C); - - APM_DEBUG("[MySQL driver] Begin insert request\n"); - if (APM_G(mysql_is_request_created)) { -diff --git a/driver_socket.c b/driver_socket.c -index a614bd0..97261be 100644 ---- a/driver_socket.c -+++ b/driver_socket.c -@@ -143,7 +143,7 @@ int apm_driver_socket_rshutdown(TSRMLS_D) - return SUCCESS; - } - -- extract_data(); -+ extract_data(TSRMLS_C); - - sd_it = 0; - -diff --git a/driver_sqlite3.c b/driver_sqlite3.c -index 3050c33..049e5e1 100644 ---- a/driver_sqlite3.c -+++ b/driver_sqlite3.c -@@ -191,7 +191,7 @@ static void apm_driver_sqlite3_insert_request(TSRMLS_D) - struct in_addr ip_addr; - sqlite3 *connection; - -- extract_data(); -+ extract_data(TSRMLS_C); - - APM_DEBUG("[SQLite driver] Begin insert request\n"); - if (APM_G(sqlite3_is_request_created)) { -diff --git a/php_apm.h b/php_apm.h -index 9bad594..775d158 100644 ---- a/php_apm.h -+++ b/php_apm.h -@@ -378,4 +378,4 @@ length); - - #endif - --void extract_data(); -+void extract_data(TSRMLS_D); @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #195 apm version 2.1.0 ] { +Extension [ <persistent> extension #195 apm version 2.1.1 ] { - INI { Entry [ apm.enabled <SYSTEM> ] diff --git a/php-pecl-apm.spec b/php-pecl-apm.spec index 0358764..81df3e7 100644 --- a/php-pecl-apm.spec +++ b/php-pecl-apm.spec @@ -41,7 +41,7 @@ Name: %{?sub_prefix}php-pecl-apm Summary: Alternative PHP Monitor -Version: 2.1.0 +Version: 2.1.1 %if 0%{?gh_date:1} Release: 6.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz @@ -53,9 +53,6 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz # Disable the extension and drivers by default Patch0: %{proj_name}-config.patch -# See https://github.com/patrickallaert/php-apm/pull/38 -Patch1: %{proj_name}-pr38.patch - License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{proj_name} @@ -145,7 +142,6 @@ mv %{proj_name}-%{version} NTS cd NTS %patch0 -p0 -b .rpm sed -e 's:/var/php/apm/db:%{_localstatedir}/lib/php/apm/db:' -i apm.ini -%patch1 -p1 -b .pr38 : Sanity check, really often broken extver=$(sed -n '/#define PHP_APM_VERSION/{s/.* "//;s/".*$//;p}' php_apm.h) @@ -279,6 +275,9 @@ fi %changelog +* Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> - 2.1.1-1 +- Update to 2.1.1 (no change, only patch merged upstream) + * Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> - 2.1.0-1 - Update to 2.1.0 - add patch to fix ZTS build |