diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PHPINFO | 6 | ||||
-rw-r--r-- | REFLECTION | 319 | ||||
-rw-r--r-- | php-pecl-varnish.spec | 120 | ||||
-rw-r--r-- | varnish-up.patch | 11 | ||||
-rw-r--r-- | varnish-upstream.patch | 28 |
6 files changed, 276 insertions, 210 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc @@ -2,6 +2,6 @@ varnish varnish support => enabled -Extension version => 1.2.4 -Revision => $Id: varnish.c 344445 2018-03-04 19:35:20Z ab $ -Varnish version => Varnish 5.1.3 05c5ac6b9 +Extension version => 1.2.6 +Revision => $Id: varnish.c 350374 2020-08-24 15:39:32Z remi $ +Varnish version => Varnish 6.4.0 13f137934ec1cf14af66baf7896311115ee35598 @@ -1,29 +1,29 @@ -Extension [ <persistent> extension #162 varnish version 1.2.4 ] { +Extension [ <persistent> extension #119 varnish version 1.2.6 ] { - Dependencies { Dependency [ hash (Required) ] } - Constants [19] { - Constant [ integer VARNISH_STATUS_SYNTAX ] { 100 } - Constant [ integer VARNISH_STATUS_UNKNOWN ] { 101 } - Constant [ integer VARNISH_STATUS_UNIMPL ] { 102 } - Constant [ integer VARNISH_STATUS_TOOFEW ] { 104 } - Constant [ integer VARNISH_STATUS_TOOMANY ] { 105 } - Constant [ integer VARNISH_STATUS_PARAM ] { 106 } - Constant [ integer VARNISH_STATUS_AUTH ] { 107 } - Constant [ integer VARNISH_STATUS_OK ] { 200 } - Constant [ integer VARNISH_STATUS_CANT ] { 300 } - Constant [ integer VARNISH_STATUS_COMMS ] { 400 } - Constant [ integer VARNISH_STATUS_CLOSE ] { 500 } + Constant [ int VARNISH_STATUS_SYNTAX ] { 100 } + Constant [ int VARNISH_STATUS_UNKNOWN ] { 101 } + Constant [ int VARNISH_STATUS_UNIMPL ] { 102 } + Constant [ int VARNISH_STATUS_TOOFEW ] { 104 } + Constant [ int VARNISH_STATUS_TOOMANY ] { 105 } + Constant [ int VARNISH_STATUS_PARAM ] { 106 } + Constant [ int VARNISH_STATUS_AUTH ] { 107 } + Constant [ int VARNISH_STATUS_OK ] { 200 } + Constant [ int VARNISH_STATUS_CANT ] { 300 } + Constant [ int VARNISH_STATUS_COMMS ] { 400 } + Constant [ int VARNISH_STATUS_CLOSE ] { 500 } Constant [ string VARNISH_CONFIG_IDENT ] { ident } Constant [ string VARNISH_CONFIG_HOST ] { host } Constant [ string VARNISH_CONFIG_PORT ] { port } Constant [ string VARNISH_CONFIG_TIMEOUT ] { timeout } Constant [ string VARNISH_CONFIG_SECRET ] { secret } Constant [ string VARNISH_CONFIG_COMPAT ] { compat } - Constant [ integer VARNISH_COMPAT_2 ] { 2 } - Constant [ integer VARNISH_COMPAT_3 ] { 3 } + Constant [ int VARNISH_COMPAT_2 ] { 2 } + Constant [ int VARNISH_COMPAT_3 ] { 3 } } - Classes [4] { @@ -43,66 +43,161 @@ Extension [ <persistent> extension #162 varnish version 1.2.4 ] { - Methods [21] { Method [ <internal:varnish, ctor> public method __construct ] { + + - Parameters [1] { + Parameter #0 [ <optional> array $opt ] + } } Method [ <internal:varnish> public method connect ] { + + - Parameters [0] { + } + - Return [ bool ] } Method [ <internal:varnish> public method auth ] { + + - Parameters [0] { + } + - Return [ bool ] } Method [ <internal:varnish> public method getParams ] { + + - Parameters [0] { + } + - Return [ array ] } Method [ <internal:varnish> public method setParam ] { + + - Parameters [2] { + Parameter #0 [ <required> string $name ] + Parameter #1 [ <required> string $value ] + } + - Return [ int ] } Method [ <internal:varnish> public method stop ] { + + - Parameters [0] { + } + - Return [ int ] } Method [ <internal:varnish> public method start ] { + + - Parameters [0] { + } + - Return [ int ] } Method [ <internal:varnish> public method banUrl ] { + + - Parameters [1] { + Parameter #0 [ <required> string $regex ] + } + - Return [ int ] } Method [ <internal:varnish> public method ban ] { + + - Parameters [1] { + Parameter #0 [ <required> string $regex ] + } + - Return [ int ] } Method [ <internal:varnish> public method isRunning ] { + + - Parameters [0] { + } + - Return [ bool ] } Method [ <internal:varnish> public method getPanic ] { + + - Parameters [0] { + } + - Return [ string ] } Method [ <internal:varnish> public method clearPanic ] { + + - Parameters [0] { + } + - Return [ int ] } Method [ <internal:varnish> public method setHost ] { + + - Parameters [1] { + Parameter #0 [ <required> string $host ] + } + - Return [ void ] } Method [ <internal:varnish> public method setIdent ] { + + - Parameters [1] { + Parameter #0 [ <required> string $ident ] + } + - Return [ void ] } Method [ <internal:varnish> public method setTimeout ] { + + - Parameters [1] { + Parameter #0 [ <required> int $timeout ] + } + - Return [ void ] } Method [ <internal:varnish> public method setPort ] { + + - Parameters [1] { + Parameter #0 [ <required> int $port ] + } + - Return [ void ] } Method [ <internal:varnish> public method setSecret ] { + + - Parameters [1] { + Parameter #0 [ <required> string $secret ] + } + - Return [ void ] } Method [ <internal:varnish> public method setCompat ] { + + - Parameters [1] { + Parameter #0 [ <required> int $compat ] + } + - Return [ void ] } Method [ <internal:varnish> public method getVclList ] { + + - Parameters [0] { + } + - Return [ array ] } Method [ <internal:varnish> public method vclUse ] { + + - Parameters [1] { + Parameter #0 [ <required> string $name ] + } + - Return [ bool ] } Method [ <internal:varnish> public method disconnect ] { + + - Parameters [0] { + } + - Return [ bool ] } } } @@ -123,104 +218,112 @@ Extension [ <persistent> extension #162 varnish version 1.2.4 ] { - Methods [1] { Method [ <internal:varnish, ctor> public method __construct ] { + + - Parameters [1] { + Parameter #0 [ <optional> array $opt ] + } } } } Class [ <internal:varnish> class VarnishLog ] { - - Constants [91] { - Constant [ public integer TAG_Debug ] { 1 } - Constant [ public integer TAG_Error ] { 2 } - Constant [ public integer TAG_CLI ] { 3 } - Constant [ public integer TAG_SessOpen ] { 4 } - Constant [ public integer TAG_SessClose ] { 5 } - Constant [ public integer TAG_BackendOpen ] { 6 } - Constant [ public integer TAG_BackendReuse ] { 7 } - Constant [ public integer TAG_BackendClose ] { 8 } - Constant [ public integer TAG_HttpGarbage ] { 9 } - Constant [ public integer TAG_Proxy ] { 10 } - Constant [ public integer TAG_ProxyGarbage ] { 11 } - Constant [ public integer TAG_Backend ] { 12 } - Constant [ public integer TAG_Length ] { 13 } - Constant [ public integer TAG_FetchError ] { 14 } - Constant [ public integer TAG_ReqMethod ] { 15 } - Constant [ public integer TAG_ReqURL ] { 16 } - Constant [ public integer TAG_ReqProtocol ] { 17 } - Constant [ public integer TAG_ReqStatus ] { 18 } - Constant [ public integer TAG_ReqReason ] { 19 } - Constant [ public integer TAG_ReqHeader ] { 20 } - Constant [ public integer TAG_ReqUnset ] { 21 } - Constant [ public integer TAG_ReqLost ] { 22 } - Constant [ public integer TAG_RespMethod ] { 23 } - Constant [ public integer TAG_RespURL ] { 24 } - Constant [ public integer TAG_RespProtocol ] { 25 } - Constant [ public integer TAG_RespStatus ] { 26 } - Constant [ public integer TAG_RespReason ] { 27 } - Constant [ public integer TAG_RespHeader ] { 28 } - Constant [ public integer TAG_RespUnset ] { 29 } - Constant [ public integer TAG_RespLost ] { 30 } - Constant [ public integer TAG_BereqMethod ] { 31 } - Constant [ public integer TAG_BereqURL ] { 32 } - Constant [ public integer TAG_BereqProtocol ] { 33 } - Constant [ public integer TAG_BereqStatus ] { 34 } - Constant [ public integer TAG_BereqReason ] { 35 } - Constant [ public integer TAG_BereqHeader ] { 36 } - Constant [ public integer TAG_BereqUnset ] { 37 } - Constant [ public integer TAG_BereqLost ] { 38 } - Constant [ public integer TAG_BerespMethod ] { 39 } - Constant [ public integer TAG_BerespURL ] { 40 } - Constant [ public integer TAG_BerespProtocol ] { 41 } - Constant [ public integer TAG_BerespStatus ] { 42 } - Constant [ public integer TAG_BerespReason ] { 43 } - Constant [ public integer TAG_BerespHeader ] { 44 } - Constant [ public integer TAG_BerespUnset ] { 45 } - Constant [ public integer TAG_BerespLost ] { 46 } - Constant [ public integer TAG_ObjMethod ] { 47 } - Constant [ public integer TAG_ObjURL ] { 48 } - Constant [ public integer TAG_ObjProtocol ] { 49 } - Constant [ public integer TAG_ObjStatus ] { 50 } - Constant [ public integer TAG_ObjReason ] { 51 } - Constant [ public integer TAG_ObjHeader ] { 52 } - Constant [ public integer TAG_ObjUnset ] { 53 } - Constant [ public integer TAG_ObjLost ] { 54 } - Constant [ public integer TAG_BogoHeader ] { 55 } - Constant [ public integer TAG_LostHeader ] { 56 } - Constant [ public integer TAG_TTL ] { 57 } - Constant [ public integer TAG_Fetch_Body ] { 58 } - Constant [ public integer TAG_VCL_acl ] { 59 } - Constant [ public integer TAG_VCL_call ] { 60 } - Constant [ public integer TAG_VCL_trace ] { 61 } - Constant [ public integer TAG_VCL_return ] { 62 } - Constant [ public integer TAG_ReqStart ] { 63 } - Constant [ public integer TAG_Hit ] { 64 } - Constant [ public integer TAG_HitPass ] { 65 } - Constant [ public integer TAG_ExpBan ] { 66 } - Constant [ public integer TAG_ExpKill ] { 67 } - Constant [ public integer TAG_WorkThread ] { 68 } - Constant [ public integer TAG_ESI_xmlerror ] { 69 } - Constant [ public integer TAG_Hash ] { 70 } - Constant [ public integer TAG_Backend_health ] { 71 } - Constant [ public integer TAG_VCL_Log ] { 72 } - Constant [ public integer TAG_VCL_Error ] { 73 } - Constant [ public integer TAG_Gzip ] { 74 } - Constant [ public integer TAG_Link ] { 75 } - Constant [ public integer TAG_Begin ] { 76 } - Constant [ public integer TAG_End ] { 77 } - Constant [ public integer TAG_VSL ] { 78 } - Constant [ public integer TAG_Storage ] { 79 } - Constant [ public integer TAG_Timestamp ] { 80 } - Constant [ public integer TAG_ReqAcct ] { 81 } - Constant [ public integer TAG_PipeAcct ] { 82 } - Constant [ public integer TAG_BereqAcct ] { 83 } - Constant [ public integer TAG_VfpAcct ] { 84 } - Constant [ public integer TAG_Witness ] { 85 } - Constant [ public integer TAG_BackendStart ] { 86 } - Constant [ public integer TAG_H2RxHdr ] { 87 } - Constant [ public integer TAG_H2RxBody ] { 88 } - Constant [ public integer TAG_H2TxHdr ] { 89 } - Constant [ public integer TAG_H2TxBody ] { 90 } - Constant [ public integer TAG_HitMiss ] { 91 } + - Constants [95] { + Constant [ public int TAG_Debug ] { 1 } + Constant [ public int TAG_Error ] { 2 } + Constant [ public int TAG_CLI ] { 3 } + Constant [ public int TAG_SessOpen ] { 4 } + Constant [ public int TAG_SessClose ] { 5 } + Constant [ public int TAG_BackendOpen ] { 6 } + Constant [ public int TAG_BackendReuse ] { 7 } + Constant [ public int TAG_BackendClose ] { 8 } + Constant [ public int TAG_HttpGarbage ] { 9 } + Constant [ public int TAG_Proxy ] { 10 } + Constant [ public int TAG_ProxyGarbage ] { 11 } + Constant [ public int TAG_Backend ] { 12 } + Constant [ public int TAG_Length ] { 13 } + Constant [ public int TAG_FetchError ] { 14 } + Constant [ public int TAG_ReqMethod ] { 15 } + Constant [ public int TAG_ReqURL ] { 16 } + Constant [ public int TAG_ReqProtocol ] { 17 } + Constant [ public int TAG_ReqStatus ] { 18 } + Constant [ public int TAG_ReqReason ] { 19 } + Constant [ public int TAG_ReqHeader ] { 20 } + Constant [ public int TAG_ReqUnset ] { 21 } + Constant [ public int TAG_ReqLost ] { 22 } + Constant [ public int TAG_RespMethod ] { 23 } + Constant [ public int TAG_RespURL ] { 24 } + Constant [ public int TAG_RespProtocol ] { 25 } + Constant [ public int TAG_RespStatus ] { 26 } + Constant [ public int TAG_RespReason ] { 27 } + Constant [ public int TAG_RespHeader ] { 28 } + Constant [ public int TAG_RespUnset ] { 29 } + Constant [ public int TAG_RespLost ] { 30 } + Constant [ public int TAG_BereqMethod ] { 31 } + Constant [ public int TAG_BereqURL ] { 32 } + Constant [ public int TAG_BereqProtocol ] { 33 } + Constant [ public int TAG_BereqStatus ] { 34 } + Constant [ public int TAG_BereqReason ] { 35 } + Constant [ public int TAG_BereqHeader ] { 36 } + Constant [ public int TAG_BereqUnset ] { 37 } + Constant [ public int TAG_BereqLost ] { 38 } + Constant [ public int TAG_BerespMethod ] { 39 } + Constant [ public int TAG_BerespURL ] { 40 } + Constant [ public int TAG_BerespProtocol ] { 41 } + Constant [ public int TAG_BerespStatus ] { 42 } + Constant [ public int TAG_BerespReason ] { 43 } + Constant [ public int TAG_BerespHeader ] { 44 } + Constant [ public int TAG_BerespUnset ] { 45 } + Constant [ public int TAG_BerespLost ] { 46 } + Constant [ public int TAG_ObjMethod ] { 47 } + Constant [ public int TAG_ObjURL ] { 48 } + Constant [ public int TAG_ObjProtocol ] { 49 } + Constant [ public int TAG_ObjStatus ] { 50 } + Constant [ public int TAG_ObjReason ] { 51 } + Constant [ public int TAG_ObjHeader ] { 52 } + Constant [ public int TAG_ObjUnset ] { 53 } + Constant [ public int TAG_ObjLost ] { 54 } + Constant [ public int TAG_BogoHeader ] { 55 } + Constant [ public int TAG_LostHeader ] { 56 } + Constant [ public int TAG_TTL ] { 57 } + Constant [ public int TAG_Fetch_Body ] { 58 } + Constant [ public int TAG_VCL_acl ] { 59 } + Constant [ public int TAG_VCL_call ] { 60 } + Constant [ public int TAG_VCL_trace ] { 61 } + Constant [ public int TAG_VCL_return ] { 62 } + Constant [ public int TAG_ReqStart ] { 63 } + Constant [ public int TAG_Hit ] { 64 } + Constant [ public int TAG_HitPass ] { 65 } + Constant [ public int TAG_ExpBan ] { 66 } + Constant [ public int TAG_ExpKill ] { 67 } + Constant [ public int TAG_WorkThread ] { 68 } + Constant [ public int TAG_ESI_xmlerror ] { 69 } + Constant [ public int TAG_Hash ] { 70 } + Constant [ public int TAG_Backend_health ] { 71 } + Constant [ public int TAG_VCL_Log ] { 72 } + Constant [ public int TAG_VCL_Error ] { 73 } + Constant [ public int TAG_Gzip ] { 74 } + Constant [ public int TAG_Link ] { 75 } + Constant [ public int TAG_Begin ] { 76 } + Constant [ public int TAG_End ] { 77 } + Constant [ public int TAG_VSL ] { 78 } + Constant [ public int TAG_Storage ] { 79 } + Constant [ public int TAG_Timestamp ] { 80 } + Constant [ public int TAG_ReqAcct ] { 81 } + Constant [ public int TAG_PipeAcct ] { 82 } + Constant [ public int TAG_BereqAcct ] { 83 } + Constant [ public int TAG_VfpAcct ] { 84 } + Constant [ public int TAG_Witness ] { 85 } + Constant [ public int TAG_BackendStart ] { 86 } + Constant [ public int TAG_H2RxHdr ] { 87 } + Constant [ public int TAG_H2RxBody ] { 88 } + Constant [ public int TAG_H2TxHdr ] { 89 } + Constant [ public int TAG_H2TxBody ] { 90 } + Constant [ public int TAG_HitMiss ] { 91 } + Constant [ public int TAG_Filters ] { 92 } + Constant [ public int TAG_SessError ] { 93 } + Constant [ public int TAG_VCL_use ] { 94 } + Constant [ public int TAG_Notice ] { 95 } } - Static properties [0] { @@ -234,6 +337,10 @@ Extension [ <persistent> extension #162 varnish version 1.2.4 ] { - Methods [1] { Method [ <internal:varnish, ctor> public method __construct ] { + + - Parameters [1] { + Parameter #0 [ <optional> array $opt ] + } } } } diff --git a/php-pecl-varnish.spec b/php-pecl-varnish.spec index 9bfc197..b74f88f 100644 --- a/php-pecl-varnish.spec +++ b/php-pecl-varnish.spec @@ -1,17 +1,15 @@ # remirepo spec file for php-pecl-varnish # -# Copyright (c) 2013-2018 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build +%bcond_with tests %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-pecl-varnish %else %global _root_sbindir %{_sbindir} @@ -19,28 +17,32 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name varnish -%global with_tests %{?_with_tests:1}%{!?_with_tests:0} %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini %else %global ini_name 40-%{pecl_name}.ini %endif +%global sources %{pecl_name}-%{version} +%global _configure ../%{sources}/configure Summary: Varnish Cache bindings -Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.2.4 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: BSD -URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Name: %{?scl_prefix}php-pecl-%{pecl_name} +Version: 1.2.6 +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +License: BSD-2-Clause +URL: https://pecl.php.net/package/%{pecl_name} +Source0: https://pecl.php.net/get/%{sources}.tgz + +Patch0: %{pecl_name}-up.patch BuildRequires: %{?dtsprefix}gcc +BuildRequires: make BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-hash BuildRequires: varnish-libs-devel > 3 # For tests -%if %{with_tests} +%if %{with tests} BuildRequires: varnish %endif @@ -52,40 +54,6 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%endif -%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} -%endif -%if "%{php_version}" > "7.3" -Obsoletes: php73u-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif %description @@ -99,14 +67,15 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -mv %{pecl_name}-%{version} NTS # Don't install/register tests sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml -cd NTS +cd %{sources} +%patch -P0 -p3 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_VARNISH_VERSION/{s/.* "//;s/".*$//;p}' php_varnish.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -115,9 +84,9 @@ if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then fi cd .. +mkdir NTS %if %{with_zts} -# Duplicate source tree for NTS / ZTS build -cp -pr NTS ZTS +mkdir ZTS %endif # Create configuration file @@ -130,19 +99,20 @@ EOF %build %{?dtsenable} -cd NTS -%{_bindir}/phpize +cd %{sources} +%{__phpize} + +cd ../NTS %configure \ --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/php-config + --with-php-config=%{__phpconfig} make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{_bindir}/zts-phpize %configure \ --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/zts-php-config + --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} %endif @@ -165,7 +135,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -204,8 +174,8 @@ ret=0 --modules | grep %{pecl_name} %endif -%if %{with_tests} -cd NTS +%if %{with tests} +cd %{sources} : Run a varnish server for test suite sed -n '/secret/{s/.* "//;s/".*$//;p}' \ @@ -239,25 +209,16 @@ sed -e 's:/var/lib/varnish/silent:/tmp/vtest:' \ tests/config.php-dist | tee tests/config.php TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ +TEST_PHP_ARGS="-n -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff || ret=1 +%{__php} -n run-tests.php -q --show-diff || ret=1 %if %{with_zts} -cd ../ZTS - : Upstream test suite for ZTS extension -sed -e 's:/var/lib/varnish/silent:/tmp/vtest:' \ - -e "s/6081/$PORTUSR/" \ - -e "s/6082/$PORTADM/" \ - tests/config.php-dist | tee tests/config.php - TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ +TEST_PHP_ARGS="-n -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff || ret=1 +%{__ztsphp} -n run-tests.php -q --show-diff || ret=1 %endif : Stop the test server @@ -272,7 +233,7 @@ exit $ret %files %doc %{pecl_docdir}/%{pecl_name} -%{?_licensedir:%license NTS/LICENSE} +%{?_licensedir:%license %{sources}/LICENSE} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -285,6 +246,19 @@ exit $ret %changelog +* Mon Sep 4 2023 Remi Collet <remi@remirepo.net> - 1.2.6-2 +- build out of sources tree + +* Mon Jan 18 2021 Remi Collet <remi@remirepo.net> - 1.2.6-1 +- update to 1.2.6 +- drop patch merged upstream + +* Mon Aug 24 2020 Remi Collet <remi@remirepo.net> - 1.2.4-5 +- add upstream patch for PHP 8 + +* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.2.4-4 +- rebuild for 7.4.0RC1 + * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 1.2.4-3 - rebuild for 7.3.0beta2 new ABI diff --git a/varnish-up.patch b/varnish-up.patch new file mode 100644 index 0000000..a7429c6 --- /dev/null +++ b/varnish-up.patch @@ -0,0 +1,11 @@ +--- pecl/varnish/trunk/varnish.c 2021/01/18 07:21:40 352310 ++++ pecl/varnish/trunk/varnish.c 2021/01/18 08:00:09 352311 +@@ -47,7 +47,7 @@ + + #ifndef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX + #define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \ +- ZEND_BEGIN_ARG_INFO_EX(name, _unused, return_reference, required_num_args) ++ ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args) + #endif + + #ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE diff --git a/varnish-upstream.patch b/varnish-upstream.patch deleted file mode 100644 index a1fd02a..0000000 --- a/varnish-upstream.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- pecl/varnish/trunk/exception.c 2018/06/27 11:47:15 345221 -+++ pecl/varnish/trunk/exception.c 2018/06/27 13:34:24 345222 -@@ -86,6 +86,7 @@ - zend_throw_exception_ex( - VarnishException_ce, - PHP_VARNISH_UNIMPL_EXCEPTION TSRMLS_CC, -+ "%s", - (NULL != msg) ? msg : "The functionality you're trying to use is not available on windows" - ); - } ---- pecl/varnish/trunk/varnish_lib.c 2018/06/27 11:47:15 345221 -+++ pecl/varnish/trunk/varnish_lib.c 2018/06/27 13:34:24 345222 -@@ -373,6 +373,7 @@ - zend_throw_exception_ex( - VarnishException_ce, - PHP_VARNISH_SHM_EXCEPTION TSRMLS_CC, -+ "%s", - #if HAVE_VARNISHAPILIB >= 40 - VSM_Error(vsd) - #else -@@ -394,6 +395,7 @@ - zend_throw_exception_ex( - VarnishException_ce, - PHP_VARNISH_SHM_EXCEPTION TSRMLS_CC, -+ "%s", - #if HAVE_VARNISHAPILIB >= 40 - VSM_Error(vsd) - #else |