diff options
| -rw-r--r-- | php-pecl-varnish.spec | 115 | ||||
| -rw-r--r-- | varnish-pr3.patch | 23 |
2 files changed, 60 insertions, 78 deletions
diff --git a/php-pecl-varnish.spec b/php-pecl-varnish.spec index 5f77a70..4bba22f 100644 --- a/php-pecl-varnish.spec +++ b/php-pecl-varnish.spec @@ -1,19 +1,15 @@ # remirepo spec file for php-pecl-varnish # -# Copyright (c) 2013-2021 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_with tests -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build - %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-pecl-varnish %else %global _root_sbindir %{_sbindir} @@ -26,16 +22,19 @@ %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} +Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.2.6 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: BSD +Release: 3%{?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/%{pecl_name}-%{version}.tgz +Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: %{pecl_name}-up.patch +Patch1: %{pecl_name}-pr3.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: make @@ -56,26 +55,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 "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "8.0" -Obsoletes: php80-pecl-%{pecl_name} <= %{version} -%endif -%endif %description @@ -89,15 +68,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"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml -cd NTS -%patch0 -p3 +cd %{sources} +%patch -P0 -p3 +%patch -P1 -p1 # Sanity check, really often broken extver=$(sed -n '/#define PHP_VARNISH_VERSION/{s/.* "//;s/".*$//;p}' php_varnish.h) @@ -107,9 +86,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 @@ -122,19 +101,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 @@ -157,30 +137,10 @@ 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 -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check ret=0 @@ -197,7 +157,7 @@ ret=0 %endif %if %{with tests} -cd NTS +cd %{sources} : Run a varnish server for test suite sed -n '/secret/{s/.* "//;s/".*$//;p}' \ @@ -231,25 +191,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 @@ -264,7 +215,7 @@ exit $ret %files %doc %{pecl_docdir}/%{pecl_name} -%{?_licensedir:%license NTS/LICENSE} +%license %{sources}/LICENSE %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -277,6 +228,14 @@ exit $ret %changelog +* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 1.2.6-3 +- add fix for PHP 8.5.0alpha2 using patch from + https://github.com/php/pecl-caching-varnish/pull/3 +- re-license spec file to CECILL-2.1 + +* 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 diff --git a/varnish-pr3.patch b/varnish-pr3.patch new file mode 100644 index 0000000..35ed41a --- /dev/null +++ b/varnish-pr3.patch @@ -0,0 +1,23 @@ +From e3382b347be919f9c725a9b7bbf8f990218dc6f7 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 17 Jul 2025 16:03:49 +0200 +Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default() + for 8.5 + +--- + varnish.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/varnish.c b/varnish.c +index d49204b..ee0cfd9 100644 +--- a/varnish.c ++++ b/varnish.c +@@ -247,7 +247,7 @@ zend_declare_class_constant_long(VarnishLog_ce, "TAG_"#foo, strlen("TAG_"#foo), + /* Init exceptions */ + INIT_CLASS_ENTRY(ce, "VarnishException", NULL); + #if PHP_MAJOR_VERSION >= 7 +- VarnishException_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default()); ++ VarnishException_ce = zend_register_internal_class_ex(&ce, zend_ce_exception); + #else + VarnishException_ce = zend_register_internal_class_ex( + &ce, NULL, "exception" TSRMLS_CC |