From 25db9b8a97f0753499f7a76040bcf5c7b5953445 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 16 May 2022 08:44:50 +0200
Subject: update to 0.8.0

open https://github.com/jvoisin/snuffleupagus/issues/418 bad version
open https://github.com/jvoisin/snuffleupagus/issues/419 failed test
---
 php-snuffleupagus.spec | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'php-snuffleupagus.spec')

diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec
index 958055d..9f9ccf4 100644
--- a/php-snuffleupagus.spec
+++ b/php-snuffleupagus.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-snuffleupagus
 #
-# Copyright (c) 2018-2021 Remi Collet
+# Copyright (c) 2018-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -18,7 +18,7 @@
 %global pkg_name    %{name}
 %endif
 
-%global gh_commit   e17f7f0c664b46fe6c3593115f1889c853b08794
+%global gh_commit   c0e72a25f32e4916ac5eda8cb47888fd0a200b23
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    jvoisin
 %global gh_project  snuffleupagus
@@ -31,7 +31,7 @@
 
 Summary:       Security module for PHP
 Name:          %{?sub_prefix}php-snuffleupagus
-Version:       0.7.1
+Version:       0.8.0
 %if 0%{?gh_date}
 Release:       2%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
@@ -88,6 +88,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 cd src
 # Sanity check, really often broken
 grep PHP_SNUFFLEUPAGUS_VERSION php_snuffleupagus.h
+sed -e '/PHP_SNUFFLEUPAGUS_VERSION/s/0.9.0/0.8.0/' -i php_snuffleupagus.h
+
 extver=$(sed -n '/#define PHP_SNUFFLEUPAGUS_VERSION/{s/.* "//;s/".*$//;p}' php_snuffleupagus.h)
 if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
    : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-dev}.
@@ -107,11 +109,14 @@ extension = %{pecl_name}.so
 
 ; Path to rules configuration files, glob or comma separated list
 sp.configuration_file = '%{php_inidir}/%{pecl_name}-*.rules'
-;sp.allow_broken_configuration = 0
+;sp.allow_broken_configuration = Off
 EOF
 
 cat << 'EOF' | tee %{pecl_name}-default.rules
 # Default rules see https://snuffleupagus.readthedocs.io/config.html
+
+# Don't report about EOL version
+sp.global.show_old_php_warning.disable();
 EOF
 
 
@@ -165,9 +170,14 @@ fi
 rm -rf src/tests/*php8*/
 %endif
 
+export SP_SKIP_OLD_PHP_CHECK=1
+
 # add extensions used by test suite
 TEST_DEPS="-d extension=xml.so -d extension=dom.so -d extension=curl.so -d extension=simplexml.so"
 
+# https://github.com/jvoisin/snuffleupagus/issues/419
+rm */tests/disable_function/disabled_functions_param_str_representation_php8.phpt
+
 cd src
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
@@ -215,6 +225,11 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon May 16 2022 Remi Collet <remi@remirepo.net> - 0.8.0-1
+- update to 0.8.0
+- open https://github.com/jvoisin/snuffleupagus/issues/418 bad version
+- open https://github.com/jvoisin/snuffleupagus/issues/419 failed test
+
 * Tue Aug  3 2021 Remi Collet <remi@remirepo.net> - 0.7.1-1
 - update to 0.7.1
 - drop patch merged upstream
-- 
cgit