public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/m4/
Date: Thu,  7 Apr 2022 03:57:57 +0000 (UTC)	[thread overview]
Message-ID: <1649303851.01750098caa939e1f18f7f94c5b30aae59f5e2c8.sam@gentoo> (raw)

commit:     01750098caa939e1f18f7f94c5b30aae59f5e2c8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 03:55:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 03:57:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01750098

sys-devel/m4: add verify-sig

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/m4/Manifest         |  1 +
 sys-devel/m4/m4-1.4.19.ebuild | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index bc43b9b6b9ac..90afb460c0a7 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,2 +1,3 @@
 DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e487906f1ce47069ea6d3095fd6532aa6b47bcd8109b7cd733fde26915d449a1cfc326f27f5ed83ba29a5a80687b8b9bdb73c8d87e96b8 SHA512 c3e7d4c1631e401c6b5477c22fd5de837188acf9d72551b116c665a927d1799b1fb249e90c9fb4f6f2f328ee84b2e4dd0bf54f684139997c19ee5b69a3e9284d
 DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
+DIST m4-1.4.19.tar.xz.sig 488 BLAKE2B 99e89b1ed0bf158d29a652392fb122e23227e895c75a8c63057ebe33f11b433ab205ae99a991578a89df8c3e723fc00669d8cdb290fbc86eaa6c704b112e4370 SHA512 d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e

diff --git a/sys-devel/m4/m4-1.4.19.ebuild b/sys-devel/m4/m4-1.4.19.ebuild
index a30e5e26214d..744de66535d5 100644
--- a/sys-devel/m4/m4-1.4.19.ebuild
+++ b/sys-devel/m4/m4-1.4.19.ebuild
@@ -3,16 +3,20 @@
 
 EAPI=7
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/m4.asc
+inherit verify-sig
+
 DESCRIPTION="GNU macro processor"
 HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
-if [[ "${PV}" == *_beta* ]] ; then
+if [[ ${PV} == *_beta* ]] ; then
 	MY_P="${PN}-1.4.18d"
-	#SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
 	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )"
 	S="${WORKDIR}/${MY_P}"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -29,13 +33,23 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # Remember: cannot dep on autoconf since it needs us
 BDEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-m4 )"
 
 PATCHES=(
 	"${FILESDIR}"/ppc-musl.patch
 	"${WORKDIR}"/${P}-test-198-sysval-r1.patch
 )
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
 src_configure() {
 	local -a myeconfargs=(
 		--enable-changeword


             reply	other threads:[~2022-04-07  3:58 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-07  3:57 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-05-22 16:26 [gentoo-commits] repo/gentoo:master commit in: sys-devel/m4/ David Seifert
2023-05-22 16:26 David Seifert
2023-03-04 22:30 Jakov Smolić
2023-03-04 13:45 Arthur Zamarin
2023-03-04  9:10 Arthur Zamarin
2023-03-04  8:44 Arthur Zamarin
2023-03-04  7:28 Arthur Zamarin
2023-03-04  7:25 Arthur Zamarin
2023-03-04  7:17 Arthur Zamarin
2023-03-04  6:05 Arthur Zamarin
2022-10-18  2:18 Sam James
2022-04-26  9:47 WANG Xuerui
2022-02-10 20:48 Mike Gilbert
2022-02-10 14:46 Sam James
2022-02-07  0:30 Sam James
2021-08-15 19:51 Sam James
2021-08-12  6:41 Agostino Sarubbo
2021-08-11 19:11 Sam James
2021-08-11  6:41 Agostino Sarubbo
2021-08-11  6:40 Agostino Sarubbo
2021-08-11  0:20 Sam James
2021-05-30 11:00 Lars Wendler
2021-05-12  7:28 Lars Wendler
2021-05-10  8:24 Lars Wendler
2021-03-26 17:58 Lars Wendler
2021-03-26 17:58 Lars Wendler
2021-01-06 15:32 Fabian Groffen
2020-12-27 18:18 Fabian Groffen
2020-09-13 22:30 Mike Gilbert
2020-09-13  9:57 Fabian Groffen
2019-05-04 17:28 Mikle Kolyada
2019-03-10  8:36 Mart Raudsepp
2019-03-02 15:46 Mikle Kolyada
2019-03-02 15:46 Mikle Kolyada
2019-03-02 15:46 Mikle Kolyada
2019-03-02 15:46 Mikle Kolyada
2019-03-02 15:46 Mikle Kolyada
2019-03-01  1:14 Thomas Deutschmann
2019-02-28  7:23 Sergei Trofimovich
2019-02-27  8:20 Sergei Trofimovich
2019-02-27  8:20 Sergei Trofimovich
2019-02-27  7:55 Sergei Trofimovich
2019-02-26  4:59 Jack Morgan
2019-02-25 15:19 Mikle Kolyada
2019-02-25 10:55 Mikle Kolyada
2019-02-25 10:55 Mikle Kolyada
2017-02-20 14:11 Michael Haubenwallner
2017-01-29 20:14 Fabian Groffen
2017-01-19 14:14 Mike Frysinger
2017-01-01  1:50 Anthony G. Basile
2016-12-31 23:45 Lars Wendler
2016-06-04  4:54 Markus Meier
2016-05-27 12:46 Lars Wendler
2016-05-26 20:05 Lars Wendler
2016-05-25  9:19 Anthony G. Basile
2016-05-25  6:29 Matt Turner
2016-05-25  5:25 Jeroen Roovers
2016-04-25 22:57 Anthony G. Basile
2016-04-21  6:27 Anthony G. Basile

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1649303851.01750098caa939e1f18f7f94c5b30aae59f5e2c8.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox