diff options
Diffstat (limited to 'dev-libs/libsodium')
| -rw-r--r-- | dev-libs/libsodium/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild | 50 | ||||
| -rw-r--r-- | dev-libs/libsodium/libsodium-1.0.19-r1.ebuild | 24 |
3 files changed, 22 insertions, 56 deletions
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index 24b8495b7228..77dcb0e99cc9 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -3,6 +3,6 @@ DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e0 DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160 DIST libsodium-1.0.19.tar.gz 1945523 BLAKE2B de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c SHA512 8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439 DIST libsodium-1.0.19.tar.gz.minisig 318 BLAKE2B e86e653107478d9e9281894632baafda57358229f2d56fcaf55591098e38d6be72ed2f599a7f2c16d5b9978d2cbfe8e07db4e772b053a832a61fd325fc1efae4 SHA512 8b5993bd7e541a5913ea1659c1009c4edefd9b5907e0a7c9090fa604c23d77006ad9d9a897d66243162742d63ce9bc1f2c81091d50a584f1495dd3bd87d4451e -EBUILD libsodium-1.0.18_p20220618.ebuild 2539 BLAKE2B c7fc32544272e2a92a0ef21529a1f1b67ecc5a85e1d3d23a2e6942dbbdbcfc652c7706b9ad4f96b97d415e864f895c6b83d70ceed7314782b4c29a75eb287778 SHA512 4feb0a99fc347f9bf3c7f26502e2a56fd11cfcbdfc611de0cc5a21bc912b85351572f904394356052888bccf8429dc30a510f0a7cceed4be99b1b35b5f3e660e -EBUILD libsodium-1.0.19-r1.ebuild 2320 BLAKE2B e5a672e058a2b8dc9a10bca2ea19ccb8ee64eda2d058084a116e2b31f31c21992fd1ec35450c6cf17d1b2213e32fd8b4578317981bcee45470fa829c12e3cb55 SHA512 138e0eecf45523d99d45d1ca12edc60d3997f45ad884a09c7e1ff5d903da5c2f4a1a77be82a7ad25b45832a77deece454fdadd9952769603e31822db6eff3ec4 +EBUILD libsodium-1.0.18_p20220618.ebuild 2004 BLAKE2B 7533fdc4c5132d51221b66f6adccef49855efaa314f75cbe02cc47050417ffe4be413201ee649fcfaa31a8ef97e14fd04cbb56b630f83fde9e6eb17fa84aff1f SHA512 a3ddaa0ac739f719f54419c29cbaf073d8e09bb22d0e362bb8dbf708ea178600c5a03ab775d17f1df984af995ce2ee14e448cba266a91def07224d4d20383098 +EBUILD libsodium-1.0.19-r1.ebuild 2012 BLAKE2B 33028480c488a8f78ded4db515ee41542df137eab7932d404b5a98088ea86967d3b8a78f05323963eaa89e57055db153bc766960430a934175bd8293bc45956d SHA512 49d218476026cb9b907b7b4185649ad761b5f63e9b659a73deac8d3f64ef56f570a2cb48fd698bd7c094c80208bdb3aae02102fca267dca3088edb31353ad47f MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483 diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild index e98b55fa65ca..d54147eedb31 100644 --- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild @@ -3,32 +3,32 @@ EAPI=8 -inherit autotools multilib-minimal +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.key +VERIFY_SIG_METHOD=minisig +inherit autotools multilib-minimal verify-sig -DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" +DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library" HOMEPAGE="https://libsodium.org" if [[ ${PV} == *_p* ]] ; then MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-) - MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3" # We use _pN to represent 'stable releases' # These are backports from upstream to the last release branch # See https://download.libsodium.org/libsodium/releases/README.html - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz" - - # TODO: Could verify-sig.eclass support minisig? bug #783066 - SRC_URI+=" verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )" - - S="${WORKDIR}"/${PN}-stable + SRC_URI=" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz + verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig ) + " else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jedisct1.asc - inherit verify-sig - - SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )" + SRC_URI=" + https://download.libsodium.org/${PN}/releases/${P}.tar.gz + verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig ) + " fi +S="${WORKDIR}"/${PN}-stable + LICENSE="ISC" SLOT="0/23" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" @@ -37,32 +37,12 @@ IUSE="+asm minimal static-libs +urandom" CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) IUSE+=" ${CPU_USE[@]}" -if [[ ${PV} == *_p* ]] ; then - IUSE+=" verify-sig" - BDEPEND+=" verify-sig? ( app-crypt/minisign )" -fi +BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )" PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch ) -src_unpack() { - if [[ ${PV} == *_p* ]] ; then - if use verify-sig ; then - ebegin "Verifying signature using app-crypt/minisign" - minisign -V \ - -P ${MINISIGN_KEY} \ - -x "${DISTDIR}"/${P}.tar.gz.minisig \ - -m "${DISTDIR}"/${P}.tar.gz - eend $? || die "Failed to verify distfile using minisign!" - fi - - default - else - verify-sig_src_unpack - fi -} - src_prepare() { default diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild index cb3ef0373a0f..af4e604b01e7 100644 --- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit autotools multilib-minimal +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.key +VERIFY_SIG_METHOD=minisig +inherit autotools multilib-minimal verify-sig DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library" HOMEPAGE="https://libsodium.org" @@ -30,33 +32,17 @@ S="${WORKDIR}"/${PN}-stable LICENSE="ISC" SLOT="0/26" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" -IUSE="+asm minimal static-libs +urandom verify-sig" +IUSE="+asm minimal static-libs +urandom" CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) IUSE+=" ${CPU_USE[@]}" -BDEPEND=" verify-sig? ( app-crypt/minisign )" +BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )" PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch ) -src_unpack() { - # TODO: Could verify-sig.eclass support minisig? bug #783066 - MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3" - - if use verify-sig ; then - ebegin "Verifying signature using app-crypt/minisign" - minisign -V \ - -P ${MINISIGN_KEY} \ - -x "${DISTDIR}"/${P}.tar.gz.minisig \ - -m "${DISTDIR}"/${P}.tar.gz - eend $? || die "Failed to verify distfile using minisign!" - fi - - default -} - src_prepare() { default |