From 87aae0e7e158df9c2ffff1dee9f017237a823f91 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 1 Sep 2021 09:03:31 +0200
Subject: rebuild for 8.1.0RC1

---
 event-php81.patch   | 30 ------------------------------
 php-pecl-event.spec | 15 +++++++++------
 2 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 event-php81.patch

diff --git a/event-php81.patch b/event-php81.patch
deleted file mode 100644
index f4144a1..0000000
--- a/event-php81.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d4bf4d70181dea17985af1bd52748b0f678a4b8c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 11 Jun 2021 12:56:43 +0200
-Subject: [PATCH] Fix deprecated: strlen(): Passing null to parameter...
-
----
- tests/29-buffer-pullup.phpt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/29-buffer-pullup.phpt b/tests/29-buffer-pullup.phpt
-index b62b440..32bae4a 100644
---- a/tests/29-buffer-pullup.phpt
-+++ b/tests/29-buffer-pullup.phpt
-@@ -14,7 +14,12 @@ foreach ($a as $s) {
- 	$b = new $eventBuffereClass();
- 	$b->add($s);
- 	$s_pullup = $b->pullup(-1);
--	var_dump(strlen($s_pullup) == strlen($s) && $s_pullup == $s);
-+	if (is_null($s_pullup)) {
-+		// pullup return null when no data availble+
-+		var_dump(empty($s));
-+	} else {
-+		var_dump(strlen($s_pullup) == strlen($s) && $s_pullup == $s);
-+	}
- }
- ?>
- --EXPECT--
--- 
-2.31.1
-
diff --git a/php-pecl-event.spec b/php-pecl-event.spec
index e1f50bc..22cf3cb 100644
--- a/php-pecl-event.spec
+++ b/php-pecl-event.spec
@@ -31,20 +31,18 @@
 # After 20-sockets.so
 %global ini_name  40-%{pecl_name}.ini
 %endif
-%global upstream_version 3.0.4
+%global upstream_version 3.0.5
 #global upstream_prever  RC3
 #global upstream_postver r1
 
 Summary:       Provides interface to libevent library
 Name:          %{?sub_prefix}php-pecl-%{pecl_name}
 Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}%{?upstream_postver:+%{upstream_postver}}
-Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       PHP
 URL:           https://pecl.php.net/package/event
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}%{?upstream_postver}.tgz
 
-Patch0:        %{pecl_name}-php81.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
@@ -113,8 +111,6 @@ sed -e 's/role="test"/role="src"/' \
 mv %{pecl_name}-%{upstream_version}%{?upstream_prever}%{?upstream_postver} NTS
 
 cd NTS
-%patch0 -p1
-
 # Sanity check, really often broken
 DIR=$(%{__php} -r 'echo "php" . PHP_MAJOR_VERSION;')
 sed -e '/PHP_EVENT_VERSION/s/2.4.2/2.4.3/' -i $DIR/php_event.h
@@ -269,6 +265,13 @@ fi
 
 
 %changelog
+* Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 3.0.5-3
+- rebuild for 8.1.0RC1
+
+* Fri Jun 11 2021 Remi Collet <remi@remirepo.net> - 3.0.5-1
+- update to 3.0.5
+- drop patch merged upstream
+
 * Fri Jun 11 2021 Remi Collet <remi@remirepo.net> - 3.0.4-2
 - add patch for PHP 8.1 (send upstream by email)
 
-- 
cgit