From 5d226398d7508fb7a781d46f09c3d5662690e4d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sun, 1 Oct 2017 19:30:28 +0200
Subject: v2.0.8

---
 REFLECTION               | 24 ++++++++++++------------
 php-pecl-libsodium2.spec | 12 +++++++++---
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/REFLECTION b/REFLECTION
index 5588e27..9a6c4dc 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,9 +1,9 @@
-Extension [ <persistent> extension #131 sodium version 2.0.7 ] {
+Extension [ <persistent> extension #132 sodium version 2.0.8 ] {
 
   - Constants [80] {
-    Constant [ string SODIUM_LIBRARY_VERSION ] { 1.0.14 }
-    Constant [ integer SODIUM_LIBRARY_MAJOR_VERSION ] { 9 }
-    Constant [ integer SODIUM_LIBRARY_MINOR_VERSION ] { 6 }
+    Constant [ string SODIUM_LIBRARY_VERSION ] { 1.0.15 }
+    Constant [ integer SODIUM_LIBRARY_MAJOR_VERSION ] { 10 }
+    Constant [ integer SODIUM_LIBRARY_MINOR_VERSION ] { 0 }
     Constant [ integer SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES ] { 32 }
     Constant [ integer SODIUM_CRYPTO_AEAD_AES256GCM_NSECBYTES ] { 0 }
     Constant [ integer SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES ] { 12 }
@@ -54,15 +54,15 @@ Extension [ <persistent> extension #131 sodium version 2.0.7 ] {
     Constant [ integer SODIUM_CRYPTO_GENERICHASH_KEYBYTES_MAX ] { 64 }
     Constant [ integer SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13 ] { 1 }
     Constant [ integer SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13 ] { 2 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_ALG_DEFAULT ] { 1 }
+    Constant [ integer SODIUM_CRYPTO_PWHASH_ALG_DEFAULT ] { 2 }
     Constant [ integer SODIUM_CRYPTO_PWHASH_SALTBYTES ] { 16 }
-    Constant [ string SODIUM_CRYPTO_PWHASH_STRPREFIX ] { $argon2i$ }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE ] { 4 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE ] { 33554432 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_OPSLIMIT_MODERATE ] { 6 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_MEMLIMIT_MODERATE ] { 134217728 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_OPSLIMIT_SENSITIVE ] { 8 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_MEMLIMIT_SENSITIVE ] { 536870912 }
+    Constant [ string SODIUM_CRYPTO_PWHASH_STRPREFIX ] { $argon2id$ }
+    Constant [ integer SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE ] { 2 }
+    Constant [ integer SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE ] { 67108864 }
+    Constant [ integer SODIUM_CRYPTO_PWHASH_OPSLIMIT_MODERATE ] { 3 }
+    Constant [ integer SODIUM_CRYPTO_PWHASH_MEMLIMIT_MODERATE ] { 268435456 }
+    Constant [ integer SODIUM_CRYPTO_PWHASH_OPSLIMIT_SENSITIVE ] { 4 }
+    Constant [ integer SODIUM_CRYPTO_PWHASH_MEMLIMIT_SENSITIVE ] { 1073741824 }
     Constant [ integer SODIUM_CRYPTO_SCALARMULT_BYTES ] { 32 }
     Constant [ integer SODIUM_CRYPTO_SCALARMULT_SCALARBYTES ] { 32 }
     Constant [ integer SODIUM_CRYPTO_SHORTHASH_BYTES ] { 8 }
diff --git a/php-pecl-libsodium2.spec b/php-pecl-libsodium2.spec
index 633b509..2a07b4e 100644
--- a/php-pecl-libsodium2.spec
+++ b/php-pecl-libsodium2.spec
@@ -24,15 +24,15 @@
 
 Summary:        Wrapper for the Sodium cryptographic library
 Name:           %{?sub_prefix}php-pecl-%{proj_name}2
-Version:        2.0.7
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        2.0.8
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{proj_name}
 Source0:        http://pecl.php.net/get/%{proj_name}-%{version}.tgz
 
 # Ensure libsodium-last is used (1.0.9 per upstream)
-BuildRequires:  pkgconfig(libsodium) >= 1.0.13
+BuildRequires:  pkgconfig(libsodium) >= 1.0.15
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-json
@@ -104,6 +104,8 @@ sed -e 's/role="test"/role="src"/' \
 
 cd NTS
 
+sed -e '/PHP_SODIUM_VERSION/s/2.0.7/2.0.8/' -i php_libsodium.h
+
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_SODIUM_VERSION/{s/.* "//;s/".*$//;p}' php_libsodium.h)
 if test "x${extver}" != "x%{version}"; then
@@ -234,6 +236,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Sun Oct  1 2017 Remi Collet <remi@remirepo.net> - 2.0.8-1
+- Update to 2.0.8
+- rebuild for libsodium 1.0.15
+
 * Thu Sep 28 2017 Remi Collet <remi@remirepo.net> - 2.0.7-2
 - allow install of both v1 and v2 extensions
 
-- 
cgit