summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt10
-rw-r--r--php-8.0.13-crypt.patch (renamed from php-8.0.12-crypt.patch)21
-rw-r--r--php.spec14
3 files changed, 13 insertions, 32 deletions
diff --git a/failed.txt b/failed.txt
index ed2c8ec..a5c2869 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,16 +1,14 @@
-===== 8.0.12 (2021-10-21)
+===== 8.0.13RC1 (2021-11-04)
$ grep -ar 'Tests failed' /var/lib/mock/scl80*/build.log
/var/lib/mock/scl80el7x/build.log:Tests failed : 0
/var/lib/mock/scl80el8x/build.log:Tests failed : 0
-/var/lib/mock/scl80fc33x/build.log:Tests failed : 1
-/var/lib/mock/scl80fc34x/build.log:Tests failed : 1
-/var/lib/mock/scl80fc35x/build.log:Tests failed : 1
+/var/lib/mock/scl80fc33x/build.log:Tests failed : 0
+/var/lib/mock/scl80fc34x/build.log:Tests failed : 0
+/var/lib/mock/scl80fc35x/build.log:Tests failed : 0
-fc33x, fc34x, fc35x
- 4 Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-2.phpt]
(1) proc_open give erratic test results :(
diff --git a/php-8.0.12-crypt.patch b/php-8.0.13-crypt.patch
index 3469a93..31a8c8a 100644
--- a/php-8.0.12-crypt.patch
+++ b/php-8.0.13-crypt.patch
@@ -1,24 +1,3 @@
-From 9f98bc58c7bb7fdbb25614ca645bbd7a465fdfed Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 15 Oct 2021 15:45:50 +0200
-Subject: [PATCH] remove closing bracket in bad place
-
----
- build/php.m4 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/build/php.m4 b/build/php.m4
-index 9746ba28f325..7fb9e3125d13 100644
---- a/build/php.m4
-+++ b/build/php.m4
-@@ -2219,7 +2219,6 @@ struct crypt_data buffer;
- crypt_r("passwd", "hash", &buffer);
- ]])],[php_cv_crypt_r_style=struct_crypt_data_gnu_source],[])
- fi
-- ])
-
- if test "$php_cv_crypt_r_style" = "none"; then
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
From fc4e31467c352032ee709ac55d3c67bc22abcd8d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 15 Oct 2021 17:11:12 +0200
diff --git a/php.spec b/php.spec
index 1c5988d..1046aed 100644
--- a/php.spec
+++ b/php.spec
@@ -82,7 +82,8 @@
%bcond_with libpcre
%endif
-%if 0%{?fedora} >= 33
+# Using qdbm from "remi" for now, see https://bugzilla.redhat.com/2017308
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8
%bcond_without qdbm
%else
%bcond_with qdbm
@@ -114,13 +115,13 @@
#global gh_date 20200615
%global gh_owner php
%global gh_project php-src
-%global upver 8.0.12
-#global rcver RC1
+%global upver 8.0.13
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 3%{?dist}
+Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -187,7 +188,7 @@ Patch49: php-8.0.10-phar-sha.patch
# compatibility with OpenSSL 3.0, from 8.1
Patch50: php-8.0.10-openssl3.patch
# use system libxcrypt, from 8.1
-Patch51: php-8.0.12-crypt.patch
+Patch51: php-8.0.13-crypt.patch
# RC Patch
Patch91: php-7.2.0-oci8conf.patch
@@ -1853,6 +1854,9 @@ fi
%changelog
+* Wed Nov 3 2021 Remi Collet <remi@remirepo.net> - 8.0.13~RC1-1
+- update to 8.0.13RC1
+
* Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.0.12-3
- dba: enable qdbm backend