From be6a39d4d51c049d15bbdab04071e121c9503b1e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 23 May 2022 07:36:03 +0200
Subject: update to 0.8.1

drop patches merged upstream
---
 PHPINFO                |  2 +-
 REFLECTION             |  2 +-
 php-snuffleupagus.spec | 17 +++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 247b24a..8d64240 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 snuffleupagus
 
 snuffleupagus support => enabled
-Version => 0.8.1-sng (with Suhosin-NG patches)
+Version => 0.8.2-sng (with Suhosin-NG patches)
 Valid config => yes
 
 Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index 3eeac9a..8130289 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #120 snuffleupagus version 0.8.1 ] {
+Extension [ <persistent> extension #120 snuffleupagus version 0.8.2 ] {
 
   - INI {
     Entry [ sp.configuration_file <SYSTEM> ]
diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec
index 818dee2..f0fade8 100644
--- a/php-snuffleupagus.spec
+++ b/php-snuffleupagus.spec
@@ -18,7 +18,7 @@
 %global pkg_name    %{name}
 %endif
 
-%global gh_commit   3d206b9ae51680ae6c0f0eee3e11e667d343d3e4
+%global gh_commit   a1a7d2030f40ce1f880e9944417c6ccbb48a3c13
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    jvoisin
 %global gh_project  snuffleupagus
@@ -31,21 +31,19 @@
 
 Summary:       Security module for PHP
 Name:          %{?sub_prefix}php-snuffleupagus
-Version:       0.8.1
+Version:       0.8.2
 %if 0%{?gh_date}
-Release:       2%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
-Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %endif
 License:       LGPLv3
 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
 
-Patch0:        upstream.patch
-
 BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel > 7
+BuildRequires: %{?scl_prefix}php-devel >= 7.0
 BuildRequires: pcre-devel
 # For tests/upload_validation_real.phpt
 # BuildRequires: %%{?scl_prefix}php-vld
@@ -86,7 +84,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1 -b .up
 
 cd src
 # Sanity check, really often broken
@@ -233,6 +230,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon May 23 2022 Remi Collet <remi@remirepo.net> - 0.8.2-1
+- update to 0.8.1
+- drop patches merged upstream
+
 * Wed May 18 2022 Remi Collet <remi@remirepo.net> - 0.8.0-2
 - fix segfault when overriding sp.configuration_file
   from https://github.com/jvoisin/snuffleupagus/pull/422
-- 
cgit