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 37D39158015 for ; Tue, 26 Dec 2023 21:39:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F22E92BC01A; Tue, 26 Dec 2023 21:39:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D23B32BC01D for ; Tue, 26 Dec 2023 21:39:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1F43233FE7D for ; Tue, 26 Dec 2023 21:39:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DEBB14B4 for ; Tue, 26 Dec 2023 21:39:29 +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: <1703626686.a83c857e6470b72be0fea84579a8eb2c6fe5ee47.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-2.12-r1.ebuild sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a83c857e6470b72be0fea84579a8eb2c6fe5ee47 X-VCS-Branch: master Date: Tue, 26 Dec 2023 21:39:29 +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: adee04b9-ecbe-454b-9568-6511133d8eb5 X-Archives-Hash: 8c70b11b6132449f6b061306442a285d commit: a83c857e6470b72be0fea84579a8eb2c6fe5ee47 Author: Sam James gentoo org> AuthorDate: Tue Dec 26 21:38:06 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 26 21:38:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83c857e sys-boot/grub: sync live Signed-off-by: Sam James gentoo.org> sys-boot/grub/grub-2.12-r1.ebuild | 10 ++++++---- sys-boot/grub/grub-9999.ebuild | 28 +++++++++++++++++++++------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/sys-boot/grub/grub-2.12-r1.ebuild b/sys-boot/grub/grub-2.12-r1.ebuild index 80061b9e8e2a..26b25794d046 100644 --- a/sys-boot/grub/grub-2.12-r1.ebuild +++ b/sys-boot/grub/grub-2.12-r1.ebuild @@ -33,10 +33,12 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then inherit autotools fi -inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs verify-sig +inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs MY_P=${P} if [[ ${PV} != 9999 ]]; then + inherit verify-sig + if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 MY_P=${P/_/'~'} @@ -52,6 +54,7 @@ if [[ ${PV} != 9999 ]]; then " S=${WORKDIR}/${P%_*} fi + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" else inherit git-r3 @@ -88,7 +91,7 @@ REQUIRED_USE=" grub_platforms_loongson? ( fonts ) " -BDEPEND=" +BDEPEND+=" ${PYTHON_DEPS} >=sys-devel/flex-2.5.35 sys-devel/bison @@ -114,7 +117,6 @@ BDEPEND=" virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) - verify-sig? ( sec-keys/openpgp-keys-danielkiper ) " DEPEND=" app-arch/xz-utils @@ -185,7 +187,7 @@ src_prepare() { fi # Avoid error due to extra_deps.lst missing from source tarball: - # make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop. + # make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop. echo "depends bli part_gpt" > grub-core/extra_deps.lst || die } diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 04c3b16c7c59..430fb57a1484 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -23,6 +23,7 @@ fi PYTHON_COMPAT=( python3_{9..11} ) WANT_LIBTOOL=none +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then inherit python-any-r1 @@ -34,17 +35,27 @@ fi inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs +MY_P=${P} if [[ ${PV} != 9999 ]]; then + inherit verify-sig + if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 MY_P=${P/_/'~'} - SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz" + SRC_URI=" + https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz + 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=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) + " S=${WORKDIR}/${P%_*} fi - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" @@ -80,7 +91,7 @@ REQUIRED_USE=" grub_platforms_loongson? ( fonts ) " -BDEPEND=" +BDEPEND+=" ${PYTHON_DEPS} >=sys-devel/flex-2.5.35 sys-devel/bison @@ -111,11 +122,11 @@ DEPEND=" app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( - sdl? ( media-libs/libsdl ) + sdl? ( media-libs/libsdl2 ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) - mount? ( sys-fs/fuse:0 ) + mount? ( sys-fs/fuse:3 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) @@ -149,6 +160,8 @@ src_unpack() { git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" git-r3_checkout "${GNULIB_URI}" gnulib popd >/dev/null || die + elif use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig} fi default } @@ -216,7 +229,8 @@ grub_configure() { $(use_enable themes grub-themes) $(use_enable truetype grub-mkfont) $(use_enable libzfs) - $(use_enable sdl grub-emu-sdl) + --enable-grub-emu-sdl=no + $(use_enable sdl grub-emu-sdl2) ${platform:+--with-platform=}${platform} # Let configure detect this where supported