diff options
| author | Remi Collet <remi@remirepo.net> | 2025-12-16 08:07:10 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-12-16 08:07:10 +0100 |
| commit | 7b49c9947a7ac8f795666bcef8d601590f5d2de1 (patch) | |
| tree | 6d137aafcab3c6b0ec47f4131b989090a2c5ba79 | |
| parent | ec5681a55e2fdfdd332a88d582ea323b268cac6b (diff) | |
drop patch merged upstream
| -rw-r--r-- | 0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch | 26 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-luasandbox.spec | 12 |
3 files changed, 7 insertions, 33 deletions
diff --git a/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch b/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch deleted file mode 100644 index dcbe573..0000000 --- a/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5e800d53c8430aff7bc0e0422e7c86eea370570f Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 17 Jul 2025 15:07:36 +0200 -Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default() - for 8.5 - ---- - luasandbox.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/luasandbox.c b/luasandbox.c -index d4f71e7..4d65a26 100644 ---- a/luasandbox.c -+++ b/luasandbox.c -@@ -247,7 +247,7 @@ PHP_MINIT_FUNCTION(luasandbox) - "PERCENT", sizeof("PERCENT")-1, LUASANDBOX_PERCENT); - - INIT_CLASS_ENTRY(ce, "LuaSandboxError", luasandbox_empty_methods); -- luasandboxerror_ce = compat_zend_register_internal_class_ex(&ce, zend_exception_get_default()); -+ luasandboxerror_ce = compat_zend_register_internal_class_ex(&ce, zend_ce_exception); - zend_declare_class_constant_long(luasandboxerror_ce, - "RUN", sizeof("RUN")-1, LUA_ERRRUN); - zend_declare_class_constant_long(luasandboxerror_ce, --- -2.50.1 - @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #77 luasandbox version 4.1.2 ] { +Extension [ <persistent> extension #147 luasandbox version 4.1.3 ] { - Classes [10] { Class [ <internal:luasandbox> class LuaSandbox ] { diff --git a/php-pecl-luasandbox.spec b/php-pecl-luasandbox.spec index 13b096b..78563f0 100644 --- a/php-pecl-luasandbox.spec +++ b/php-pecl-luasandbox.spec @@ -20,14 +20,12 @@ Summary: Lua interpreter with limits and safe environment Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 4.1.2 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 4.1.3 +Release: 1%{?dist} License: MIT URL: https://pecl.php.net/package/%{proj_name} Source0: https://pecl.php.net/get/%{sources}.tgz -Patch0: 0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.2 @@ -62,8 +60,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p1 - : Sanity check, really often broken extver=$(sed -n '/#define LUASANDBOX_VERSION /{s/.* "//;s/".*$//;p}' luasandbox_version.h) if test "x${extver}" != "x%{version}"; then @@ -182,6 +178,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Dec 16 2025 Remi Collet <remi@remirepo.net> - 4.1.3-1 +- update to 4.1.3 +- drop patch merged upstream + * Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 4.1.2-2 - add fix for PHP 8.5.0alpha2, patch sent to author - re-license spec file to CECILL-2.1 |