diff options
| -rw-r--r-- | fedora/php-pecl-uopz.spec | 249 | ||||
| -rw-r--r-- | fedora/uopz-upstream.patch | 226 | ||||
| -rw-r--r-- | php-pecl-uopz-php7.spec | 16 | ||||
| -rw-r--r-- | php-pecl-uopz.spec | 2 |
4 files changed, 480 insertions, 13 deletions
diff --git a/fedora/php-pecl-uopz.spec b/fedora/php-pecl-uopz.spec new file mode 100644 index 0000000..cc19ac3 --- /dev/null +++ b/fedora/php-pecl-uopz.spec @@ -0,0 +1,249 @@ +# Fedora spec file for php-pecl-uopz +# Without SCL compatibility stuff, from: +# +# remirepo spec file for php-pecl-uopz +# +# Copyright (c) 2014-2016 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ +# +# Please, preserve the changelog entries +# +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name uopz +%global ini_name 05-%{pecl_name}.ini + +Summary: User Operations for Zend +Name: php-pecl-%{pecl_name} +Version: 5.0.1 +Release: 1%{?dist} +License: PHP +Group: Development/Languages +URL: http://pecl.php.net/package/%{pecl_name} +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz + +# Upstream patch for PHP 7.1 +Patch0: %{pecl_name}-upstream.patch + +BuildRequires: php-devel > 7 +BuildRequires: php-pear + +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} + +Provides: php-%{pecl_name} = %{version} +Provides: php-%{pecl_name}%{?_isa} = %{version} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} + + +%description +User Operations for Zend: doing things you probably shouldn't since 2014. + +The uopz extension exposes Zend engine functionality normally used at +compilation and execution time in order to allow modification of the +internal structures that represent PHP code. + +It supports the following activities: +- Overloading some Zend opcodes including exit/new and composure opcodes +- Renaming functions and methods +- Aliasing functions and methods +- Deletion of functions and methods +- Redefinition of constants +- Deletion of constants +- Runtime composition and modification of classes + +Documentation: http://php.net/uopz + + +%prep +%setup -q -c +mv %{pecl_name}-%{version} NTS + +# Don't install/register tests +sed -e 's/role="test"/role="src"/' \ + -e '/LICENSE/s/role="doc"/role="src"/' \ + -i package.xml + +cd NTS +%patch0 -p1 -b .upstream + +# Sanity check, really often broken +extver=$(sed -n '/#define PHP_UOPZ_VERSION/{s/.* "//;s/".*$//;p}' uopz.h) +if test "x${extver}" != "x%{version}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}. + exit 1 +fi +cd .. + +# Create configuration files +cat << EOF | tee %{ini_name} +; Enable '%{summary}' extension module +extension=%{pecl_name}.so +EOF + +%if %{with_zts} +# Duplicate source tree for NTS / ZTS build +cp -pr NTS ZTS +%endif + + +%build +cd NTS +%{_bindir}/phpize +%configure \ + --with-php-config=%{_bindir}/php-config +make %{?_smp_mflags} + +%if %{with_zts} +cd ../ZTS +%{_bindir}/zts-phpize +%configure \ + --with-php-config=%{_bindir}/zts-php-config +make %{?_smp_mflags} +%endif + + +%install +make -C NTS install INSTALL_ROOT=%{buildroot} + +# install config file +install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} + +# Install XML package description +install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml + +%if %{with_zts} +make -C ZTS install INSTALL_ROOT=%{buildroot} +install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} +%endif + +# 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 +done + + +%check +cd NTS +: Minimal load test for NTS extension +%{__php} --no-php-ini \ + --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ + --modules | grep %{pecl_name} + +: Upstream test suite for NTS extension +TEST_PHP_EXECUTABLE=%{__php} \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ +NO_INTERACTION=1 \ +REPORT_EXIT_STATUS=1 \ +%{__php} -n run-tests.php + +%if %{with_zts} +cd ../ZTS +: Minimal load test for ZTS extension +%{__ztsphp} --no-php-ini \ + --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ + --modules | grep %{pecl_name} + +: Upstream test suite for ZTS extension +TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ +NO_INTERACTION=1 \ +REPORT_EXIT_STATUS=1 \ +%{_bindir}/zts-php -n run-tests.php +%endif + + +%files +%license NTS/LICENSE +%doc %{pecl_docdir}/%{pecl_name} +%{pecl_xmldir}/%{name}.xml + +%config(noreplace) %{php_inidir}/%{ini_name} +%{php_extdir}/%{pecl_name}.so + +%if %{with_zts} +%config(noreplace) %{php_ztsinidir}/%{ini_name} +%{php_ztsextdir}/%{pecl_name}.so +%endif + + +%changelog +* Thu Oct 13 2016 Remi Collet <remi@fedoraproject.org> - 5.0.1-1 +- cleanup for Fedora review + +* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 5.0.1-3 +- rebuild for PHP 7.1 new API version + +* Thu Jun 9 2016 Remi Collet <remi@fedoraproject.org> - 5.0.1-2 +- add upstream patch for PHP 7.1 + +* Wed Apr 13 2016 Remi Collet <remi@fedoraproject.org> - 5.0.1-1 +- update to 5.0.1 + +* Wed Apr 13 2016 Remi Collet <remi@fedoraproject.org> - 5.0.0-1 +- update to 5.0.0 for PHP 7 +- sources from github (not yet released on pecl) + +* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 2.0.7-2 +- adapt for F24 + +* Wed Mar 04 2015 Remi Collet <remi@fedoraproject.org> - 2.0.7-1 +- Update to 2.0.7 +- drop runtime dependency on pear, new scriptlets + +* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 2.0.6-1.1 +- Fedora 21 SCL mass rebuild + +* Wed Oct 15 2014 Remi Collet <remi@fedoraproject.org> - 2.0.6-1 +- Update to 2.0.6 +- don't provide test suite + +* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 2.0.5-2 +- improve SCL build + +* Thu Jun 05 2014 Remi Collet <remi@fedoraproject.org> - 2.0.5-1 +- Update to 2.0.5 (stable) + +* Tue Apr 8 2014 Remi Collet <remi@fedoraproject.org> - 2.0.4-2 +- add numerical prefix to extension configuration files + +* Fri Apr 04 2014 Remi Collet <remi@fedoraproject.org> - 2.0.4-1 +- Update to 2.0.4 (stable) +- improve uopz.ini (comments) + +* Thu Apr 03 2014 Remi Collet <remi@fedoraproject.org> - 2.0.3-1 +- Update to 2.0.3 (stable) + +* Wed Apr 02 2014 Remi Collet <remi@fedoraproject.org> - 2.0.2-1 +- Update to 2.0.2 (stable) + +* Tue Apr 01 2014 Remi Collet <remi@fedoraproject.org> - 2.0.1-1 +- Update to 2.0.1 (stable) + +* Mon Mar 31 2014 Remi Collet <remi@fedoraproject.org> - 2.0.0-1 +- Update to 2.0.0 (2014-03-31 06:00:49, stable) + +* Sun Mar 30 2014 Remi Collet <remi@fedoraproject.org> - 1.0.11-1 +- Update to 1.0.11 (2014-03-30 14:05:44, beta) + +* Fri Mar 28 2014 Remi Collet <remi@fedoraproject.org> - 1.0.5-1 +- Update to 1.0.5 (2014-03-28 00:48:31, beta) + +* Thu Mar 27 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-1 +- Update to 1.0.4 (2014-03-27 18:34:03, beta) + +* Thu Mar 27 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-0 +- pre-release test build + +* Tue Mar 25 2014 Remi Collet <remi@fedoraproject.org> - 1.0.3-1 +- Update to 1.0.3 (2014-03-24 19:37:04, beta) + +* Mon Mar 24 2014 Remi Collet <remi@fedoraproject.org> - 1.0.2-1 +- Update to 1.0.2 (2014-03-24 10:34:02, beta) + +* Mon Mar 24 2014 Remi Collet <remi@fedoraproject.org> - 1.0.1-1 +- Update to 1.0.1 (2014-03-23 19:03:27, beta) + +* Sun Mar 23 2014 Remi Collet <remi@fedoraproject.org> - 1.0.0-1 +- initial package, version 1.0.0 (12:55, beta) diff --git a/fedora/uopz-upstream.patch b/fedora/uopz-upstream.patch new file mode 100644 index 0000000..35a29a7 --- /dev/null +++ b/fedora/uopz-upstream.patch @@ -0,0 +1,226 @@ +From b15f4d83a760013142c5275a2b29244a5ef62d90 Mon Sep 17 00:00:00 2001 +From: Joe Watkins <krakjoe@php.net> +Date: Thu, 26 May 2016 12:10:15 +0100 +Subject: [PATCH] fixes for 7.1, add leave helper function + +--- + src/class.c | 55 +++++++++++++++++++++++++++++++++---------------------- + src/handlers.c | 33 +++++++++++++++++++++++---------- + uopz.h | 2 +- + 3 files changed, 57 insertions(+), 33 deletions(-) + +diff --git a/src/class.c b/src/class.c +index 15100d9..db9fe6c 100644 +--- a/src/class.c ++++ b/src/class.c +@@ -27,6 +27,14 @@ + + ZEND_EXTERN_MODULE_GLOBALS(uopz); + ++#if PHP_VERSION_ID >= 70100 ++# define uopz_get_scope(e) ((e) ? zend_get_executed_scope() : EG(fake_scope)) ++# define uopz_set_scope(s) EG(fake_scope) = (s) ++#else ++# define uopz_get_scope(e) EG(scope) ++# define uopz_set_scope(s) EG(scope) = (s) ++#endif ++ + void uopz_set_mock(zend_string *clazz, zval *mock) { /* {{{ */ + zend_string *key = zend_string_tolower(clazz); + +@@ -131,12 +139,12 @@ zend_bool uopz_implement(zend_class_entry *clazz, zend_class_entry *interface) { + } /* }}} */ + + void uopz_set_property(zval *object, zval *member, zval *value) { /* {{{ */ +- zend_class_entry *scope = EG(scope); ++ zend_class_entry *scope = uopz_get_scope(1); + zend_class_entry *ce = Z_OBJCE_P(object); + zend_property_info *info; + + do { +- EG(scope) = ce; ++ uopz_set_scope(ce); + + info = zend_get_property_info(ce, Z_STR_P(member), 1); + +@@ -148,25 +156,25 @@ void uopz_set_property(zval *object, zval *member, zval *value) { /* {{{ */ + } while (ce); + + if (info && info != ZEND_WRONG_PROPERTY_INFO) { +- EG(scope) = info->ce; ++ uopz_set_scope(info->ce); + } else { +- EG(scope) = Z_OBJCE_P(object); ++ uopz_set_scope(Z_OBJCE_P(object)); + } + + Z_OBJ_HT_P(object) + ->write_property(object, member, value, NULL); + +- EG(scope) = scope; ++ uopz_set_scope(scope); + } /* }}} */ + + void uopz_get_property(zval *object, zval *member, zval *value) { /* {{{ */ +- zend_class_entry *scope = EG(scope); ++ zend_class_entry *scope = uopz_get_scope(1); + zend_class_entry *ce = Z_OBJCE_P(object); + zend_property_info *info; + zval *prop, rv; + + do { +- EG(scope) = ce; ++ uopz_set_scope(ce); + + info = zend_get_property_info(ce, Z_STR_P(member), 1); + +@@ -178,14 +186,15 @@ void uopz_get_property(zval *object, zval *member, zval *value) { /* {{{ */ + } while (ce); + + if (info && info != ZEND_WRONG_PROPERTY_INFO) { +- EG(scope) = info->ce; ++ uopz_set_scope(info->ce); + } else { +- EG(scope) = Z_OBJCE_P(object); ++ uopz_set_scope(Z_OBJCE_P(object)); + } + + prop = Z_OBJ_HT_P(object) + ->read_property(object, member, BP_VAR_R, NULL, &rv); +- EG(scope) = scope; ++ ++ uopz_set_scope(scope); + + if (!prop) { + return; +@@ -195,13 +204,13 @@ void uopz_get_property(zval *object, zval *member, zval *value) { /* {{{ */ + } /* }}} */ + + void uopz_set_static_property(zend_class_entry *ce, zend_string *property, zval *value) { /* {{{ */ +- zend_class_entry *scope = EG(scope); ++ zend_class_entry *scope = uopz_get_scope(1); + zend_class_entry *seek = ce; + zend_property_info *info; + zval *prop; + + do { +- EG(scope) = seek; ++ uopz_set_scope(seek); + + info = zend_get_property_info(seek, property, 1); + +@@ -213,13 +222,14 @@ void uopz_set_static_property(zend_class_entry *ce, zend_string *property, zval + } while (seek); + + if (info && info != ZEND_WRONG_PROPERTY_INFO) { +- EG(scope) = info->ce; ++ uopz_set_scope(info->ce); + } else { +- EG(scope) = ce; ++ uopz_set_scope(ce); + } + +- prop = zend_std_get_static_property(EG(scope), property, 1); +- EG(scope) = scope; ++ prop = zend_std_get_static_property(uopz_get_scope(0), property, 1); ++ ++ uopz_set_scope(scope); + + if (!prop) { + return; +@@ -230,13 +240,13 @@ void uopz_set_static_property(zend_class_entry *ce, zend_string *property, zval + } /* }}} */ + + void uopz_get_static_property(zend_class_entry *ce, zend_string *property, zval *value) { /* {{{ */ +- zend_class_entry *scope = EG(scope); ++ zend_class_entry *scope = uopz_get_scope(1); + zend_class_entry *seek = ce; + zend_property_info *info; + zval *prop; + + do { +- EG(scope) = seek; ++ uopz_set_scope(seek); + + info = zend_get_property_info(seek, property, 1); + +@@ -248,13 +258,14 @@ void uopz_get_static_property(zend_class_entry *ce, zend_string *property, zval + } while (seek); + + if (info && info != ZEND_WRONG_PROPERTY_INFO) { +- EG(scope) = info->ce; ++ uopz_set_scope(info->ce); + } else { +- EG(scope) = ce; ++ uopz_set_scope(ce); + } + +- prop = zend_std_get_static_property(EG(scope), property, 1); +- EG(scope) = scope; ++ prop = zend_std_get_static_property(uopz_get_scope(0), property, 1); ++ ++ uopz_set_scope(scope); + + if (!prop) { + return; +diff --git a/src/handlers.c b/src/handlers.c +index 11b7f5f..98e9c37 100644 +--- a/src/handlers.c ++++ b/src/handlers.c +@@ -344,6 +344,27 @@ static inline void uopz_run_hook(zend_function *function, zend_execute_data *exe + } + } /* }}} */ + ++/* {{{ */ ++static inline int php_uopz_leave_helper(zend_execute_data *execute_data) { ++ zend_execute_data *call = EX(call); ++ uint32_t info = ZEND_CALL_INFO(call); ++ ++ if (info & ZEND_CALL_RELEASE_THIS) { ++ OBJ_RELEASE(Z_OBJ(call->This)); ++ } else if (info & ZEND_CALL_CLOSURE) { ++ OBJ_RELEASE((zend_object*)call->func->op_array.prototype); ++ } ++ ++ EX(call) = call->prev_execute_data; ++ ++ zend_vm_stack_free_args(call); ++ zend_vm_stack_free_call_frame(call); ++ ++ EX(opline) = EX(opline) + 1; ++ ++ return ZEND_USER_OPCODE_LEAVE; ++} /* }}} */ ++ + int uopz_return_handler(UOPZ_OPCODE_HANDLER_ARGS) { /* {{{ */ + zend_execute_data *call = EX(call); + +@@ -366,26 +387,18 @@ int uopz_return_handler(UOPZ_OPCODE_HANDLER_ARGS) { /* {{{ */ + + uopz_execute_return(ureturn, call, return_value); + +- EX(call) = call->prev_execute_data; +- zend_vm_stack_free_call_frame(call); +- EX(opline) = opline + 1; +- + if (!RETURN_VALUE_USED(opline)) { + zval_ptr_dtor(&rv); + } + +- return ZEND_USER_OPCODE_CONTINUE; ++ return php_uopz_leave_helper(UOPZ_OPCODE_HANDLER_ARGS_PASSTHRU); + } + + if (RETURN_VALUE_USED(opline)) { + ZVAL_COPY(return_value, &ureturn->value); + } + +- EX(call) = call->prev_execute_data; +- zend_vm_stack_free_call_frame(call); +- EX(opline) = opline + 1; +- +- return ZEND_USER_OPCODE_CONTINUE; ++ return php_uopz_leave_helper(UOPZ_OPCODE_HANDLER_ARGS_PASSTHRU); + } + } + diff --git a/php-pecl-uopz-php7.spec b/php-pecl-uopz-php7.spec index e696a60..b6f9d35 100644 --- a/php-pecl-uopz-php7.spec +++ b/php-pecl-uopz-php7.spec @@ -1,4 +1,4 @@ -# spec file for php-pecl-uopz +# remirepo spec file for php-pecl-uopz # # Copyright (c) 2014-2016 Remi Collet # License: CC-BY-SA @@ -36,8 +36,7 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: %{pecl_name}-upstream.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-devel > 5.4 +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -162,8 +161,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -212,7 +209,7 @@ cd NTS : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{__php} -n run-tests.php @@ -226,19 +223,14 @@ cd ../ZTS : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ -TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{_bindir}/zts-php -n run-tests.php %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml diff --git a/php-pecl-uopz.spec b/php-pecl-uopz.spec index 50732b9..cb341af 100644 --- a/php-pecl-uopz.spec +++ b/php-pecl-uopz.spec @@ -1,4 +1,4 @@ -# spec file for php-pecl-uopz +# remirepo spec file for php-pecl-uopz # # Copyright (c) 2014-2016 Remi Collet # License: CC-BY-SA |