diff options
| -rw-r--r-- | 62.patch | 25 | ||||
| -rw-r--r-- | PHPINFO | 6 | ||||
| -rw-r--r-- | REFLECTION | 4 | ||||
| -rw-r--r-- | php-pecl-scoutapm.spec | 24 |
4 files changed, 49 insertions, 10 deletions
diff --git a/62.patch b/62.patch new file mode 100644 index 0000000..7c62f6d --- /dev/null +++ b/62.patch @@ -0,0 +1,25 @@ +From 0de44cc0483e139ff01f9efb8c01160b488c758f Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 19 Feb 2020 13:19:14 +0100 +Subject: [PATCH] fix typo in check + +--- + config.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config.m4 b/config.m4 +index 5043962..93ddb3d 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -15,9 +15,9 @@ PHP_ARG_ENABLE([scoutapm-dev], + if test "$PHP_SCOUTAPM" != "no"; then + + dnl modern version provides libcurl.pc +- AC_PATH_PROG(PKG_CONFIG, wpkg-config, no) ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + dnl old version only provides curl-config +- AC_PATH_PROG(CURL_CONFIG, wcurl-config, no) ++ AC_PATH_PROG(CURL_CONFIG, curl-config, no) + + AC_MSG_CHECKING(for libcurl headers) + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libcurl; then @@ -1,4 +1,8 @@ scoutapm -Version => 1.0.1 +scoutapm support => enabled +Version => 1.1.0 +curl functions => Yes +file functions => Yes +pdo functions => Yes @@ -1,8 +1,10 @@ -Extension [ <persistent> extension #201 scoutapm version 1.0.1 ] { +Extension [ <persistent> extension #112 scoutapm version 1.1.0 ] { - Functions { Function [ <internal:scoutapm> function scoutapm_get_calls ] { } + Function [ <internal:scoutapm> function scoutapm_list_instrumented_functions ] { + } } } diff --git a/php-pecl-scoutapm.spec b/php-pecl-scoutapm.spec index bd60786..397b7ba 100644 --- a/php-pecl-scoutapm.spec +++ b/php-pecl-scoutapm.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-scoutapm # -# Copyright (c) 2019 Remi Collet +# Copyright (c) 2019-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -17,11 +17,13 @@ Summary: Native Extension Component for ScoutAPM's PHP Agent Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.0.1 +Version: 1.1.0 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP -URL: http://pecl.php.net/package/%{pecl_name} +URL: https://pecl.php.net/package/%{pecl_name} + +Patch0: https://patch-diff.githubusercontent.com/raw/scoutapp/scout-apm-php-ext/pull/62.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7.1 @@ -47,10 +49,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.2" Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} @@ -89,6 +87,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd NTS +%patch0 -p1 -b .pr62 + : Check version extver=$(sed -n '/#define PHP_SCOUTAPM_VERSION /{s/.* "//;s/".*$//;p}' zend_scoutapm.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -221,6 +221,14 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Wed Feb 19 2020 Remi Collet <remi@remirepo.net> - 1.1.0-1 +- update to 1.1.0 +- add patch for libcurl detection from + https://github.com/scoutapp/scout-apm-php-ext/pull/62 + +* Tue Nov 26 2019 Remi Collet <remi@remirepo.net> - 1.0.2-1 +- update to 1.0.2 + * Wed Nov 6 2019 Remi Collet <remi@remirepo.net> - 1.0.1-1 - update to 1.0.1 |