summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-19 11:46:53 +0200
committerRemi Collet <remi@remirepo.net>2019-06-19 11:46:53 +0200
commit10ec5e22cbbfe1777364b80c00788a6559b52cef (patch)
tree83bfec4c5e0202678c76f46854983852a35da317
parentfc9e0764b10d8f8540573fd0980dece504338dbc (diff)
v2.0.18 from FedoraHEADmaster
-rw-r--r--composer.json1
l---------makesrc.sh1
-rw-r--r--php-paragonie-random-compat.spec27
3 files changed, 19 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 1c5978c..34f1381 100644
--- a/composer.json
+++ b/composer.json
@@ -4,6 +4,7 @@
"keywords": [
"csprng",
"random",
+ "polyfill",
"pseudorandom"
],
"license": "MIT",
diff --git a/makesrc.sh b/makesrc.sh
new file mode 120000
index 0000000..e53f56d
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1 @@
+php-paragonie-random-compat-get-source.sh \ No newline at end of file
diff --git a/php-paragonie-random-compat.spec b/php-paragonie-random-compat.spec
index be7f864..559409b 100644
--- a/php-paragonie-random-compat.spec
+++ b/php-paragonie-random-compat.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-paragonie-random-compat
#
-# Copyright (c) 2015-2018 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2015-2019 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
%global github_owner paragonie
%global github_name random_compat
-%global github_version 2.0.12
-%global github_commit 258c89a6b97de7dfaf5b8c7607d0478e236b04fb
+%global github_version 2.0.18
+%global github_commit 0a58ef6e3146256cc3dc7cc393927bcc7d1b72db
%global composer_vendor paragonie
%global composer_project random_compat
@@ -45,19 +45,23 @@ BuildArch: noarch
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 2.0.12)
+## phpcompatinfo (computed from version 2.0.18)
BuildRequires: php-mbstring
+BuildRequires: php-openssl
BuildRequires: php-pcre
BuildRequires: php-zlib
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires: php-pecl(libsodium)
+%endif
%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 2.0.12)
+# phpcompatinfo (computed from version 2.0.18)
+Requires: php-mbstring
Requires: php-pcre
# Weak dependencies
-%if 0%{?fedora} >= 21
-Suggests: php-mbstring
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
Suggests: php-pecl(libsodium)
%endif
@@ -84,8 +88,8 @@ ln -s random.php lib/autoload.php
%install
-mkdir -p %{buildroot}%{phpdir}/random_compat
-cp -rp lib/* %{buildroot}%{phpdir}/random_compat/
+mkdir -p %{buildroot}%{phpdir}
+cp -rp lib %{buildroot}%{phpdir}/random_compat
%check
@@ -93,7 +97,7 @@ cp -rp lib/* %{buildroot}%{phpdir}/random_compat/
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in php %{?rhel:php54 php55 php56} php70 php71 php72; do
+for PHP_EXEC in php %{?rhel:php54 php55 php56 php70} php71 php72 php73 php74; do
if which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose \
--bootstrap %{buildroot}%{phpdir}/random_compat/autoload.php \
@@ -115,6 +119,9 @@ exit $RETURN_CODE
%changelog
+* Sun Jun 16 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.0.18-1
+- Updated to 2.0.18 (RHBZ #1589437)
+
* Fri Apr 20 2018 Remi Collet <remi@remirepo.net> - 2.0.12-1
- update to 2.0.12