From 4a0e0316a07d83133540362f87a3d15bd3307b46 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 28 Oct 2019 07:49:35 +0100
Subject: [PATCH] v5.1.18

---
 ...7f0edcff63024426955f0796332499671fb7.patch | 25 ------------------
 ...3e06d89a0bf0a77287f9d232f3a2edb60667.patch | 26 -------------------
 php-pecl-apcu.spec                            | 13 ++++------
 3 files changed, 5 insertions(+), 59 deletions(-)
 delete mode 100644 192c7f0edcff63024426955f0796332499671fb7.patch
 delete mode 100644 50353e06d89a0bf0a77287f9d232f3a2edb60667.patch

diff --git a/192c7f0edcff63024426955f0796332499671fb7.patch b/192c7f0edcff63024426955f0796332499671fb7.patch
deleted file mode 100644
index 5d797e3..0000000
--- a/192c7f0edcff63024426955f0796332499671fb7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 192c7f0edcff63024426955f0796332499671fb7 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv@gmail.com>
-Date: Wed, 2 Oct 2019 11:02:10 +0200
-Subject: [PATCH] Use different fatal error in test
-
-This is no longer a fatal error in 7.4...
----
- tests/apc_entry_003.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/apc_entry_003.phpt b/tests/apc_entry_003.phpt
-index 0fd7be4..f066583 100644
---- a/tests/apc_entry_003.phpt
-+++ b/tests/apc_entry_003.phpt
-@@ -9,8 +9,8 @@ apc.enable_cli=1
- <?php
- $value = apcu_entry("test", function($key) {
-     // Fatal error
--    class X implements Y {}
-+    class X { use T; }
- });
- ?>
- --EXPECTF--
--Fatal error: Interface 'Y' not found in %s on line %d
-+Fatal error: Trait 'T' not found in %s on line %d
diff --git a/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch b/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch
deleted file mode 100644
index 4da2788..0000000
--- a/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 50353e06d89a0bf0a77287f9d232f3a2edb60667 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv@gmail.com>
-Date: Fri, 7 Jun 2019 10:04:14 +0200
-Subject: [PATCH] Use different fatal error
-
-The string conversion fatal is an exception in 7.4.
----
- tests/apc_entry_003.phpt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/apc_entry_003.phpt b/tests/apc_entry_003.phpt
-index ef8ace9..0fd7be4 100644
---- a/tests/apc_entry_003.phpt
-+++ b/tests/apc_entry_003.phpt
-@@ -8,8 +8,9 @@ apc.enable_cli=1
- --FILE--
- <?php
- $value = apcu_entry("test", function($key) {
--    (string) new stdClass;
-+    // Fatal error
-+    class X implements Y {}
- });
- ?>
- --EXPECTF--
--%s fatal error: Object of class stdClass could not be converted to string in %s on line %d
-+Fatal error: Interface 'Y' not found in %s on line %d
diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec
index 87197c7..07b2e20 100644
--- a/php-pecl-apcu.spec
+++ b/php-pecl-apcu.spec
@@ -16,16 +16,13 @@
 
 Name:           php-pecl-apcu
 Summary:        APC User Cache
-Version:        5.1.17
-Release:        3%{?dist}
+Version:        5.1.18
+Release:        1%{?dist}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 Source1:        %{pecl_name}.ini
 Source2:        %{pecl_name}-panel.conf
 Source3:        %{pecl_name}.conf.php
 
-Patch0:         https://github.com/krakjoe/apcu/commit/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch
-Patch1:         https://github.com/krakjoe/apcu/commit/192c7f0edcff63024426955f0796332499671fb7.patch
-
 License:        PHP
 URL:            http://pecl.php.net/package/APCu
 
@@ -87,9 +84,6 @@ mv %{pecl_name}-%{version} NTS
 sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
 
 cd NTS
-%patch0 -p1
-%patch1 -p1
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h)
 if test "x${extver}" != "x%{version}"; then
@@ -221,6 +215,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon Oct 28 2019 Remi Collet <remi@remirepo.net> - 5.1.18-1
+- update to 5.1.18
+
 * Thu Oct 03 2019 Remi Collet <remi@remirepo.net> - 5.1.17-3
 - rebuild for https://fedoraproject.org/wiki/Changes/php74
 - add upstream patches for test suite