From 5f6ccffa9705b9b75c32f52fa323515d3ef582233299676404f5a0cff67debfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 18 Oct 2015 15:13:09 +0000
Subject: [PATCH 01/11] - Update to 1.0.4   * Support for AES256-GCM has been
 added. This requires a CPU with     the aesni and pclmul extensions, and is
 accessible via the     crypto_aead_aes256gcm_*() functions.   * ChaCha20 with
 an extended (96 bit) nonce and a 32-bit counter has     been implemented as
 crypto_stream_chacha20_ietf(),     crypto_stream_chacha20_ietf_xor() and
 crypto_stream_chacha20_ietf_xor_ic().     An IETF-compatible version of
 ChaCha20Poly1305 is available as    
 crypto_aead_chacha20poly1305_ietf_npubbytes(),    
 crypto_aead_chacha20poly1305_ietf_encrypt() and    
 crypto_aead_chacha20poly1305_ietf_decrypt().   * The sodium_increment()
 helper function has been added, to increment     an arbitrary large number
 (such as a nonce).   * The sodium_compare() helper function has been added,
 to compare     arbitrary large numbers (such as nonces, in order to prevent
 replay attacks).

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=20
---
 libsodium-1.0.3.tar.gz |  3 ---
 libsodium-1.0.4.tar.gz |  3 +++
 libsodium.changes      | 19 +++++++++++++++++++
 libsodium.spec         |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)
 delete mode 100644 libsodium-1.0.3.tar.gz
 create mode 100644 libsodium-1.0.4.tar.gz

diff --git a/libsodium-1.0.3.tar.gz b/libsodium-1.0.3.tar.gz
deleted file mode 100644
index a622df0..0000000
--- a/libsodium-1.0.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288
-size 1679664
diff --git a/libsodium-1.0.4.tar.gz b/libsodium-1.0.4.tar.gz
new file mode 100644
index 0000000..87368a7
--- /dev/null
+++ b/libsodium-1.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4f75d4b2bd860068e0401163207415c9d41048d7601409897ff2951839fd310
+size 1787241
diff --git a/libsodium.changes b/libsodium.changes
index fc6ad8f..943a479 100644
--- a/libsodium.changes
+++ b/libsodium.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sun Oct 18 15:09:15 UTC 2015 - idonmez@suse.com
+
+- Update to 1.0.4
+  * Support for AES256-GCM has been added. This requires a CPU with
+    the aesni and pclmul extensions, and is accessible via the
+    crypto_aead_aes256gcm_*() functions.
+  * ChaCha20 with an extended (96 bit) nonce and a 32-bit counter has
+    been implemented as crypto_stream_chacha20_ietf(),
+    crypto_stream_chacha20_ietf_xor() and crypto_stream_chacha20_ietf_xor_ic().
+    An IETF-compatible version of ChaCha20Poly1305 is available as
+    crypto_aead_chacha20poly1305_ietf_npubbytes(), 
+    crypto_aead_chacha20poly1305_ietf_encrypt() and
+    crypto_aead_chacha20poly1305_ietf_decrypt().
+  * The sodium_increment() helper function has been added, to increment
+    an arbitrary large number (such as a nonce).
+  * The sodium_compare() helper function has been added, to compare
+    arbitrary large numbers (such as nonces, in order to prevent replay attacks).
+
 -------------------------------------------------------------------
 Wed May 13 15:09:50 UTC 2015 - mpluskal@suse.com
 
diff --git a/libsodium.spec b/libsodium.spec
index ce2d922..944c3b0 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -18,7 +18,7 @@
 
 %define lname libsodium13
 Name:           libsodium
-Version:        1.0.3
+Version:        1.0.4
 Release:        0
 Summary:        Portable NaCl-based crypto library
 License:        ISC

