summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-06-09 11:24:16 +0200
committerRemi Collet <remi@remirepo.net>2020-06-09 11:24:16 +0200
commit0292e8d4253b97a4d35941e33c3088256d46687c (patch)
tree3ded0f4d9cf96960aae90242aee0cd5829569789
parent1956cba3746a4ca4d40c83167f3535b8d4cf0d3f (diff)
Update to 7.3.19 - http://www.php.net/releases/7_3_19.php
rebuild using oniguruma5php build phpdbg only once
-rw-r--r--failed.txt7
-rw-r--r--php-5.6.3-embed.patch2
-rw-r--r--php73.spec15
3 files changed, 15 insertions, 9 deletions
diff --git a/failed.txt b/failed.txt
index a27514f..c07d487 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,8 +1,8 @@
-===== 7.3.19RC1 (2020-05-28)
+===== 7.3.19 (2020-06-11)
$ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
-/var/lib/mock/el6i/build.log:Tests failed : 2
+/var/lib/mock/el6i/build.log:Tests failed : 0
/var/lib/mock/el6x/build.log:Tests failed : 0
/var/lib/mock/el7x/build.log:Tests failed : 0
/var/lib/mock/el8x73/build.log:Tests failed : 14
@@ -11,9 +11,6 @@ $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
/var/lib/mock/fc31x/build.log:Tests failed : 0
-el6i
- 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
- 1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
el8x:
5 buildroot issue with openssl under investigation
diff --git a/php-5.6.3-embed.patch b/php-5.6.3-embed.patch
index d9c04f6..38eea1d 100644
--- a/php-5.6.3-embed.patch
+++ b/php-5.6.3-embed.patch
@@ -18,7 +18,7 @@ diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
-php_sapis="@PHP_INSTALLED_SAPIS@"
-+php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@"
++php_sapis="apache2handler embed fpm phpdbg @PHP_INSTALLED_SAPIS@"
# Set php_cli_binary and php_cgi_binary if available
for sapi in $php_sapis; do
diff --git a/php73.spec b/php73.spec
index d1a6752..e593e13 100644
--- a/php73.spec
+++ b/php73.spec
@@ -121,7 +121,7 @@
%endif
%global upver 7.3.19
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -826,8 +826,11 @@ Group: Development/Languages
# ucgendat is licensed under OpenLDAP
License: PHP and LGPLv2 and BSD and OpenLDAP
%if %{with_onig}
-# ensure we have soname 5
-BuildRequires: oniguruma-devel >= 6.8
+%if 0%{?rhel}
+BuildRequires: oniguruma5php-devel
+%else
+BuildRequires: oniguruma-devel
+%endif
%else
Provides: bundled(oniguruma) = 6.9.0
%endif
@@ -1513,6 +1516,7 @@ popd
without_shared="--without-gd \
--disable-dom --disable-dba --without-unixODBC \
--disable-opcache \
+ --disable-phpdbg \
--disable-json \
--disable-xmlreader --disable-xmlwriter \
--without-sodium \
@@ -2249,6 +2253,11 @@ fi
%changelog
+* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 7.3.19-1
+- Update to 7.3.19 - http://www.php.net/releases/7_3_19.php
+- rebuild using oniguruma5php
+- build phpdbg only once
+
* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 7.3.19~RC1-1
- update to 7.3.19RC1