From b4aed8cbf07516ce8e663ea94bc10b350cff2a64 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 30 Dec 2016 07:33:56 +0100
Subject: php-paragonie-random-compat: 2.0.4 (backported from Fedora)

---
 composer.json                    | 35 +++++++++++++++++++++++++++++++++++
 makesrc.sh                       |  6 +++---
 php-paragonie-random-compat.spec | 32 +++++++++++++++++++++-----------
 3 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..d363f4c
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,35 @@
+{
+    "name":         "paragonie/random_compat",
+    "description":  "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+    "keywords": [
+            "csprng",
+            "random",
+            "pseudorandom"
+        ],
+    "license":      "MIT",
+    "type":         "library",
+    "authors": [
+            {
+                "name":     "Paragon Initiative Enterprises",
+                "email":    "security@paragonie.com",
+                "homepage": "https://paragonie.com"
+            }
+        ],
+    "support": {
+        "issues":   "https://github.com/paragonie/random_compat/issues",
+        "email":    "info@paragonie.com",
+        "source":   "https://github.com/paragonie/random_compat"
+    },
+    "require": {
+        "php": ">=5.2.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.*|5.*"
+    },
+    "suggest": {
+        "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+    },
+    "autoload": {
+        "files": ["lib/random.php"]
+    }
+}
diff --git a/makesrc.sh b/makesrc.sh
index 816b3f7..ab1375c 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -2,8 +2,8 @@
 
 NAME=$(basename $PWD)
 OWNER=$(sed   -n '/^%global github_owner/{s/.* //;p}'   $NAME.spec)
-PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}' $NAME.spec)
-VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}'    $NAME.spec)
+VERSION=$(sed -n '/^%global github_version/{s/.* //;p}' $NAME.spec)
 COMMIT=$(sed  -n '/^%global github_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
@@ -16,7 +16,7 @@ git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
 echo "Getting commit..."
 pushd $PROJECT-$COMMIT
 git checkout $COMMIT
-cp composer.json ../composer-$VERSION.json
+cp composer.json ../composer.json
 popd
 
 echo "Archiving..."
diff --git a/php-paragonie-random-compat.spec b/php-paragonie-random-compat.spec
index 04bc86d..4026ab7 100644
--- a/php-paragonie-random-compat.spec
+++ b/php-paragonie-random-compat.spec
@@ -12,7 +12,8 @@
 
 %global github_owner     paragonie
 %global github_name      random_compat
-%global github_commit    c7e26a21ba357863de030f0b9e701c7d04593774
+%global github_version   2.0.4
+%global github_commit    a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e
 %global github_short     %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor  paragonie
@@ -27,7 +28,7 @@
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
 Name:          php-%{composer_vendor}-random-compat
-Version:       1.4.1
+Version:       %{github_version}
 Release:       1%{?github_release}%{?dist}
 Summary:       PHP 5.x polyfill for random_bytes() and random_int() from PHP 7
 
@@ -47,14 +48,14 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 1.4.1)
+## phpcompatinfo (computed from version 2.0.4)
 BuildRequires: php-pcre
 BuildRequires: php-zlib
 %endif
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 1.4.1)
+# phpcompatinfo (computed from version 2.0.4)
 Requires:      php-pcre
 # Weak dependencies
 %if 0%{?fedora} >= 21
@@ -94,13 +95,18 @@ cp -rp lib/* %{buildroot}%{phpdir}/random_compat/
 
 %check
 %if %{with_tests}
-%{_bindir}/phpunit --verbose \
-    --bootstrap %{buildroot}%{phpdir}/random_compat/autoload.php
-
-if which php70; then
-  php70 %{_bindir}/phpunit --verbose \
-    --bootstrap %{buildroot}%{phpdir}/random_compat/autoload.php
-fi
+BOOTSTRAP=%{buildroot}%{phpdir}/random_compat/autoload.php
+
+%{_bindir}/phpunit --verbose --bootstrap $BOOTSTRAP
+
+: Upstream tests with SCLs if available
+SCL_RETURN_CODE=0
+for SCL in php56 php70 php71; do
+    if which $SCL; then
+        $SCL %{_bindir}/phpunit --verbose --bootstrap $BOOTSTRAP || SCL_RETURN_CODE=1
+    fi
+done
+exit $SCL_RETURN_CODE
 %else
 : Tests skipped
 %endif
@@ -120,6 +126,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 29 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.0.4-1
+- Updated to 2.0.4 (RHBZ #1385987)
+- Run upstream tests with SCLs if they are available
+
 * Mon Apr 04 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.4.1-1
 - Updated to 1.4.1 (RHBZ #1318836)
 
-- 
cgit