v2.0.11

2 files changed, 86 insertions, 21 deletions

diff --git a/REFLECTION b/REFLECTION
index e5dc1d8..f29b6b9 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,9 +1,9 @@
-Extension [ <persistent> extension #132 sodium version 2.0.10 ] {
+Extension [ <persistent> extension #138 sodium version 2.0.11 ] {
 
   - Constants [86] {
-    Constant [ string SODIUM_LIBRARY_VERSION ] { 1.0.15 }
+    Constant [ string SODIUM_LIBRARY_VERSION ] { 1.0.16 }
     Constant [ integer SODIUM_LIBRARY_MAJOR_VERSION ] { 10 }
-    Constant [ integer SODIUM_LIBRARY_MINOR_VERSION ] { 0 }
+    Constant [ integer SODIUM_LIBRARY_MINOR_VERSION ] { 1 }
     Constant [ integer SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES ] { 32 }
     Constant [ integer SODIUM_CRYPTO_AEAD_AES256GCM_NSECBYTES ] { 0 }
     Constant [ integer SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES ] { 12 }
@@ -118,6 +118,25 @@ Extension [ <persistent> extension #132 sodium version 2.0.10 ] {
       - Parameters [0] {
       }
     }
+    Function [ <internal:sodium> function sodium_crypto_aead_aes256gcm_decrypt_detached ] {
+
+      - Parameters [5] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $mac ]
+        Parameter #2 [ <required> $ad ]
+        Parameter #3 [ <required> $nonce ]
+        Parameter #4 [ <required> $key ]
+      }
+    }
+    Function [ <internal:sodium> function sodium_crypto_aead_aes256gcm_encrypt_detached ] {
+
+      - Parameters [4] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $ad ]
+        Parameter #2 [ <required> $nonce ]
+        Parameter #3 [ <required> $key ]
+      }
+    }
     Function [ <internal:sodium> function sodium_crypto_aead_chacha20poly1305_decrypt ] {
 
       - Parameters [4] {
@@ -164,6 +183,44 @@ Extension [ <persistent> extension #132 sodium version 2.0.10 ] {
       - Parameters [0] {
       }
     }
+    Function [ <internal:sodium> function sodium_crypto_aead_chacha20poly1305_decrypt_detached ] {
+
+      - Parameters [5] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $mac ]
+        Parameter #2 [ <required> $ad ]
+        Parameter #3 [ <required> $nonce ]
+        Parameter #4 [ <required> $key ]
+      }
+    }
+    Function [ <internal:sodium> function sodium_crypto_aead_chacha20poly1305_encrypt_detached ] {
+
+      - Parameters [4] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $ad ]
+        Parameter #2 [ <required> $nonce ]
+        Parameter #3 [ <required> $key ]
+      }
+    }
+    Function [ <internal:sodium> function sodium_crypto_aead_chacha20poly1305_ietf_decrypt_detached ] {
+
+      - Parameters [5] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $mac ]
+        Parameter #2 [ <required> $ad ]
+        Parameter #3 [ <required> $nonce ]
+        Parameter #4 [ <required> $key ]
+      }
+    }
+    Function [ <internal:sodium> function sodium_crypto_aead_chacha20poly1305_ietf_encrypt_detached ] {
+
+      - Parameters [4] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $ad ]
+        Parameter #2 [ <required> $nonce ]
+        Parameter #3 [ <required> $key ]
+      }
+    }
     Function [ <internal:sodium> function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt ] {
 
       - Parameters [4] {
@@ -187,6 +244,25 @@ Extension [ <persistent> extension #132 sodium version 2.0.10 ] {
         Parameter #3 [ <required> $key ]
       }
     }
+    Function [ <internal:sodium> function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt_detached ] {
+
+      - Parameters [5] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $mac ]
+        Parameter #2 [ <required> $ad ]
+        Parameter #3 [ <required> $nonce ]
+        Parameter #4 [ <required> $key ]
+      }
+    }
+    Function [ <internal:sodium> function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt_detached ] {
+
+      - Parameters [4] {
+        Parameter #0 [ <required> $string ]
+        Parameter #1 [ <required> $ad ]
+        Parameter #2 [ <required> $nonce ]
+        Parameter #3 [ <required> $key ]
+      }
+    }
     Function [ <internal:sodium> function sodium_crypto_auth ] {
 
       - Parameters [2] {
diff --git a/php-pecl-libsodium2.spec b/php-pecl-libsodium2.spec
index 5eb3642..515bbc0 100644
--- a/php-pecl-libsodium2.spec
+++ b/php-pecl-libsodium2.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-libsodium
 #
-# Copyright (c) 2014-2017 Remi Collet
+# Copyright (c) 2014-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -24,13 +24,14 @@
 
 Summary:        Wrapper for the Sodium cryptographic library
 Name:           %{?sub_prefix}php-pecl-%{proj_name}2
-Version:        2.0.10
+Version:        2.0.11
 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
 
+BuildRequires:  %{?dtsprefix}gcc
 # Ensure libsodium-last is used (1.0.9 per upstream)
 BuildRequires:  pkgconfig(libsodium) >= 1.0.15
 BuildRequires:  %{?scl_prefix}php-devel > 7
@@ -53,19 +54,6 @@ Provides:       %{?scl_prefix}php-pecl-%{proj_name}2%{?_isa} = %{version}-%{rele
 %endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php53-pecl-%{proj_name}2  <= %{version}
-Obsoletes:     php53u-pecl-%{proj_name}2 <= %{version}
-Obsoletes:     php54-pecl-%{proj_name}2  <= %{version}
-Obsoletes:     php54w-pecl-%{proj_name}2 <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-%{proj_name}2 <= %{version}
-Obsoletes:     php55w-pecl-%{proj_name}2 <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes:     php56u-pecl-%{proj_name}2 <= %{version}
-Obsoletes:     php56w-pecl-%{proj_name}2 <= %{version}
-%endif
 %if "%{php_version}" > "7.0"
 Obsoletes:     php70u-pecl-%{proj_name}2 <= %{version}
 Obsoletes:     php70w-pecl-%{proj_name}2 <= %{version}
@@ -103,8 +91,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-# https://github.com/jedisct1/libsodium-php/pull/157
-rm ac*.m4 build/*
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_SODIUM_VERSION/{s/.* "//;s/".*$//;p}' php_libsodium.h)
@@ -167,7 +153,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{proj_name}2/$i
 done
 
 
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
 if [ -x %{__pecl} ] ; then
@@ -236,6 +222,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Wed May  2 2018 Remi Collet <remi@remirepo.net> - 2.0.11-1
+- update to 2.0.11
+
 * Sat Oct 28 2017 Remi Collet <remi@remirepo.net> - 2.0.10-1
 - Update to 2.0.10
 - open https://github.com/jedisct1/libsodium-php/pull/157 unneeded files