From 1ef387f644edd65c717fc20efc9fb043d136c61a4f94f6b24803be829c9073e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 18 Oct 2015 15:35:04 +0000
Subject: [PATCH 02/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=21
---
 libsodium.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsodium.spec b/libsodium.spec
index 944c3b0..087a168 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -70,7 +70,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make %{?_smp_mflags} check
+make %{?_smp_mflags} check VERBOSE=1
 
 %post -n %{lname} -p /sbin/ldconfig
 

From 632583752e1a55e091f7455a090da6e79d9941a9cd7f7ad9d280d22f274ab373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 18 Oct 2015 16:08:14 +0000
Subject: [PATCH 03/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=22
---
 libsodium.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libsodium.spec b/libsodium.spec
index 087a168..90a0599 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -70,7 +70,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make %{?_smp_mflags} check VERBOSE=1
+make %{?_smp_mflags} check || true
 
 %post -n %{lname} -p /sbin/ldconfig
 
@@ -78,6 +78,7 @@ make %{?_smp_mflags} check VERBOSE=1
 
 %files -n %{lname}
 %defattr(0644,root,root,0755)
+%doc config.log test/default/sign.res
 %{_libdir}/libsodium.so.*
 
 %files devel

From 411525fe38c99dd296d90aa84618f8c5373ab86e803b0a98a1e05f92003fd49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 18 Oct 2015 16:27:13 +0000
Subject: [PATCH 04/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=23
---
 libsodium.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsodium.spec b/libsodium.spec
index 90a0599..7abcaeb 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -78,12 +78,12 @@ make %{?_smp_mflags} check || true
 
 %files -n %{lname}
 %defattr(0644,root,root,0755)
-%doc config.log test/default/sign.res
 %{_libdir}/libsodium.so.*
 
 %files devel
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog LICENSE README.markdown THANKS
+%doc config.log test/default/sign.res
 %{_includedir}/sodium.h
 %{_includedir}/sodium
 %{_libdir}/libsodium.so

From 149bcae6d7ef22c646c25ec0c9165fb86dc229532ac6cb48d67bc759d5ff71e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 18 Oct 2015 16:58:26 +0000
Subject: [PATCH 05/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=24
---
 libsodium.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libsodium.spec b/libsodium.spec
index 7abcaeb..944c3b0 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -70,7 +70,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
-make %{?_smp_mflags} check || true
+make %{?_smp_mflags} check
 
 %post -n %{lname} -p /sbin/ldconfig
 
@@ -83,7 +83,6 @@ make %{?_smp_mflags} check || true
 %files devel
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog LICENSE README.markdown THANKS
-%doc config.log test/default/sign.res
 %{_includedir}/sodium.h
 %{_includedir}/sodium
 %{_libdir}/libsodium.so

From c95e1e0b0e0990d7a3586bab0c728fd8681d447873ed3cb5e0867c8a16198c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 19 Oct 2015 06:58:06 +0000
Subject: [PATCH 06/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=25
---
 libsodium.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libsodium.spec b/libsodium.spec
index 944c3b0..dd26f28 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -61,8 +61,11 @@ to compile and develop applications that use libsodium.
 %setup -q
 
 %build
+%if %arm
+export CFLAGS="%{optflags} -fno-tree-vrp"
 %configure --disable-static
-make %{?_smp_mflags}
+%endif
+make %{?_smp_mflags} V=1
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}

From d26f03b63e9a6c0194042b75c39fb93e76f8ffe47a0546e79082f959863732a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 19 Oct 2015 07:00:09 +0000
Subject: [PATCH 07/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=26
---
 libsodium.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsodium.spec b/libsodium.spec
index dd26f28..0516706 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -61,7 +61,7 @@ to compile and develop applications that use libsodium.
 %setup -q
 
 %build
-%if %arm
+%ifarch %arm
 export CFLAGS="%{optflags} -fno-tree-vrp"
 %configure --disable-static
 %endif

From 5e1258faf5e33dad4fc227a8f704faa21fac7a89794ca5e37c9fec229553c2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 19 Oct 2015 07:01:43 +0000
Subject: [PATCH 08/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=27
---
 libsodium.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsodium.spec b/libsodium.spec
index 0516706..7cf5787 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -65,7 +65,7 @@ to compile and develop applications that use libsodium.
 export CFLAGS="%{optflags} -fno-tree-vrp"
 %configure --disable-static
 %endif
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags} VERBOSE=1
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}

From 061a96ad11df04379b506f325753607be5bda237acbafcbe67006053811acb4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 19 Oct 2015 07:03:16 +0000
Subject: [PATCH 09/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=28
---
 libsodium.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsodium.spec b/libsodium.spec
index 7cf5787..c574422 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -65,7 +65,7 @@ to compile and develop applications that use libsodium.
 export CFLAGS="%{optflags} -fno-tree-vrp"
 %configure --disable-static
 %endif
-make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}

From 7a9050b30de87549f6f027a7a599d95cd32124cc9f41f536202f04d632277e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 19 Oct 2015 07:07:48 +0000
Subject: [PATCH 10/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=29
---
 libsodium.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsodium.spec b/libsodium.spec
index c574422..675e2d8 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -63,9 +63,9 @@ to compile and develop applications that use libsodium.
 %build
 %ifarch %arm
 export CFLAGS="%{optflags} -fno-tree-vrp"
-%configure --disable-static
 %endif
-make %{?_smp_mflags}
+%configure --disable-static
+make %{?_smp_mflags} V=1
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}

From 66281f6be0fc1dfff6a9b80cc3744ab55078bdf6491572194d3712e8dc8a0fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 19 Oct 2015 07:25:41 +0000
Subject: [PATCH 11/11] -

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=30
---
 libsodium.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libsodium.spec b/libsodium.spec
index 675e2d8..e22482d 100644
--- a/libsodium.spec
+++ b/libsodium.spec
@@ -62,6 +62,7 @@ to compile and develop applications that use libsodium.
 
 %build
 %ifarch %arm
+# "sign" test fails otherwise
 export CFLAGS="%{optflags} -fno-tree-vrp"
 %endif
 %configure --disable-static