diff options
| -rw-r--r-- | php-pecl-varnish.spec | 39 | ||||
| -rw-r--r-- | varnish-pr3.patch | 23 |
2 files changed, 36 insertions, 26 deletions
diff --git a/php-pecl-varnish.spec b/php-pecl-varnish.spec index b74f88f..4bba22f 100644 --- a/php-pecl-varnish.spec +++ b/php-pecl-varnish.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-varnish # -# Copyright (c) 2013-2023 Remi Collet -# License: CC-BY-SA-4.0 -# 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 # @@ -28,12 +28,13 @@ Summary: Varnish Cache bindings 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;')}} +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/%{sources}.tgz Patch0: %{pecl_name}-up.patch +Patch1: %{pecl_name}-pr3.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: make @@ -70,11 +71,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO # 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 %{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) @@ -139,26 +141,6 @@ 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 @@ -233,7 +215,7 @@ exit $ret %files %doc %{pecl_docdir}/%{pecl_name} -%{?_licensedir:%license %{sources}/LICENSE} +%license %{sources}/LICENSE %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -246,6 +228,11 @@ 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 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 |