From 399e5b393295ef749ec211c6348d8545e980a7c1 Mon Sep 17 00:00:00 2001
From: Calvin Hill <return@users.noreply.github.com>
Date: Mon, 13 Mar 2017 16:43:11 +0000
Subject: [PATCH] libsodium: bump version and remove SECONDARY_ARCH (#1214)

---
 ...-1.0.11.recipe => libsodium-1.0.12.recipe} | 22 +++++++++----------
 .../patches/libsodium-1.0.11.patchset         | 22 -------------------
 2 files changed, 10 insertions(+), 34 deletions(-)
 rename dev-libs/libsodium/{libsodium-1.0.11.recipe => libsodium-1.0.12.recipe} (68%)
 delete mode 100644 dev-libs/libsodium/patches/libsodium-1.0.11.patchset

diff --git a/dev-libs/libsodium/libsodium-1.0.11.recipe b/dev-libs/libsodium/libsodium-1.0.12.recipe
similarity index 68%
rename from dev-libs/libsodium/libsodium-1.0.11.recipe
rename to dev-libs/libsodium/libsodium-1.0.12.recipe
index 9a37c98c2..5769011e3 100644
--- a/dev-libs/libsodium/libsodium-1.0.11.recipe
+++ b/dev-libs/libsodium/libsodium-1.0.12.recipe
@@ -13,37 +13,35 @@ COPYRIGHT="2013-2016 Frank Denis"
 LICENSE="ISC"
 REVISION="4"
 SOURCE_URI="https://download.libsodium.org/libsodium/releases/libsodium-$portVersion.tar.gz"
-CHECKSUM_SHA256="a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765"
-PATCHES="libsodium-$portVersion.patchset"
+CHECKSUM_SHA256="b8648f1bb3a54b0251cf4ffa4f0d76ded13977d4fa7517d988f4c902dd8e2f95"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libsodium$secondaryArchSuffix = $portVersion
-	lib:libsodium$secondaryArchSuffix = 18.1.1 compat >= 18
+	libsodium = $portVersion
+	lib:libsodium = 18.1.1 compat >= 18
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
 	"
 
 PROVIDES_devel="
-	libsodium${secondaryArchSuffix}_devel = $portVersion
-	devel:libsodium$secondaryArchSuffix = 18.1.1 compat >= 18
+	libsodium_devel = $portVersion
+	devel:libsodium = 18.1.1 compat >= 18
 	"
 REQUIRES_devel="
-	libsodium$secondaryArchSuffix == $portVersion base
+	libsodium == $portVersion base
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:awk
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
+	cmd:gcc
+	cmd:libtoolize
 	cmd:make
 	"
 
diff --git a/dev-libs/libsodium/patches/libsodium-1.0.11.patchset b/dev-libs/libsodium/patches/libsodium-1.0.11.patchset
deleted file mode 100644
index 8319c607b..000000000
--- a/dev-libs/libsodium/patches/libsodium-1.0.11.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7e3a455500f9accf9bf34377dada312690c27a1a Mon Sep 17 00:00:00 2001
-From: Winston Durand <me@winstondurand.com>
-Date: Wed, 30 Nov 2016 05:18:11 +0000
-Subject: removed double semicolon
-
-
-diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c
-index c9f11ba..c41f929 100644
---- a/src/libsodium/sodium/utils.c
-+++ b/src/libsodium/sodium/utils.c
-@@ -62,7 +62,7 @@ static unsigned char canary[CANARY_SIZE];
- __attribute__ ((weak)) void
- _sodium_memzero_as_a_weak_symbol_to_prevent_lto(void * const pnt, const size_t len)
- {
--    unsigned char *pnt_ = (unsigned char *) pnt;;
-+    unsigned char *pnt_ = (unsigned char *) pnt;
-     size_t         i = (size_t) 0U;
- 
-     while (i < len) {
--- 
-2.7.0
-