v3.1.1

5 files changed, 10 insertions, 102 deletions

diff --git a/PHPINFO b/PHPINFO
index 6f37623..a1643d3 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 mailparse
 
 mailparse support => enabled
-Extension Version => 3.1.0
+Extension Version => 3.1.1
 
 Directive => Local Value => Master Value
 mailparse.def_charset => us-ascii => us-ascii
diff --git a/REFLECTION b/REFLECTION
index 5221e9d..47e8b62 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #83 mailparse version 3.1.0 ] {
+Extension [ <persistent> extension #84 mailparse version 3.1.1 ] {
 
   - Dependencies {
     Dependency [ mbstring (Required) ]
diff --git a/d6f1583ffd408a9bbf1566d49c2bf099fce4e53a.patch b/d6f1583ffd408a9bbf1566d49c2bf099fce4e53a.patch
deleted file mode 100644
index 5f7a10b..0000000
--- a/d6f1583ffd408a9bbf1566d49c2bf099fce4e53a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d6f1583ffd408a9bbf1566d49c2bf099fce4e53a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Mon, 24 Aug 2020 09:58:55 +0200
-Subject: [PATCH] avoid "Undefined array key 1" with PHP 8
-
----
- tests/parse_test_messages.phpt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/parse_test_messages.phpt b/tests/parse_test_messages.phpt
-index 49573e4..df98741 100644
---- a/tests/parse_test_messages.phpt
-+++ b/tests/parse_test_messages.phpt
-@@ -17,7 +17,7 @@ $dir = opendir($testdir) or die("unable to open test dir!");
- $messages = array();
- 
- while (($f = readdir($dir)) !== false) {
--	if ($f == "CVS" || $f == "." || $f == "..")
-+	if ($f == "CVS" || $f == "." || $f == ".." || !strpos($f, '.'))
- 		continue;
- 		
- 	list($name, $suffix) = explode(".", $f, 2);
diff --git a/fa3c4f0c327aee0f12d071b13458de70164d8fe0.patch b/fa3c4f0c327aee0f12d071b13458de70164d8fe0.patch
deleted file mode 100644
index 5552289..0000000
--- a/fa3c4f0c327aee0f12d071b13458de70164d8fe0.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From fa3c4f0c327aee0f12d071b13458de70164d8fe0 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 2 Sep 2020 11:53:27 +0200
-Subject: [PATCH] mbfl_convert_filter_feed removed in 8.0.0beta3
-
----
- mailparse.c          | 4 ++--
- php_mailparse.h      | 7 +++++++
- php_mailparse_mime.c | 2 +-
- 3 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/mailparse.c b/mailparse.c
-index 8c706c2..a519c5b 100644
---- a/mailparse.c
-+++ b/mailparse.c
-@@ -1020,7 +1020,7 @@ PHP_FUNCTION(mailparse_stream_encode)
- 				}
- 
- 				for (; i<len; i++)
--					mbfl_convert_filter_feed(buf[i], conv);
-+					MBFL_CONVERT_FILTER_FEED(buf[i], conv);
- 			}
- 		}
- 
-@@ -1031,7 +1031,7 @@ PHP_FUNCTION(mailparse_stream_encode)
- 			{
- 				size_t i;
- 				for (i=0; i<len; i++)
--					mbfl_convert_filter_feed(buf[i], conv);
-+					MBFL_CONVERT_FILTER_FEED(buf[i], conv);
- 			}
- 		}
- 	}
-diff --git a/php_mailparse.h b/php_mailparse.h
-index e624b2c..a4b9515 100644
---- a/php_mailparse.h
-+++ b/php_mailparse.h
-@@ -95,6 +95,13 @@ extern ZEND_DECLARE_MODULE_GLOBALS(mailparse);
- #define MAILPARSEG(v) (mailparse_globals.v)
- #endif
- 
-+#if PHP_VERSION_ID < 80000
-+#define MBFL_CONVERT_FILTER_FEED(c, filter) mbfl_convert_filter_feed((c), (filter))
-+#else
-+/* helper removed from 8.0.0beta3 */
-+#define MBFL_CONVERT_FILTER_FEED(c, filter) (*(filter)->filter_function)((c), (filter))
-+#endif
-+
- #endif
- 
- 
-diff --git a/php_mailparse_mime.c b/php_mailparse_mime.c
-index b4dbd65..27e5a9c 100644
---- a/php_mailparse_mime.c
-+++ b/php_mailparse_mime.c
-@@ -967,7 +967,7 @@ PHP_MAILPARSE_API int php_mimepart_decoder_feed(php_mimepart *part, const char *
- 
- 		if (part->extract_filter) {
- 			for (i = 0; i < bufsize; i++) {
--				if (mbfl_convert_filter_feed(buf[i], part->extract_filter) < 0) {
-+				if (MBFL_CONVERT_FILTER_FEED(buf[i], part->extract_filter) < 0) {
- 					zend_error(E_WARNING, "%s() - filter conversion failed. Input message is probably incorrectly encoded\n",
- 							get_active_function_name());
- 					return -1;
diff --git a/php-pecl-mailparse.spec b/php-pecl-mailparse.spec
index a1154c5..582ea90 100644
--- a/php-pecl-mailparse.spec
+++ b/php-pecl-mailparse.spec
@@ -26,15 +26,12 @@
 
 Summary:   PHP PECL package for parsing and working with email messages
 Name:      %{?sub_prefix}php-pecl-mailparse
-Version:   3.1.0
-Release:   4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:   3.1.1
+Release:   1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:   PHP
 URL:       https://pecl.php.net/package/mailparse
 Source0:   https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-Patch0:    https://github.com/php/pecl-mail-mailparse/commit/d6f1583ffd408a9bbf1566d49c2bf099fce4e53a.patch
-Patch1:    https://github.com/php/pecl-mail-mailparse/commit/fa3c4f0c327aee0f12d071b13458de70164d8fe0.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 7
 BuildRequires: %{?scl_prefix}php-pear
@@ -61,17 +58,14 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "7.3"
 Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
 Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
+Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
@@ -100,9 +94,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .up0
-%patch1 -p1 -b .up1
-
 extver=$(sed -n '/#define PHP_MAILPARSE_VERSION/{s/.* "//;s/".*$//;p}' php_mailparse.h)
 if test "x${extver}" != "x%{version}"; then
    : Error: Upstream version is ${extver}, expecting %{version}.
@@ -228,6 +219,9 @@ fi
 
 
 %changelog
+* Wed Sep 16 2020 Remi Collet <remi@remirepo.net> - 3.1.1-1
+- update to 3.1.1
+
 * Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 3.1.0-4
 - add upstream patch for PHP 8.0.0beta3