diff options
Diffstat (limited to 'app-crypt/signify')
-rw-r--r-- | app-crypt/signify/Manifest | 3 | ||||
-rw-r--r-- | app-crypt/signify/files/signify-31-fix-build-clang-16.patch | 35 | ||||
-rw-r--r-- | app-crypt/signify/metadata.xml | 4 | ||||
-rw-r--r-- | app-crypt/signify/signify-30.ebuild | 28 | ||||
-rw-r--r-- | app-crypt/signify/signify-31.ebuild | 61 |
5 files changed, 102 insertions, 29 deletions
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest index 89e1cd2d5f09..41b3407826a4 100644 --- a/app-crypt/signify/Manifest +++ b/app-crypt/signify/Manifest @@ -1 +1,2 @@ -DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87 +DIST signify-31.sha.sig 246 BLAKE2B bb2dc91aeaa6dde10a1cc43f26385479509ade9d02ea6839b3305ae51623f60c281ca881097b66839b6e3297bdf25d4b2daa1e49b82ea0cdfbf628c7e21f7f28 SHA512 c83453a81382b8841054c749fdaef8d122edc9a96a0a92cead8f7141dcb57cfe18770e7777e7dcd1908ddc7d4c747088d5979537a3484b0859ce8d530db6d65c +DIST signify-31.tar.xz 83480 BLAKE2B 090d0b326d549cd89f6f8fd86063455670d1d3915a8ab31ddc732cabb0b72b6ba8e00b3354b61369bde7caeec67eef41c012be66dd2e3212112f9a97cc63afbf SHA512 f39597ea278a7eb10b786909752fde59e16405f0bc76c9906f8014e9e7f6801b4733479eec765fb960b6062359954caf54a3460ff67258a9cff93fa978951962 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/metadata.xml b/app-crypt/signify/metadata.xml index 46be53b378b4..1ef43484244b 100644 --- a/app-crypt/signify/metadata.xml +++ b/app-crypt/signify/metadata.xml @@ -5,6 +5,10 @@ <email>patrick@gentoo.org</email> <name>Patrick Lauer</name> </maintainer> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> <upstream> <remote-id type="github">aperezdc/signify</remote-id> </upstream> diff --git a/app-crypt/signify/signify-30.ebuild b/app-crypt/signify/signify-30.ebuild deleted file mode 100644 index 01339391bfa5..000000000000 --- a/app-crypt/signify/signify-30.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Cryptographically sign and verify files" -HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify" -SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-1" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=dev-libs/libbsd-0.7" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch ) - -src_configure() { - tc-export CC -} - -src_install() { - emake DESTDIR="${ED}" PREFIX="/usr" install - einstalldocs -} diff --git a/app-crypt/signify/signify-31.ebuild b/app-crypt/signify/signify-31.ebuild new file mode 100644 index 000000000000..d0d154d517a3 --- /dev/null +++ b/app-crypt/signify/signify-31.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_METHOD="signify" +inherit toolchain-funcs verify-sig + +DESCRIPTION="Cryptographically sign and verify files" +HOMEPAGE=" + https://www.openbsd.org/ + https://github.com/aperezdc/signify/ +" +SRC_URI=" + https://github.com/aperezdc/${PN}/releases/download/v${PV}/${P}.tar.xz + 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" + +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 + "${FILESDIR}"/${PN}-31-fix-build-clang-16.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-30.pub" + +src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cp "${DISTDIR}"/${P}.{sha.sig,tar.xz} "${WORKDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}.sha.sig sha256 ${P}.tar.xz + fi + default +} + +src_configure() { + tc-export CC +} + +src_install() { + emake DESTDIR="${ED}" PREFIX="/usr" install + einstalldocs +} |