From 8477b7791e3ced39b04754ac1931bb84638155a1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 27 Oct 2021 08:41:53 +0200
Subject: update to 8.1.0RC5

build using system libxcrypt (Fedora only)
---
 .gitignore |  1 +
 failed.txt |  2 +-
 php.spec   | 28 ++++++++++++++++++++++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 01f0400..7671845 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ package-*.xml
 *.tar.xz.asc
 *.src.rpm
 */*rpm
+TODO
diff --git a/failed.txt b/failed.txt
index a0b4abf..4258927 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.1.0RC4 (2021-10-14)
+===== 8.1.0RC5 (2021-10-28)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php.spec b/php.spec
index 46227c0..1e51be1 100644
--- a/php.spec
+++ b/php.spec
@@ -82,12 +82,22 @@
 %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
 %endif
 
+# TODO change when 8.5 released (libxcrypt 4.1.1-6)
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
+# switch to bundled library using --without libxcrypt
+%bcond_without        libxcrypt
+%else
+# switch to system library using --with libxcrypt
+%bcond_with           libxcrypt
+%endif
+
 %bcond_without        dtrace
 
 # build with system libgd (gd-last in remi repo)
@@ -114,13 +124,13 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.1.0
-%global rcver        RC4
-%global lower        rc4
+%global rcver        RC5
+%global lower        rc5
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -214,6 +224,9 @@ BuildRequires: pkgconfig(libpcre2-8) >= 10.30
 %else
 Provides:      bundled(pcre2) = 10.32
 %endif
+%if %{with libxcrypt}
+BuildRequires: pkgconfig(libxcrypt)
+%endif
 BuildRequires: bzip2
 BuildRequires: perl
 BuildRequires: autoconf
@@ -1161,6 +1174,9 @@ ln -sf ../configure
     --with-system-ciphers \
 %if %{with libpcre}
     --with-external-pcre \
+%endif
+%if %{with libxcrypt}
+    --with-external-libcrypt \
 %endif
     --with-zlib \
     --with-layout=GNU \
@@ -1831,6 +1847,10 @@ fi
 
 
 %changelog
+* Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.1.0~rc5-1
+- update to 8.1.0RC5
+- build using system libxcrypt (Fedora only)
+
 * Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.1.0~rc4-2
 - dba: enable qdbm backend
 
-- 
cgit