From d97adbb13d8d4ce3f0521498a11e3d3af2154de2 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 30 Jul 2023 10:41:39 +0100
Subject: gentoo auto-resync : 30:07:2023 - 10:41:38

---
 app-crypt/Manifest.gz                              | Bin 24640 -> 24635 bytes
 app-crypt/signify/Manifest                         |   3 +-
 .../files/signify-31-fix-build-clang-16.patch      |  35 +++++++++++++++++++++
 app-crypt/signify/signify-31.ebuild                |  24 +++++++++-----
 4 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 app-crypt/signify/files/signify-31-fix-build-clang-16.patch

(limited to 'app-crypt')

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 452d32d4a88c..40e5347a886a 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 371dfcb3e5d9..63bbd31299e2 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,5 +1,6 @@
 AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0130ce3397b12adc043cd65f8ff709b2a9021e2f0ed962d6a92e24e59fd04376fd55d38376e5bfa8caefd329fe23ee3 SHA512 23f01a3509912aa8a3ec8e77ec85cfa9f78df2ef11f15b9422fc1e8a93f13da800e333005e4e053ad8e586606eb151efd71983aca50834e89181a7b7b2862c07
+AUX signify-31-fix-build-clang-16.patch 848 BLAKE2B 5170271f72adc4bb3ab4e8bd90802976334956a966a3a1c1bf478ffd94b027f0d174969972e76400e9e9c7a9236172df6986e1552fcb3ccd284c7f6eab401e87 SHA512 f3f830b158aeea1ebecaab6cd4aee0e1f9d8ff2f3ff061af2a7af4415dfd7f58121a8ea0017c1fe054b87e2c7cfd85167683ed99c907a73a14b82df769c9f8b6
 DIST signify-31.sha.sig 246 BLAKE2B bb2dc91aeaa6dde10a1cc43f26385479509ade9d02ea6839b3305ae51623f60c281ca881097b66839b6e3297bdf25d4b2daa1e49b82ea0cdfbf628c7e21f7f28 SHA512 c83453a81382b8841054c749fdaef8d122edc9a96a0a92cead8f7141dcb57cfe18770e7777e7dcd1908ddc7d4c747088d5979537a3484b0859ce8d530db6d65c
 DIST signify-31.tar.xz 83480 BLAKE2B 090d0b326d549cd89f6f8fd86063455670d1d3915a8ab31ddc732cabb0b72b6ba8e00b3354b61369bde7caeec67eef41c012be66dd2e3212112f9a97cc63afbf SHA512 f39597ea278a7eb10b786909752fde59e16405f0bc76c9906f8014e9e7f6801b4733479eec765fb960b6062359954caf54a3460ff67258a9cff93fa978951962
-EBUILD signify-31.ebuild 1191 BLAKE2B 4d4c082642702cd30aeb8e77c587551a062603578be5382faaf8a02a24bfa1c4257b871aa747a000bad4b737e42fc8a50faa5d98ed1e6ee3afbb4bbf719f395f SHA512 a156daf506e87c92684ee78478e45ab6ada593740914bd3a55ee1433056f9d3fec53f72326956d88c67eb59eee5699d711ee20154963f5da812f986da906425e
+EBUILD signify-31.ebuild 1250 BLAKE2B d8117e37e49dc4ca13015665013c071853912e38a54f79340ddb62e1c57325c97648fd1770cd2039881528e86f5f8140ba8aa7f1db0795634e2929c2ce3787fc SHA512 42e54df5812af48fd94b2303dc8e00850cdb65909b50a35f71ce1c670943483fb98eb4fba7c1ba004f2beed04d1eb017d30e40392490a09241882b529cb987d5
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44
diff --git a/app-crypt/signify/files/signify-31-fix-build-clang-16.patch b/app-crypt/signify/files/signify-31-fix-build-clang-16.patch
new file mode 100644
index 000000000000..6f03d5b5340d
--- /dev/null
+++ b/app-crypt/signify/files/signify-31-fix-build-clang-16.patch
@@ -0,0 +1,35 @@
+Upstream PR: https://github.com/aperezdc/signify/pull/43
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sat, 29 Jul 2023 20:07:48 +0000
+Subject: [PATCH] Fix build with clang 16
+
+Bug: https://bugs.gentoo.org/894354
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/base64.c
++++ b/base64.c
+@@ -52,6 +52,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include "base64.h"
+ 
+ static const char Base64[] =
+ 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+--- /dev/null
++++ b/base64.h
+@@ -0,0 +1,2 @@
++int b64_pton(char const *, unsigned char *, size_t);
++int b64_ntop(unsigned char const *, size_t , char *, size_t);
+--- a/signify.c
++++ b/signify.c
+@@ -34,6 +34,7 @@
+ #include "sha2.h"
+ 
+ #include "crypto_api.h"
++#include "base64.h"
+ #include "signify.h"
+ 
+ #define SIGBYTES crypto_sign_ed25519_BYTES
+-- 
+2.41.0
+
diff --git a/app-crypt/signify/signify-31.ebuild b/app-crypt/signify/signify-31.ebuild
index 7f3e660468a9..294005cc7e9b 100644
--- a/app-crypt/signify/signify-31.ebuild
+++ b/app-crypt/signify/signify-31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,18 +16,28 @@ SRC_URI="
 	verify-sig? (
 		https://github.com/aperezdc/${PN}/releases/download/v${PV}/SHA256.sig
 			-> ${P}.sha.sig
-	)"
+	)
+"
 
 LICENSE="BSD-1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
-RDEPEND="!net-mail/signify
-	>=dev-libs/libbsd-0.7"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/signify-keys-signify )"
+DEPEND="
+	>=dev-libs/libbsd-0.7
+"
+RDEPEND="
+	${DEPEND}
+	!net-mail/signify
+"
+BDEPEND="
+	verify-sig? ( sec-keys/signify-keys-signify )
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-30-man_compress.patch
+	"${FILESDIR}"/${PN}-31-fix-build-clang-16.patch
+)
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-30.pub"
 
-- 
cgit v1.2.3