diff options
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-trace.spec | 54 | ||||
| -rw-r--r-- | trace-pr76.patch | 27 |
3 files changed, 18 insertions, 65 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #134 trace version 1.0.0 ] { +Extension [ <persistent> extension #139 trace version 1.0.1-beta ] { - INI { Entry [ trace.enable <SYSTEM> ] diff --git a/php-pecl-trace.spec b/php-pecl-trace.spec index 93b52f4..a67a563 100644 --- a/php-pecl-trace.spec +++ b/php-pecl-trace.spec @@ -12,31 +12,26 @@ %endif %global pecl_name trace -#global versuf -beta %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini %else %global ini_name 40-%{pecl_name}.ini %endif +%global prever beta +%global versuf -beta Summary: Trace is a low-overhead tracing tool for PHP Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.0.0 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 1.0.1 +Release: 0.1.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} # common/sds is BSD-2, other is ASL 2.0 License: ASL 2.0 and BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz - -# https://github.com/Qihoo360/phptrace/issues/75 -# https://github.com/Qihoo360/phptrace/pull/76 -Patch0: %{pecl_name}-pr76.patch +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# https://github.com/Qihoo360/phptrace/issues/71 -# PHP 7.1 build broken -BuildRequires: %{?scl_prefix}php-devel < 7.1 +BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -98,23 +93,16 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -pushd %{pecl_name}-%{version} -%patch0 -p1 -b .pr76 -popd - # Don't install tests sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml -pushd %{pecl_name}-%{version}/extension +pushd %{pecl_name}-%{version}%{?prever}/extension cp -p ../deps/sds/LICENSE ../LICENSE_sds -# https://github.com/Qihoo360/phptrace/issues/73 -sed -e '/TRACE_EXT_VERSION/s/0.6.0-beta/%{version}/' -i ../common/trace_version.h - # Sanity check, really often broken -extver=$(sed -n '/#define TRACE_EXT_VERSION/{s/.* "//;s/".*$//;p}' ../common/trace_version.h) +extver=$(sed -n '/#define TRACE_VERSION /{s/.* "//;s/".*$//;p}' ../common/trace_version.h) if test "x${extver}" != "x%{version}%{?versuf}"; then : Error: Upstream extension version is ${extver}, expecting %{version}%{?versuf}. exit 1 @@ -135,7 +123,7 @@ EOF %build %{?dtsenable} -cd %{pecl_name}-%{version}/extension +cd %{pecl_name}-%{version}%{?prever}/extension %{_bindir}/phpize %configure \ @@ -149,7 +137,7 @@ make cli %{?_smp_mflags} rm -rf %{buildroot} %{?dtsenable} -make -C %{pecl_name}-%{version}/extension install-all INSTALL_ROOT=%{buildroot} +make -C %{pecl_name}-%{version}%{?prever}/extension install-all INSTALL_ROOT=%{buildroot} # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -159,7 +147,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml # Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 %{pecl_name}-%{version}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +do install -Dpm 644 %{pecl_name}-%{version}%{?prever}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -184,19 +172,7 @@ fi %check -cd %{pecl_name}-%{version}/extension -: Ignore failed test -%if "%{php_version}" > "7.0" -# https://github.com/Qihoo360/phptrace/issues/72 -# PHP 7.0 failed tests -rm tests/trace_002.phpt -rm tests/trace_003.phpt -%endif -# https://github.com/Qihoo360/phptrace/issues/70 -# Failed test requiring TRACE_DEBUG -rm tests/trace_015.phpt -rm tests/trace_016.phpt - +cd %{pecl_name}-%{version}%{?prever}/extension : Minimal load test for NTS extension %{__php} --no-php-ini \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ @@ -216,7 +192,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%{?_licensedir:%license %{pecl_name}-%{version}/LICENSE*} +%{?_licensedir:%license %{pecl_name}-%{version}%{?prever}/LICENSE*} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %{_bindir}/phptrace @@ -226,6 +202,10 @@ rm -rf %{buildroot} %changelog +* Tue Mar 14 2017 Remi Collet <remi@remirepo.net> - 1.0.1-0.1.beta +- Update to 1.0.1beta +- drop patch merged upstream + * Sun Feb 5 2017 Remi Collet <remi@fedoraproject.org> - 1.0.0-2 - add patch for security issue (umask=0) patch from https://github.com/Qihoo360/phptrace/pull/76 diff --git a/trace-pr76.patch b/trace-pr76.patch deleted file mode 100644 index 5df2a3e..0000000 --- a/trace-pr76.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cf9e59ad032a56ee14d96f2a6adb6e17f51fa852 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 4 Feb 2017 10:39:23 +0100 -Subject: [PATCH] Fix #75: don't change umask value - ---- - common/trace_mmap.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/trace_mmap.c b/common/trace_mmap.c -index a051ecd..02a433c 100644 ---- a/common/trace_mmap.c -+++ b/common/trace_mmap.c -@@ -77,10 +77,12 @@ int pt_mmap_open(pt_segment_t *seg, const char *file, size_t size) - int pt_mmap_create(pt_segment_t *seg, const char *file, size_t size) - { - int fd; -+ mode_t um; - - /* file open */ -- umask(0000); -+ um = umask(0000); - fd = open(file, O_RDWR | O_CREAT, DEFFILEMODE); -+ umask(um); - if (fd == -1) { - return reset_with_retval(seg, -1); - } |