From fcec8335b09b16db08b0afa828dc59ec2a11dddd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 18 Jul 2017 15:56:24 +0200
Subject: v2.0.4

---
 REFLECTION               | 35 ++---------------------------------
 php-pecl-libsodium2.spec | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/REFLECTION b/REFLECTION
index 94557b4..3f28bef 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,6 +1,6 @@
-Extension [ <persistent> extension #126 sodium version 2.0.2 ] {
+Extension [ <persistent> extension #126 sodium version 2.0.4 ] {
 
-  - Constants [71] {
+  - Constants [65] {
     Constant [ string SODIUM_LIBRARY_VERSION ] { 1.0.13 }
     Constant [ integer SODIUM_LIBRARY_MAJOR_VERSION ] { 9 }
     Constant [ integer SODIUM_LIBRARY_MINOR_VERSION ] { 5 }
@@ -52,12 +52,6 @@ Extension [ <persistent> extension #126 sodium version 2.0.2 ] {
     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 [ integer SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES ] { 32 }
-    Constant [ string SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_STRPREFIX ] { $7$ }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE ] { 524288 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE ] { 16777216 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE ] { 33554432 }
-    Constant [ integer SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE ] { 1073741824 }
     Constant [ integer SODIUM_CRYPTO_SCALARMULT_BYTES ] { 32 }
     Constant [ integer SODIUM_CRYPTO_SCALARMULT_SCALARBYTES ] { 32 }
     Constant [ integer SODIUM_CRYPTO_SHORTHASH_BYTES ] { 8 }
@@ -333,31 +327,6 @@ Extension [ <persistent> extension #126 sodium version 2.0.2 ] {
         Parameter #1 [ <required> $password ]
       }
     }
-    Function [ <internal:sodium> function sodium_crypto_pwhash_scryptsalsa208sha256 ] {
-
-      - Parameters [5] {
-        Parameter #0 [ <required> $length ]
-        Parameter #1 [ <required> $password ]
-        Parameter #2 [ <required> $salt ]
-        Parameter #3 [ <required> $opslimit ]
-        Parameter #4 [ <required> $memlimit ]
-      }
-    }
-    Function [ <internal:sodium> function sodium_crypto_pwhash_scryptsalsa208sha256_str ] {
-
-      - Parameters [3] {
-        Parameter #0 [ <required> $password ]
-        Parameter #1 [ <required> $opslimit ]
-        Parameter #2 [ <required> $memlimit ]
-      }
-    }
-    Function [ <internal:sodium> function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> $hash ]
-        Parameter #1 [ <required> $password ]
-      }
-    }
     Function [ <internal:sodium> function sodium_crypto_scalarmult ] {
 
       - Parameters [2] {
diff --git a/php-pecl-libsodium2.spec b/php-pecl-libsodium2.spec
index ef3efaa..0ca7f50 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.2
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        2.0.4
+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
-BuildRequires:  pkgconfig(libsodium) >= 1.0.12
+# Ensure libsodium-last is used (1.0.9 per upstream)
+BuildRequires:  pkgconfig(libsodium) >= 1.0.13
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-json
@@ -106,8 +106,6 @@ sed -e 's/role="test"/role="src"/' \
 
 cd NTS
 
-sed -e '/PHP_SODIUM_VERSION/s/2.0.1/2.0.2/' -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
@@ -238,6 +236,15 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.4-1
+- Update to 2.0.4
+- open https://github.com/jedisct1/libsodium-php/pull/140 cleanup
+
+* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.3-1
+- Update to 2.0.3
+- open https://github.com/jedisct1/libsodium-php/issues/138 broken build
+  and https://github.com/jedisct1/libsodium-php/pull/139
+
 * Mon Jul 17 2017 Remi Collet <remi@fedoraproject.org> - 2.0.2-3
 - rebuild with libsodium 1.0.13
 
-- 
cgit