update to 3.1.8HEADmaster

4 files changed, 11 insertions, 47 deletions

diff --git a/0001-use-zend_str_tolower-instead-of-php_strtolower.patch b/0001-use-zend_str_tolower-instead-of-php_strtolower.patch
deleted file mode 100644
index 2c7b5e8..0000000
--- a/0001-use-zend_str_tolower-instead-of-php_strtolower.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 56c80d21dc57cae955c496d7b4bc1f3c388788df Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 25 Sep 2024 15:20:25 +0200
-Subject: [PATCH] use zend_str_tolower instead of php_strtolower
-
----
- package.xml            | 2 +-
- php_mailparse_rfc822.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/php_mailparse_rfc822.c b/php_mailparse_rfc822.c
-index 3be2915..3ad872c 100644
---- a/php_mailparse_rfc822.c
-+++ b/php_mailparse_rfc822.c
-@@ -428,7 +428,11 @@ PHP_MAILPARSE_API char *php_rfc822_recombine_tokens(php_rfc822_tokenized_t *toks
- 	ret[len] = 0;
- 
- 	if (flags & PHP_RFC822_RECOMBINE_STRTOLOWER)
-+#if PHP_VERSION_ID < 80400
- 		php_strtolower(ret, len);
-+#else
-+		zend_str_tolower(ret, len);
-+#endif
- 
- 	return ret;
- }
--- 
-2.46.1
-
diff --git a/PHPINFO b/PHPINFO
index 0f1d80c..dff425c 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 mailparse
 
 mailparse support => enabled
-Extension Version => 3.1.6
+Extension Version => 3.1.7
 
 Directive => Local Value => Master Value
 mailparse.def_charset => us-ascii => us-ascii
diff --git a/REFLECTION b/REFLECTION
index a3a7e67..5f54128 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #84 mailparse version 3.1.6 ] {
+Extension [ <persistent> extension #85 mailparse version 3.1.7 ] {
 
   - Dependencies {
     Dependency [ mbstring (Required) ]
diff --git a/php-pecl-mailparse.spec b/php-pecl-mailparse.spec
index 859c239..fac1767 100644
--- a/php-pecl-mailparse.spec
+++ b/php-pecl-mailparse.spec
@@ -24,14 +24,12 @@
 
 Summary:   PHP PECL package for parsing and working with email messages
 Name:      %{?scl_prefix}php-pecl-mailparse
-Version:   3.1.6
-Release:   3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:   3.1.8
+Release:   1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:   PHP-3.01
 URL:       https://pecl.php.net/package/mailparse
 Source0:   https://pecl.php.net/get/%{sources}.tgz
 
-Patch0:    0001-use-zend_str_tolower-instead-of-php_strtolower.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.3
@@ -69,8 +67,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd %{sources}
-%patch -P0 -p1
-
 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}.
@@ -147,7 +143,7 @@ cd %{sources}
 TEST_PHP_EXECUTABLE=%{__php} \
 %{__php} -n run-tests.php -n -q \
     -d extension=mbstring.so \
-    -d extension=$PWD/../NTS/modules/%{pecl_name}.so \
+    -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --show-diff
 %endif
 
@@ -157,15 +153,6 @@ TEST_PHP_EXECUTABLE=%{__php} \
     --define extension=mbstring.so \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
-
-%if %{with tests}
-: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-%{__ztsphp} -n run-tests.php -n -q \
-    -d extension=mbstring.so \
-    -d extension=$PWD/../ZTS/modules/%{pecl_name}.so \
-    --show-diff
-%endif
 %endif
 
 
@@ -184,6 +171,12 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
 
 
 %changelog
+* Fri Oct  4 2024 Remi Collet <remi@remirepo.net> - 3.1.8-1
+- update to 3.1.8
+
+* Fri Oct  4 2024 Remi Collet <remi@remirepo.net> - 3.1.7-1
+- update to 3.1.7
+
 * Wed Sep 25 2024 Remi Collet <remi@remirepo.net> - 3.1.6-3
 - add upstream patch for PHP 8.4