From 0470e56a3d93d1e92d01d7c4071fb5262e916c2e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Jan 2023 09:29:30 +0100 Subject: update to 0.9.0 open https://github.com/jvoisin/snuffleupagus/issues/444 borked tests with 8.2 --- PHPINFO | 2 +- REFLECTION | 2 +- php-snuffleupagus.spec | 28 ++++++++++++---------------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/PHPINFO b/PHPINFO index cc1f52a..6e442a7 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,7 +2,7 @@ snuffleupagus snuffleupagus support => enabled -Version => 0.8.3-sng (with Suhosin-NG patches) +Version => 0.9.0-sng (with Suhosin-NG patches) Valid config => yes Directive => Local Value => Master Value diff --git a/REFLECTION b/REFLECTION index eeaf1d4..b2fed05 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #119 snuffleupagus version 0.8.3 ] { +Extension [ extension #120 snuffleupagus version 0.9.0 ] { - INI { Entry [ sp.configuration_file ] diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec index ae66391..b0994a0 100644 --- a/php-snuffleupagus.spec +++ b/php-snuffleupagus.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-snuffleupagus # -# Copyright (c) 2018-2022 Remi Collet +# Copyright (c) 2018-2023 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -19,7 +19,7 @@ %bcond_without tests -%global gh_commit e9cb71769ae7a4c189fb2ecadc52b20bb8980166 +%global gh_commit 7d006a4b971aec04c42c06c877c0e496f1f62bc0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner jvoisin %global gh_project snuffleupagus @@ -32,13 +32,13 @@ Summary: Security module for PHP Name: %{?scl_prefix}php-snuffleupagus -Version: 0.8.3 +Version: 0.9.0 %if 0%{?gh_date} Release: 1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif -License: LGPLv3 +License: LGPL-3.0-only Group: Development/Languages URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pkg_name}-%{version}-%{gh_short}.tar.gz @@ -59,18 +59,6 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -%if "%{php_version}" > "7.3" -Obsoletes: php73-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "8.0" -Obsoletes: php80-%{pecl_name} <= %{version} -%endif -%endif - %description Snuffleupagus is a PHP module designed to drastically raise the cost of @@ -178,6 +166,10 @@ fi %if "%{php_version}" < "8" rm -rf src/tests/*php8*/ %endif +%if "%{php_version}" > "8.2" +# https://github.com/jvoisin/snuffleupagus/issues/444 +rm -rf src/tests/deny_writable +%endif export SP_SKIP_OLD_PHP_CHECK=1 @@ -235,6 +227,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Jan 4 2023 Remi Collet - 0.9.0-1 +- update to 0.9.0 +- open https://github.com/jvoisin/snuffleupagus/issues/444 borked tests with 8.2 + * Mon Aug 29 2022 Remi Collet - 0.8.3-1 - update to 0.8.3 -- cgit