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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26211158086 for ; Sun, 19 Dec 2021 14:13:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0055E0843; Sun, 19 Dec 2021 14:13:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81243E0843 for ; Sun, 19 Dec 2021 14:13:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CA1B3431D7 for ; Sun, 19 Dec 2021 14:13:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D02E4250 for ; Sun, 19 Dec 2021 14:13:26 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1639915971.87cc97af41e087eb6bd5ff40437252ab9f56a962.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-misc/gmid/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/gmid/Manifest net-misc/gmid/gmid-1.7.5.ebuild net-misc/gmid/gmid-9999.ebuild X-VCS-Directories: net-misc/gmid/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: 87cc97af41e087eb6bd5ff40437252ab9f56a962 X-VCS-Branch: dev Date: Sun, 19 Dec 2021 14:13:26 +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: 9e731e69-fee1-47b2-95dc-b1128f62ec40 X-Archives-Hash: 31ac15467cee1332fd8564e97c07777c commit: 87cc97af41e087eb6bd5ff40437252ab9f56a962 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Fri Dec 10 05:45:00 2021 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Sun Dec 19 12:12:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87cc97af net-misc/gmid: verify-sig Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> net-misc/gmid/Manifest | 3 ++- net-misc/gmid/gmid-1.7.5.ebuild | 26 +++++++++++++++++++++++--- net-misc/gmid/gmid-9999.ebuild | 28 ++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest index 6b8fd2ded..4f673292d 100644 --- a/net-misc/gmid/Manifest +++ b/net-misc/gmid/Manifest @@ -1,2 +1,3 @@ DIST gmid-1.7.4.tar.gz 81988 BLAKE2B 4dc2ec0e89aeb0b2c627927f35a9996f3d91c91b0266f351c6b64f1ba52e0f425cc48add1bdee6f5434f2a486ddd76db8c9e574ac9cbaea3e2a34b16bf0ee9ad SHA512 3dd2cae5597d1b88eec8f2f3b8e60ccc3e2034cbaa30382d982cf0435f1a243643d40c5d00aa7d1c7abae9c9f6751b38f7d6741ec08f7ee280bc2db99263d19e -DIST gmid-1.7.5.tar.gz 82063 BLAKE2B 1506a520e7bd32429e054b73275a1dd4b49683511d02148c802b8ba8b0babf1fef9ed035d9c54671b3db2b5a07ca611b985b81515d5fef3e9c28f9d7da8eea3f SHA512 bbb89cc64aa433aede90186d2bb047081dabd8752e053142fd8785f2194ea9be49e462c2f5b2ff7bdc73c2745d2fdcf13426a6f9f39118da2fbcbd6f955a41b0 +DIST gmid-1.7.5.sha.sig 708 BLAKE2B ae5c1ee80e7994c9d8b1b630c01b9dea121f08d2d8efd2a6ccfa129badaa680da037c2a0b955497ba81224e0faf2ca95a9ce11076aadf4012321648bdd5cde81 SHA512 b2ca1974188199eae71aab4d7cc740b7101adc7b3ebe36aa5690aa638e03e028f6f8cd6798fda2586543e2ca71981d95d0921fa58775dd8d66898650d9299578 +DIST gmid-1.7.5.tar.gz 82100 BLAKE2B 15d5ff725019193dd0394ad7d0f641d036064355118c37980c899b8c84b226eff2ebd5c8f0b17d5575e44f26d93b9492ef48efac6d7d93c4f1972dfb965e4e3d SHA512 eb7951f93746fe133291ac4136837b07d768997241fe913650ecd75d98153479e417c34a4e687ca30dc08f904dcc738d16834910ca21b100e3a220d7ed715507 diff --git a/net-misc/gmid/gmid-1.7.5.ebuild b/net-misc/gmid/gmid-1.7.5.ebuild index 10cb49b3a..eb001b79e 100644 --- a/net-misc/gmid/gmid-1.7.5.ebuild +++ b/net-misc/gmid/gmid-1.7.5.ebuild @@ -5,7 +5,8 @@ EAPI=8 SSL_DAYS=36500 SSL_CERT_MANDATORY=1 -inherit ssl-cert systemd toolchain-funcs +VERIFY_SIG_METHOD="signify" +inherit ssl-cert systemd toolchain-funcs verify-sig DESCRIPTION="Simple and secure Gemini server" HOMEPAGE="https://gmid.omarpolo.com" @@ -14,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" inherit git-r3 else - SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz + verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )" + KEYWORDS="~amd64 ~x86" fi LICENSE="BSD ISC MIT" @@ -34,11 +36,29 @@ DEPEND=" BDEPEND=" virtual/pkgconfig virtual/yacc + verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) ) " RDEPEND="${DEPEND}" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" + DOCS=( README.md ChangeLog contrib/README ) +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + if use verify-sig; then + # Too many levels of symbolic links + cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}.sha.sig sha256 ${P}.tar.gz + fi + default + fi +} + src_prepare() { default diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild index 10cb49b3a..1b951a81f 100644 --- a/net-misc/gmid/gmid-9999.ebuild +++ b/net-misc/gmid/gmid-9999.ebuild @@ -5,7 +5,8 @@ EAPI=8 SSL_DAYS=36500 SSL_CERT_MANDATORY=1 -inherit ssl-cert systemd toolchain-funcs +VERIFY_SIG_METHOD="signify" +inherit ssl-cert systemd toolchain-funcs verify-sig DESCRIPTION="Simple and secure Gemini server" HOMEPAGE="https://gmid.omarpolo.com" @@ -14,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" inherit git-r3 else - SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz + verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )" + KEYWORDS="~amd64 ~x86" fi LICENSE="BSD ISC MIT" @@ -28,17 +30,35 @@ DEPEND=" acct-user/gemini dev-libs/imsg-compat dev-libs/libevent:= - dev-libs/libretls + dev-libs/libretls:= dev-libs/openssl:= " BDEPEND=" virtual/pkgconfig virtual/yacc + verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) ) " RDEPEND="${DEPEND}" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" + DOCS=( README.md ChangeLog contrib/README ) +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + if use verify-sig; then + # Too many levels of symbolic links + cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}.sha.sig sha256 ${P}.tar.gz + fi + default + fi +} + src_prepare() { default