summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-08-29 09:31:30 +0200
committerRemi Collet <remi@php.net>2022-08-29 09:31:30 +0200
commitc21956cb4d9f62b86eff23ad348773148daf8842 (patch)
tree37b2746c946f037ed348c30dd033002f66cf8789
parentbe6a39d4d51c049d15bbdab04071e121c9503b1e (diff)
update to 0.8.3
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--php-snuffleupagus.spec18
3 files changed, 15 insertions, 7 deletions
diff --git a/PHPINFO b/PHPINFO
index 8d64240..cc1f52a 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
snuffleupagus
snuffleupagus support => enabled
-Version => 0.8.2-sng (with Suhosin-NG patches)
+Version => 0.8.3-sng (with Suhosin-NG patches)
Valid config => yes
Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index 8130289..eeaf1d4 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #120 snuffleupagus version 0.8.2 ] {
+Extension [ <persistent> extension #119 snuffleupagus version 0.8.3 ] {
- INI {
Entry [ sp.configuration_file <SYSTEM> ]
diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec
index f0fade8..ae66391 100644
--- a/php-snuffleupagus.spec
+++ b/php-snuffleupagus.spec
@@ -11,14 +11,15 @@
%undefine _strict_symbol_defs_build
%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
%scl_package php-snuffleupagus
%else
%global _root_bindir %{_bindir}
%global pkg_name %{name}
%endif
-%global gh_commit a1a7d2030f40ce1f880e9944417c6ccbb48a3c13
+%bcond_without tests
+
+%global gh_commit e9cb71769ae7a4c189fb2ecadc52b20bb8980166
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner jvoisin
%global gh_project snuffleupagus
@@ -30,8 +31,8 @@
%global ini_name 40-%{pecl_name}.ini
Summary: Security module for PHP
-Name: %{?sub_prefix}php-snuffleupagus
-Version: 0.8.2
+Name: %{?scl_prefix}php-snuffleupagus
+Version: 0.8.3
%if 0%{?gh_date}
Release: 1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%else
@@ -190,12 +191,14 @@ cd src
--define sp.allow_broken_configuration=1 \
--modules | grep %{pecl_name}
+%if %{with tests}
: Upstream test suite for NTS extension
TEST_PHP_EXECUTABLE=%{__php} \
TEST_PHP_ARGS="-n $TEST_DEPS -d extension=$PWD/modules/%{pecl_name}.so" \
NO_INTERACTION=1 \
REPORT_EXIT_STATUS=1 \
%{__php} -n run-tests.php --show-diff
+%endif
%if %{with_zts}
cd ../ZTS
@@ -205,6 +208,7 @@ cd ../ZTS
--define sp.allow_broken_configuration=1 \
--modules | grep %{pecl_name}
+%if %{with tests}
: Upstream test suite for ZTS extension
TEST_PHP_EXECUTABLE=%{__ztsphp} \
TEST_PHP_ARGS="-n $TEST_DEPS -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
@@ -212,6 +216,7 @@ NO_INTERACTION=1 \
REPORT_EXIT_STATUS=1 \
%{__ztsphp} -n run-tests.php --show-diff
%endif
+%endif
%files
@@ -230,8 +235,11 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Mon Aug 29 2022 Remi Collet <remi@remirepo.net> - 0.8.3-1
+- update to 0.8.3
+
* Mon May 23 2022 Remi Collet <remi@remirepo.net> - 0.8.2-1
-- update to 0.8.1
+- update to 0.8.2
- drop patches merged upstream
* Wed May 18 2022 Remi Collet <remi@remirepo.net> - 0.8.0-2