From 7c76192fc9f86d6b163ef5fccb60ee6cf33ccc89 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Jul 2019 11:03:24 +0200
Subject: - update to 7.4.0alpha3 - drop argon2 dependency using libsodium
 implementation

---
 php.spec | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 8e546dc..1cc834c 100644
--- a/php.spec
+++ b/php.spec
@@ -103,13 +103,13 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        7.4.0
-%global rcver        alpha2
-%global lower        alpha2
+%global rcver        alpha3
+%global lower        alpha3
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 11%{?dist}
+Release: 12%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -143,9 +143,9 @@ Source52: 20-oci8.ini
 Source53: 20-ffi.ini
 
 # Build fixes
-Patch1: php-7.1.7-httpd.patch
+Patch1: php-7.4.0-httpd.patch
 Patch5: php-7.2.0-includedir.patch
-Patch6: php-5.6.3-embed.patch
+Patch6: php-7.4.0-embed.patch
 Patch7: php-7.4.0-recode.patch
 Patch8: php-7.2.0-libdb.patch
 Patch9: php-7.0.7-curl.patch
@@ -206,7 +206,6 @@ BuildRequires: libtool-ltdl-devel
 %if %{with_dtrace}
 BuildRequires: %{?dtsprefix}systemtap-sdt-devel
 %endif
-BuildRequires: pkgconfig(libargon2)
 %if 0%{?gh_date}
 BuildRequires: bison
 BuildRequires: re2c
@@ -384,7 +383,6 @@ Requires: gcc-c++
 Requires: libtool
 # see "php-config --libs"
 Requires: krb5-devel%{?_isa}
-Requires: libargon2-devel%{?_isa}
 Requires: libedit-devel%{?_isa}
 Requires: libxml2-devel%{?_isa}
 Requires: openssl-devel%{?_isa} >= 1.0.1
@@ -878,8 +876,8 @@ Summary: Wrapper for the Sodium cryptographic library
 # All files licensed under PHP version 3.0.1
 License: PHP
 Group: System Environment/Libraries
-# Ensure libsodium-last is used (upstream 1.0.9)
-BuildRequires:  pkgconfig(libsodium) >= 1.0.13
+# Minimal is 1.0.8, 1.0.14 is needed for argon2 password
+BuildRequires:  pkgconfig(libsodium) >= 1.0.14
 
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 Obsoletes: %{?scl_prefix}php-pecl-libsodium2 < 3
@@ -1061,9 +1059,6 @@ echo '%%%{?scl:%{scl}_}pecl_xmldir  %{_localstatedir}/lib/php/peclxml' | tee -a
 
 # Some extensions have their own configuration file
 cp %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53} .
-%ifarch x86_64
-sed -e '/opcache.huge_code_pages/s/0/1/' -i 10-opcache.ini
-%endif
 
 sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \
     -i 10-opcache.ini
@@ -1149,7 +1144,7 @@ ln -sf ../configure
     --with-system-tzdata \
 %endif
     --with-mhash \
-    --with-password-argon2 \
+    --without-password-argon2 \
 %if %{with_dtrace}
     --enable-dtrace \
 %endif
@@ -1799,6 +1794,10 @@ fi
 
 
 %changelog
+* Tue Jul  9 2019 Remi Collet <remi@remirepo.net> - 7.4.0~alpha3-12
+- update to 7.4.0alpha3
+- drop argon2 dependency using libsodium implementation
+
 * Tue Jun 25 2019 Remi Collet <remi@remirepo.net> - 7.4.0~alpha2-11
 - update to 7.4.0alpha2
 
-- 
cgit