[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

[Mike Gilbert]

commit:     223832ac2853b44276ec706d9ff81f8950324f08
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Jul 29 23:19:30 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 16:40:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223832ac

sys-boot/grub: add verify-sig to 2.12_rc1

Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/grub/Manifest                |  1 +
 sys-boot/grub/grub-2.12_rc1-r1.ebuild | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 6c70d9827749..b8d653465d43 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -2,5 +2,6 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B 
c8904f3cd5a49370a7dc10e456684c88aea
 DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B 
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
 SHA512 
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
 SHA512 
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
 DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B 
edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557
 SHA512 
6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
+DIST grub-2.12~rc1.tar.xz.sig 566 BLAKE2B 
4b0563623498d06f512d29d9a84a4f8386e7d5adf257d0f2ea8f3301e5112b7ad669741d78519dfa35d16e7f1695b0c74740d679f07e41774ecc8910c3f6bc5c
 SHA512 
b8b3c818679b50810e2d9e597a01c34b05fbc1218a88bdf35aaec798ce29b376c7aa696c50233d416306a480f6ee602dfcbe7eaf481c503f3c203a7b8e8db7a2
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
 SHA512 
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
 DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 
81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca
 SHA512 
0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b

diff --git a/sys-boot/grub/grub-2.12_rc1-r1.ebuild 
b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
index ba4eb3b5a34b..6ca17da64561 100644
--- a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
@@ -23,6 +23,7 @@ fi
 
 PYTHON_COMPAT=( python3_{9..11} )
 WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dkiper.gpg
 
 if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
        inherit python-any-r1
@@ -32,16 +33,23 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
        inherit autotools
 fi
 
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs 
verify-sig
 
+MY_P=${P}
 if [[ ${PV} != 9999 ]]; then
        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"
@@ -107,6 +115,7 @@ BDEPEND="
                virtual/pkgconfig
        )
        truetype? ( virtual/pkgconfig )
+       verify-sig? ( sec-keys/openpgp-keys-danielkiper )
 "
 DEPEND="
        app-arch/xz-utils
@@ -150,6 +159,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
 }