From e530aea6938392e700d1e4202fcc96b6adda4f52 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 3 Aug 2021 08:04:53 +0200
Subject: update to 0.7.1 drop patch merged upstream

---
 369.patch              | 46 ----------------------------------------------
 PHPINFO                |  2 +-
 REFLECTION             |  2 +-
 php-snuffleupagus.spec | 11 ++++++-----
 4 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 369.patch

diff --git a/369.patch b/369.patch
deleted file mode 100644
index ddcd511..0000000
--- a/369.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From da4452a8084115f5975c88efab3671cdc2a07cf8 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 4 Jan 2021 12:34:26 +0100
-Subject: [PATCH] Fix #368 build with system libpcre
-
----
- src/sp_pcre_compat.c | 4 ++--
- src/sp_pcre_compat.h | 3 ---
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/sp_pcre_compat.c b/src/sp_pcre_compat.c
-index b4d29f06..283eeb7f 100644
---- a/src/sp_pcre_compat.c
-+++ b/src/sp_pcre_compat.c
-@@ -15,7 +15,7 @@ sp_pcre* sp_pcre_compile(const char* const pattern) {
-   const char* pcre_error = NULL;
-   int erroroffset;
-   ret =
--      php_pcre_compile(pattern, PCRE_CASELESS, &pcre_error, &erroroffset, NULL);
-+      pcre_compile(pattern, PCRE_CASELESS, &pcre_error, &erroroffset, NULL);
- #endif
- 
-   if (NULL == ret) {
-@@ -38,7 +38,7 @@ bool ZEND_HOT sp_is_regexp_matching_len(const sp_pcre* regexp, const char* str,
-   ret = pcre2_match(regexp, (PCRE2_SPTR)str, len, 0, 0, match_data, NULL);
- #else
-   int vec[30];
--  ret = php_pcre_exec(regexp, NULL, str, len, 0, 0, vec,
-+  ret = pcre_exec(regexp, NULL, str, len, 0, 0, vec,
-                       sizeof(vec) / sizeof(int));
- #endif
- 
-diff --git a/src/sp_pcre_compat.h b/src/sp_pcre_compat.h
-index 11f7f7ca..14c33b2d 100644
---- a/src/sp_pcre_compat.h
-+++ b/src/sp_pcre_compat.h
-@@ -4,9 +4,6 @@
- #include <stdlib.h>
- #include <stdbool.h>
- 
--#undef pcre_exec
--#undef pcre_compile
--
- #define PCRE2_CODE_UNIT_WIDTH 8
- #if PHP_VERSION_ID >= 70300
- #define SP_HAS_PCRE2
diff --git a/PHPINFO b/PHPINFO
index 765d423..76bf2a7 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 snuffleupagus
 
 snuffleupagus support => enabled
-Version => 0.7.0
+Version => 0.7.1
 Valid config => yes
 
 Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index 607c028..6356029 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #119 snuffleupagus version 0.7.0 ] {
+Extension [ <persistent> extension #122 snuffleupagus version 0.7.1 ] {
 
   - INI {
     Entry [ sp.configuration_file <SYSTEM> ]
diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec
index c52be26..958055d 100644
--- a/php-snuffleupagus.spec
+++ b/php-snuffleupagus.spec
@@ -18,7 +18,7 @@
 %global pkg_name    %{name}
 %endif
 
-%global gh_commit   047b2d08a5d01c2c8654f16fb97bb99d0b25052b
+%global gh_commit   e17f7f0c664b46fe6c3593115f1889c853b08794
 %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.0
+Version:       0.7.1
 %if 0%{?gh_date}
 Release:       2%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
@@ -42,8 +42,6 @@ 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:        https://patch-diff.githubusercontent.com/raw/jvoisin/snuffleupagus/pull/369.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 7
 BuildRequires: pcre-devel
@@ -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 .pr369
 
 cd src
 # Sanity check, really often broken
@@ -218,6 +215,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Aug  3 2021 Remi Collet <remi@remirepo.net> - 0.7.1-1
+- update to 0.7.1
+- drop patch merged upstream
+
 * Mon Jan  4 2021 Remi Collet <remi@remirepo.net> - 0.7.0-1
 - update to 0.7.0
 - sources from jvoisin instead of nbs-system
-- 
cgit