update to 1.1.2HEADmaster

4 files changed, 21 insertions, 75 deletions

diff --git a/PHPINFO b/PHPINFO
index 4a46e5e..4f3ae81 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,9 +2,10 @@
 pinba
 
 Pinba support => enabled
-Extension version => 1.1.1
+Extension version => 1.1.2
 
 Directive => Local Value => Master Value
 pinba.server => no value => no value
+pinba.resolve_interval => 60 => 60
 pinba.enabled => 0 => 0
 pinba.auto_flush => 1 => 1
diff --git a/REFLECTION b/REFLECTION
index ce0f99e..fe6a733 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,9 +1,12 @@
-Extension [ <persistent> extension #122 pinba version 1.1.1 ] {
+Extension [ <persistent> extension #116 pinba version 1.1.2 ] {
 
   - INI {
     Entry [ pinba.server <ALL> ]
       Current = ''
     }
+    Entry [ pinba.resolve_interval <ALL> ]
+      Current = '60'
+    }
     Entry [ pinba.enabled <ALL> ]
       Current = '0'
     }
@@ -13,11 +16,11 @@ Extension [ <persistent> extension #122 pinba version 1.1.1 ] {
   }
 
   - Constants [5] {
-    Constant [ integer PINBA_FLUSH_ONLY_STOPPED_TIMERS ] { 1 }
-    Constant [ integer PINBA_FLUSH_RESET_DATA ] { 2 }
-    Constant [ integer PINBA_ONLY_STOPPED_TIMERS ] { 1 }
-    Constant [ integer PINBA_ONLY_RUNNING_TIMERS ] { 4 }
-    Constant [ integer PINBA_AUTO_FLUSH ] { 8 }
+    Constant [ int PINBA_FLUSH_ONLY_STOPPED_TIMERS ] { 1 }
+    Constant [ int PINBA_FLUSH_RESET_DATA ] { 2 }
+    Constant [ int PINBA_ONLY_STOPPED_TIMERS ] { 1 }
+    Constant [ int PINBA_ONLY_RUNNING_TIMERS ] { 4 }
+    Constant [ int PINBA_AUTO_FLUSH ] { 8 }
   }
 
   - Functions {
diff --git a/edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e.patch b/edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e.patch
deleted file mode 100644
index 59a2338..0000000
--- a/edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e Mon Sep 17 00:00:00 2001
-From: Antony Dovgal <tony@daylessday.org>
-Date: Mon, 23 Apr 2018 12:26:50 +0300
-Subject: [PATCH] fix build with PHP master
-
-update news and current version
----
- NEWS        |  4 ++++
- php_pinba.h |  2 +-
- pinba.c     | 12 ++++++++++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/pinba.c b/pinba.c
-index 561b40c..a7b2ecf 100644
---- a/pinba.c
-+++ b/pinba.c
-@@ -1292,7 +1292,11 @@ static PHP_FUNCTION(pinba_timer_start)
- 		timeval_cvt(&t->tmp_ru_stime, &u.ru_stime);
- 	}
- 	/* refcount++ so that the timer is shut down only on request finish if not stopped manually */
-+#if PHP_VERSION_ID < 70300
- 	GC_REFCOUNT(rsrc)++;
-+#else
-+	GC_ADDREF(rsrc);
-+#endif
- 	RETURN_RES(rsrc);
- }
- /* }}} */
-@@ -1351,7 +1355,11 @@ static PHP_FUNCTION(pinba_timer_add)
- 	t->rsrc_id = rsrc->handle;
- 
- 	/* refcount++ so that the timer is shut down only on request finish if not stopped manually */
-+#if PHP_VERSION_ID < 70300
- 	GC_REFCOUNT(rsrc)++;
-+#else
-+	GC_ADDREF(rsrc);
-+#endif
- 	RETURN_RES(rsrc);
- }
- /* }}} */
-@@ -1808,7 +1816,11 @@ static PHP_FUNCTION(pinba_timers_get)
- 				continue;
- 			}
- 			/* refcount++ */
-+#if PHP_VERSION_ID < 70300
- 			GC_REFCOUNT(rsrc)++;
-+#else
-+			GC_ADDREF(rsrc);
-+#endif
- 			add_next_index_resource(return_value, rsrc);
- 		}
- 	}
diff --git a/php-pinba.spec b/php-pinba.spec
index cf88bfd..fdeec54 100644
--- a/php-pinba.spec
+++ b/php-pinba.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pinba
 #
-# Copyright (c) 2017-2019 Remi Collet
+# Copyright (c) 2017-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,7 +12,7 @@
 
 %{?scl:          %scl_package         php-pinba}
 
-%global gh_commit   225262582ed3fb6e8de6eb5ec5a8c666716385dc
+%global gh_commit   98c01fb5cde068426aae61d239205db75c507cbf
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    tony2001
 %global gh_project  pinba_extension
@@ -22,18 +22,16 @@
 
 Summary:       Client extension for Pinba statistics server
 Name:          %{?scl_prefix}php-pinba
-Version:       1.1.1
+Version:       1.1.2
 %if 0%{?gh_date:1}
-Release:       0.7.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
-Release:       6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %endif
 License:       LGPLv2+
 URL:           https://github.com/%{gh_owner}/%{gh_project}
 Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 
-Patch0:        https://github.com/tony2001/pinba_extension/commit/edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 7
 BuildRequires: %{?scl_prefix}php-tokenizer
@@ -42,13 +40,7 @@ Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-Obsoletes:     php70u-%{pecl_name} <= %{version}
-Obsoletes:     php70w-%{pecl_name} <= %{version}
-%if "%{php_version}" > "7.1"
-Obsoletes:     php71u-%{pecl_name} <= %{version}
-Obsoletes:     php71w-%{pecl_name} <= %{version}
-%endif
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 %if "%{php_version}" > "7.2"
 Obsoletes:     php72u-%{pecl_name} <= %{version}
 Obsoletes:     php72w-%{pecl_name} <= %{version}
@@ -81,8 +73,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 mv %{gh_project}-%{gh_commit} NTS
 
 cd NTS
-%patch0 -p1 -b .up
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PINBA_VERSION/{s/.* "//;s/".*$//;p}' php_pinba.h)
 if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
@@ -103,6 +93,7 @@ extension = %{pecl_name}.so
 
 ; Configuration
 ;pinba.server = ''
+;pinba.resolve_interval = 60
 ;pinba.enabled = 0
 ;pinba.auto_flush = 1
 EOF
@@ -188,6 +179,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Sun Aug  2 2020 Remi Collet <remi@remirepo.net> - 1.1.2-1
+- update to 1.1.2
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.1.1-6
 - rebuild for 7.4.0RC1