From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75A821382C5 for ; Wed, 23 Jun 2021 01:14:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DEB1E0788; Wed, 23 Jun 2021 01:14:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66375E0788 for ; Wed, 23 Jun 2021 01:14:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF9A533BE3B for ; Wed, 23 Jun 2021 01:14:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1E8B7A0 for ; Wed, 23 Jun 2021 01:14:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1624410887.d18aba452b5c89d94a5ce3e78b29ea2da84e293c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsodium/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libsodium/Manifest dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild X-VCS-Directories: dev-libs/libsodium/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d18aba452b5c89d94a5ce3e78b29ea2da84e293c X-VCS-Branch: master Date: Wed, 23 Jun 2021 01:14:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 956936a7-86b3-43d7-8f8f-606de3010d25 X-Archives-Hash: 82320ca2ebf2e075f287ffebf4078431 commit: d18aba452b5c89d94a5ce3e78b29ea2da84e293c Author: Sam James gentoo org> AuthorDate: Wed Jun 23 01:14:47 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 23 01:14:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18aba45 dev-libs/libsodium: add 1.0.18_p20210617 Signed-off-by: Sam James gentoo.org> dev-libs/libsodium/Manifest | 2 + .../libsodium/libsodium-1.0.18_p20210617.ebuild | 98 ++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest index a6b72a2ae01..ba4f46480c6 100644 --- a/dev-libs/libsodium/Manifest +++ b/dev-libs/libsodium/Manifest @@ -2,3 +2,5 @@ DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006 DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea458513b0fdf99e8f6c015132b618fd0fefbe6a18ed514c20fbe1e56719dd6dd3762bc4bb6348a439146fdaa951090c0 SHA512 ba69d372263e63126d6ce24f67fe85d83f74e558db81391ddcd7eacb6787dcdd5209a149eebca897e9806f295e78f5a8ababa0ab884b85d9a8dd1a54507a8b0c DIST libsodium-1.0.18_p20210421.tar.gz 1855069 BLAKE2B f9b5843998b0045f97a303589de42b38a7586b4a35571eec9a0b0afd1df101467cb8f82e9a32dbdb9a25058d827a5565ad8d49ad2216d2b6af5b101612a94080 SHA512 ddb77c0608a7e6cacf1923a3d0f5950975511c46d53f6f9c23f80dd99eab84dde2a1292c1e35555f7f1659f25a1b80668516558b83c42effb921fff06c0fb559 DIST libsodium-1.0.18_p20210421.tar.gz.minisig 311 BLAKE2B 12d00384a2acd9c9ac5cfc2ce984c2254a69be93f9cb891513c2f575fbc0cd2c03c2f323aa4b363f54fd7e1bf6b73887c0919e919142f759f0f7baa8680cdba5 SHA512 80fe3a5d41a5550b310e1fce86eed142288c70bab46c761a21206cd0c441b9355d455df49916b3eca134af60444307baa8c5566f1ea369e79f7326a6fac822bf +DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc +DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild new file mode 100644 index 00000000000..3d4e4edcb0e --- /dev/null +++ b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="A 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" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/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 )" +fi + +LICENSE="ISC" +SLOT="0/23" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +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 + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch +) + +src_unpack() { + if [[ ${PV} == *_p* ]] ; then + if use verify-sig ; then + elog "Verifying signature using app-crypt/minisign" + minisign -V \ + -P ${MINISIGN_KEY} \ + -x "${DISTDIR}"/${P}.tar.gz.minisig \ + -m "${DISTDIR}"/${P}.tar.gz || die "Failed to verify distfile using minisign!" + fi + + default + else + verify-sig_src_unpack + fi +} + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable asm) + $(use_enable cpu_flags_x86_aes aesni) + $(use_enable cpu_flags_x86_sse4_1 sse4_1) + $(use_enable minimal) + $(use_enable static-libs static) + $(use_enable !urandom blocking-random) + ) + + # --disable-pie is needed on x86, see bug #512734 + if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then + myeconfargs+=( --disable-pie ) + + # --disable-ssp is needed on musl x86 + # TODO: Check if still needed? bug #747346 + if use elibc_musl ; then + myeconfargs+=( --disable-ssp ) + fi + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + default + find "${ED}" -type f -name "*.la" -delete || die +}