summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-10 08:25:57 +0100
committerRemi Collet <remi@remirepo.net>2021-03-10 08:25:57 +0100
commit01081af1f534e6885bb9a6f31bb0c2cda32d5b33 (patch)
tree8b483e858b7e3ab866342458d07920e051bd7c81
parent246962dd19101a022ef89836a08242b268c3d1ac (diff)
update to 4.0.1 (no change)
-rw-r--r--.gitignore2
-rw-r--r--REFLECTION2
-rw-r--r--luasandbox_compat.h36
-rw-r--r--php-pecl-luasandbox.spec8
4 files changed, 7 insertions, 41 deletions
diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
package-*.xml
*.tgz
+*.tar.bz2
*.tar.gz
*.tar.xz
*.tar.xz.asc
diff --git a/REFLECTION b/REFLECTION
index 28fc5f7..6d31325 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #80 luasandbox version 4.0.0 ] {
+Extension [ <persistent> extension #80 luasandbox version 4.0.1 ] {
- Classes [10] {
Class [ <internal:luasandbox> class LuaSandbox ] {
diff --git a/luasandbox_compat.h b/luasandbox_compat.h
deleted file mode 100644
index b0a13c2..0000000
--- a/luasandbox_compat.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Macros to hide the differences between PHP versions
-// Implementation details, include only from .c files
-#ifndef LUASANDBOX_COMPAT_H
-#define LUASANDBOX_COMPAT_H
-
-#if PHP_VERSION_ID < 80000
-
- #define luasandbox_update_property(scope, object, name, name_length, value) \
- zend_update_property(scope, object, name, name_length, value)
-
- #define luasandbox_update_property_string(scope, object, name, name_length, value) \
- zend_update_property_string(scope, object, name, name_length, value)
-
- #define luasandbox_update_property_long(scope, object, name, name_length, value) \
- zend_update_property_long(scope, object, name, name_length, value)
-
- #define luasandbox_read_property(scope, object, name, name_length, silent, rv) \
- zend_read_property(scope, object, name, name_length, silent, rv)
-
-#else
-
- #define luasandbox_update_property(scope, object, name, name_length, value) \
- zend_update_property(scope, Z_OBJ_P(object), name, name_length, value)
-
- #define luasandbox_update_property_string(scope, object, name, name_length, value) \
- zend_update_property_string(scope, Z_OBJ_P(object), name, name_length, value)
-
- #define luasandbox_update_property_long(scope, object, name, name_length, value) \
- zend_update_property_long(scope, Z_OBJ_P(object), name, name_length, value)
-
- #define luasandbox_read_property(scope, object, name, name_length, silent, rv) \
- zend_read_property(scope, Z_OBJ_P(object), name, name_length, silent, rv)
-
-#endif
-
-#endif // LUASANDBOX_COMPAT_H
diff --git a/php-pecl-luasandbox.spec b/php-pecl-luasandbox.spec
index af8e1c9..5687404 100644
--- a/php-pecl-luasandbox.spec
+++ b/php-pecl-luasandbox.spec
@@ -25,12 +25,11 @@
Summary: Lua interpreter with limits and safe environment
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 4.0.0
+Version: 4.0.1
Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: MIT
URL: https://pecl.php.net/package/%{proj_name}
Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz
-Source1: https://phab.wmfusercontent.org/file/download/jkix723fmmopugebtkh2/PHID-FILE-6sdx6iccvk4muq2kolg7/luasandbox_compat.h
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -89,8 +88,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-cp %{SOURCE1} .
-
: Sanity check, really often broken
extver=$(sed -n '/#define LUASANDBOX_VERSION /{s/.* "//;s/".*$//;p}' luasandbox_version.h)
if test "x${extver}" != "x%{version}"; then
@@ -222,6 +219,9 @@ fi
%changelog
+* Wed Mar 10 2021 Remi Collet <remi@remirepo.net> - 4.0.1-1
+- update to 4.0.1 (no change)
+
* Thu Mar 4 2021 Remi Collet <remi@remirepo.net> - 4.0.0-1
- update to 4.0.0
- raise dependency on PHP 7.2