summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-09 11:52:00 +0200
committerRemi Collet <remi@remirepo.net>2021-06-09 11:52:00 +0200
commit468f3a80cc734a632837dbf6d4e35c59adc8c379 (patch)
treeb4991d07df0ac134fa2ca953de651309b0420c4c
parent5a3e1f714c35bc0a839e99de2a8cfe70b2ee3e15 (diff)
add patch for test suite with 8.1 fromHEADmaster
https://github.com/m6w6/ext-apfd/pull/4
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION2
-rw-r--r--apfd-php81.patch38
-rw-r--r--php-pecl-apfd.spec28
4 files changed, 57 insertions, 15 deletions
diff --git a/PHPINFO b/PHPINFO
new file mode 100644
index 0000000..6386963
--- /dev/null
+++ b/PHPINFO
@@ -0,0 +1,4 @@
+
+apfd
+
+apfd support => enabled
diff --git a/REFLECTION b/REFLECTION
index 6e70967..e505cda 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,3 +1,3 @@
-Extension [ <persistent> extension #117 apfd version 1.0.2 ] {
+Extension [ <persistent> extension #119 apfd version 1.0.2 ] {
}
diff --git a/apfd-php81.patch b/apfd-php81.patch
new file mode 100644
index 0000000..9b897d4
--- /dev/null
+++ b/apfd-php81.patch
@@ -0,0 +1,38 @@
+From 3b75b75ca2c8fde273b244052bb60f9cb4a56072 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 9 Jun 2021 11:46:36 +0200
+Subject: [PATCH] ignore new "full_path" member in 8.1
+
+---
+ tests/002.phpt | 3 +++
+ tests/003.phpt | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/tests/002.phpt b/tests/002.phpt
+index e46df77..50ca235 100644
+--- a/tests/002.phpt
++++ b/tests/002.phpt
+@@ -70,6 +70,9 @@ mike
+ --FILE--
+ <?php
+
++foreach($_FILES as $i => $v) {
++ unset($_FILES[$i]['full_path']); // only in 8.1
++}
+ var_dump($_POST, $_FILES);
+
+ ?>
+diff --git a/tests/003.phpt b/tests/003.phpt
+index 7cfd9ca..94b8989 100644
+--- a/tests/003.phpt
++++ b/tests/003.phpt
+@@ -70,6 +70,9 @@ mike
+ --FILE--
+ <?php
+
++foreach($_FILES as $i => $v) {
++ unset($_FILES[$i]['full_path']); // only in 8.1
++}
+ var_dump($_POST, $_FILES);
+
+ ?>
diff --git a/php-pecl-apfd.spec b/php-pecl-apfd.spec
index 9809115..020b3ef 100644
--- a/php-pecl-apfd.spec
+++ b/php-pecl-apfd.spec
@@ -3,7 +3,7 @@
#
# Fedora spec file for php-pecl-apfd
#
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -31,13 +31,16 @@
Summary: Always Populate Form Data
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 1.0.2
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD
URL: https://pecl.php.net/package/%{pecl_name}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Patch0: %{pecl_name}-php81.patch
+
BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel > 5.3
+BuildRequires: make
+BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -53,24 +56,15 @@ Conflicts: %{?scl_prefix}php-pecl(http) < 2.4
%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}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes: php73-pecl-%{pecl_name} <= %{version}
-%endif
%if "%{php_version}" > "7.4"
Obsoletes: php74-pecl-%{pecl_name} <= %{version}
%endif
%if "%{php_version}" > "8.0"
Obsoletes: php80-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "8.1"
+Obsoletes: php81-pecl-%{pecl_name} <= %{version}
%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
%endif
@@ -94,6 +88,8 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p1
+
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_APFD_VERSION/{s/.* "//;s/".*$//;p}' php_apfd.h)
if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -221,6 +217,10 @@ cd ../ZTS
%changelog
+* Wed Jun 9 2021 Remi Collet <remi@remirepo.net> - 1.0.2-4
+- add patch for test suite with 8.1 from
+ https://github.com/m6w6/ext-apfd/pull/4
+
* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.0.2-2
- rebuild for PHP 8.0.0RC1