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

2024-03-27 Thread Rick Farina
commit: 504e3442d89171f17e94bbc63cb80b6a80c047cf
Author: Christopher Fore  posteo  net>
AuthorDate: Wed Mar 27 20:04:38 2024 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Mar 28 00:41:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504e3442

sys-boot/shim: add 15.8, security bump

Also fixes some QA warnings (moves S up)

Bug: https://bugs.gentoo.org/922931
Closes: https://github.com/gentoo/gentoo/pull/35949
Signed-off-by: Christopher Fore  posteo.net>
Signed-off-by: Rick Farina  gentoo.org>

 sys-boot/shim/Manifest   |  3 +++
 sys-boot/shim/shim-15.6.ebuild   |  5 ++---
 sys-boot/shim/{shim-15.6.ebuild => shim-15.8.ebuild} | 17 -
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index 954368dcbe49..b21e245961bc 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -1,3 +1,6 @@
 DIST shim-aa64-15.6-2.aarch64.rpm 466804 BLAKE2B 
706f31835be24fee7202b8f8eb49204741d7726f106fad993ff524f475434ab3f23bebcd427f8a2aa4cd9a9c2494fdec9c2a49c29025364f0ebe989786f74c2f
 SHA512 
72c2a62f380e76c3ea0fe5b13ef4e4bcd5e62e1b26b0b277c6ed8dd5d5e76f0f92770497da09e8ce12e6c60ee57d679d134f960a10639644dd751811563f1f29
+DIST shim-aa64-15.8-3.aarch64.rpm 466590 BLAKE2B 
ebd77148d363020d14b418dbb3107981b213b39914daa80765cc2db16c7b365eaebcbcba19b88459364967f2764f417aeffd34754aa92c2efc7aaa4e9d45b712
 SHA512 
d9b879706f7f6c7f7bfea92a443191811d39835074b3b6db3979c707b406b00884baff66ac79bf9bd66869240f668c6e6f987f8954a570d648933c85ea0da1c2
 DIST shim-ia32-15.6-2.x86_64.rpm 419081 BLAKE2B 
f7160dd1330bfd7ad2d64cfe370750f576f1e3291aa8bc8313d52869f3dd23228db8514e7578c2609428479e430a1d39c1992450f4f42197216c00c420a0a150
 SHA512 
045325802474f53c6e86eff1166f1a966268c9ad706fac4c08966f211dbc32fba21ed3a07c46445ec579ac1e2819a1313ff54d6169737806954962945c61bdc2
+DIST shim-ia32-15.8-3.x86_64.rpm 422489 BLAKE2B 
00aa14d10ac0351e39f2b7bb2da6b31e048757ee9413b73f5a1638688e2b242c161b39b5d897c9414e435caab13456763dbe2c6bc46061ab3c29e14ab487e587
 SHA512 
10ef47014637f9df9f199d90e3869e96341723c23628cfd22465638028cc38b006a003c41ea7fd7f1885e4cb573a2f23034a237ea03ba231f8f0d37573bb2e23
 DIST shim-x64-15.6-2.x86_64.rpm 479835 BLAKE2B 
7d12b97275c25659f94a8dd4c8678eb7df9e11fd3258966cb65c762467f28744b9403e13d5b5c98d6d6a5244ce4d81ef31b9d802040be99da03c1bb56be21275
 SHA512 
971978bddee95a6a134ef05c4d88cf5df41926e631de863b74ef772307f3e106c82c8f6889c18280d47187986abd774d8671c5be4b85b1b0bb3d1858b65d02cf
+DIST shim-x64-15.8-3.x86_64.rpm 478432 BLAKE2B 
cf1a032af75fc17e09444aae488c2921a8f0868d91ceb427835cd0378f6c7369e223b7fc08f0a596774b374e3f800b9ec941792e522d8c5281a395cf800c642a
 SHA512 
4c3635d82980ccb604b568f072f30ac0c0055c6ed2985dade6a28c9070852a240bb33f15f9ef42c83fa46d212c18ae6f17abca9f3adda0a332b908ceda537e87

diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
index c4f33913bd22..fc117bf9f5c5 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,13 +12,12 @@ SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_6
x86? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm

https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm
 )
arm64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/aarch64/shim-aa64-${PV}-2.aarch64.rpm
 )"
+S="${WORKDIR}/boot/efi/EFI"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 
-S="${WORKDIR}/boot/efi/EFI"
-
 src_install() {
insinto /usr/share/${PN}
doins BOOT/BOOT*.EFI

diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.8.ebuild
similarity index 64%
copy from sys-boot/shim/shim-15.6.ebuild
copy to sys-boot/shim/shim-15.8.ebuild
index c4f33913bd22..cc0241858af6 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,17 +7,16 @@ inherit rpm secureboot
 
 DESCRIPTION="Fedora's signed UEFI shim"
 HOMEPAGE="https://src.fedoraproject.org/rpms/shim;
-SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm
-   
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm
 )
-   x86? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm
-   
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm
 

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

2023-07-20 Thread Andrew Ammerlaan
commit: 62abff9d0e4a8fef2be0184cff5e32ab7a50d315
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Jul 12 07:32:05 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jul 20 11:32:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62abff9d

sys-boot/shim: use secureboot.eclass to sign mokmanager

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sys-boot/shim/shim-15.6.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
index 21fc211e6607..c4f33913bd22 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit rpm
+inherit rpm secureboot
 
 DESCRIPTION="Fedora's signed UEFI shim"
 HOMEPAGE="https://src.fedoraproject.org/rpms/shim;
@@ -23,4 +23,8 @@ src_install() {
insinto /usr/share/${PN}
doins BOOT/BOOT*.EFI
doins fedora/mm*.efi
+
+   # Shim is already signed with Microsoft keys, but MokManager still needs
+   # signing with our key otherwise we have to enrol the Fedora key in Mok 
list
+   secureboot_auto_sign --in-place
 }



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

2022-10-28 Thread Sam James
commit: 2d20c4b21fabfc62559c8f4bdfdc1de9fe46c09e
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 21:00:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 21:00:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d20c4b2

sys-boot/shim: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-boot/shim/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-boot/shim/metadata.xml b/sys-boot/shim/metadata.xml
index 5589f7dfd343..be6f6f5712cf 100644
--- a/sys-boot/shim/metadata.xml
+++ b/sys-boot/shim/metadata.xml
@@ -7,5 +7,6 @@


cpe:/a:redhat:shim
+   rhboot/shim

 



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

2022-10-28 Thread Sam James
commit: 5816f4c5b86eb301d4b909cbdc2efb1a8b7b40c0
Author: kochera  google  com>
AuthorDate: Fri Oct 28 20:46:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 20:58:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5816f4c5

sys-boot/shim: Add cpe_uri for shim package.

Signed-off-by: Michael Kochera  google.com>
Closes: https://github.com/gentoo/gentoo/pull/28013
Signed-off-by: Sam James  gentoo.org>

 sys-boot/shim/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-boot/shim/metadata.xml b/sys-boot/shim/metadata.xml
index 97eff4632a18..5589f7dfd343 100644
--- a/sys-boot/shim/metadata.xml
+++ b/sys-boot/shim/metadata.xml
@@ -5,4 +5,7 @@
zeroch...@gentoo.org
Rick Farina

+   
+   cpe:/a:redhat:shim
+   
 



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

2022-09-15 Thread Andreas Sturmlechner
commit: 62119188715e1e6a09b4206c86548de05f68775c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 15 12:52:05 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 15 15:10:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62119188

sys-boot/shim: drop 15.5-r1

Closes: https://bugs.gentoo.org/867562
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sys-boot/shim/Manifest|  3 ---
 sys-boot/shim/shim-15.5-r1.ebuild | 28 
 2 files changed, 31 deletions(-)

diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index a622652fa023..954368dcbe49 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -1,6 +1,3 @@
-DIST shim-aa64-15-5.aarch64.rpm 397028 BLAKE2B 
4e89dd2029238e9b455c469b2857610bfa0d686c43a6f93b7daa70625317c68552967e6761e2c4912b098880c2ccf04278736ca51b7c2e95bcfc700a716bf69d
 SHA512 
1d27ec70bf8b18777bb38cec6769172bd56aa72e9f910e9fa21039dc1c133ebf789fe46fbfe079df6167c3982f6c47bdcad26d3175d6cf9494f89dc9a8a0c823
 DIST shim-aa64-15.6-2.aarch64.rpm 466804 BLAKE2B 
706f31835be24fee7202b8f8eb49204741d7726f106fad993ff524f475434ab3f23bebcd427f8a2aa4cd9a9c2494fdec9c2a49c29025364f0ebe989786f74c2f
 SHA512 
72c2a62f380e76c3ea0fe5b13ef4e4bcd5e62e1b26b0b277c6ed8dd5d5e76f0f92770497da09e8ce12e6c60ee57d679d134f960a10639644dd751811563f1f29
-DIST shim-ia32-15-5.x86_64.rpm 1026312 BLAKE2B 
42f01463b0da1edbb2ae7379e63b79cea84208ef7ce069c3753bad2f232cb156d73e16864da279c31e8f8f25daa01d6ccc16a6fd13daa286d88460232f9b
 SHA512 
a5d297265480b6a77f05050ecb31b31d2275df0b2f9bfa5ef1a4851163501f295fb81c142aa9fd30826b9e001f876c3d864b3d7b2f89575e6839f3939bca4755
 DIST shim-ia32-15.6-2.x86_64.rpm 419081 BLAKE2B 
f7160dd1330bfd7ad2d64cfe370750f576f1e3291aa8bc8313d52869f3dd23228db8514e7578c2609428479e430a1d39c1992450f4f42197216c00c420a0a150
 SHA512 
045325802474f53c6e86eff1166f1a966268c9ad706fac4c08966f211dbc32fba21ed3a07c46445ec579ac1e2819a1313ff54d6169737806954962945c61bdc2
-DIST shim-x64-15-5.x86_64.rpm 669944 BLAKE2B 
25d7fb6a4869212610158313f9b8d55f102d6d4e8fc562a43b4654e29fcdb6cef4ba4421d56afb1ad98b7df1c7fe121558a757f06db86cc391ea0ad3e2f9982e
 SHA512 
4888e9422d71f4f8f05343e8dc161f8e48a31ba28469fe3671ce20283e5f7fced656f2d0583d76532dddecc49c2a8504a504b5da951a1e2c6302bf38fac5048e
 DIST shim-x64-15.6-2.x86_64.rpm 479835 BLAKE2B 
7d12b97275c25659f94a8dd4c8678eb7df9e11fd3258966cb65c762467f28744b9403e13d5b5c98d6d6a5244ce4d81ef31b9d802040be99da03c1bb56be21275
 SHA512 
971978bddee95a6a134ef05c4d88cf5df41926e631de863b74ef772307f3e106c82c8f6889c18280d47187986abd774d8671c5be4b85b1b0bb3d1858b65d02cf

diff --git a/sys-boot/shim/shim-15.5-r1.ebuild 
b/sys-boot/shim/shim-15.5-r1.ebuild
deleted file mode 100644
index 0cb553a678af..
--- a/sys-boot/shim/shim-15.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm
-
-DESCRIPTION="Fedora's signed UEFI shim"
-HOMEPAGE="https://apps.fedoraproject.org/packages/shim/;
-MY_PV="${PV/./-}"
-SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
-   
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm
 )
-   x86? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
-   
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm
 )
-   arm64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm
 )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-S="${WORKDIR}/boot/efi/EFI"
-
-src_install() {
-   insinto /usr/share/${PN}
-   doins BOOT/BOOT*.EFI
-   doins fedora/mm*.efi
-}



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

2022-09-15 Thread Sam James
commit: 0010f8809b3d7dc77fac9fab6aa9734713813c1c
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 15 11:30:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 15 11:30:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0010f880

sys-boot/shim: Stabilize 15.6 x86, #867562

Signed-off-by: Sam James  gentoo.org>

 sys-boot/shim/shim-15.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
index d7922551eca9..21fc211e6607 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_6
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 S="${WORKDIR}/boot/efi/EFI"
 



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

2022-09-15 Thread Agostino Sarubbo
commit: 7f42b1ba859e0ee155cd43baa6c85fc96051fce9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep 15 06:46:45 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep 15 06:46:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f42b1ba

sys-boot/shim: Stabilize 15.6 amd64, #867562

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-boot/shim/shim-15.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
index d2a53a4b8611..d7922551eca9 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_6
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 S="${WORKDIR}/boot/efi/EFI"
 



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

2022-09-14 Thread Sam James
commit: ee408afc2e2c9b657c331c52566779ec69942102
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 14 22:10:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 14 22:10:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee408afc

sys-boot/shim: Stabilize 15.6 arm64, #867562

Signed-off-by: Sam James  gentoo.org>

 sys-boot/shim/shim-15.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
index 30c5747e54d4..d2a53a4b8611 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_6
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 S="${WORKDIR}/boot/efi/EFI"
 



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

2022-07-12 Thread Rick Farina
commit: 4ab4aacf953585804ca6fb7e8a94cf74fc5cc1c9
Author: Mathieu Strypsteen  strypsteen  me>
AuthorDate: Tue Jul 12 16:59:23 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Jul 12 18:27:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab4aacf

sys-boot/shim: add 15.6

Signed-off-by: Mathieu Strypsteen  strypsteen.me>
Signed-off-by: Rick Farina  gentoo.org>

 sys-boot/shim/Manifest |  3 +++
 sys-boot/shim/shim-15.6.ebuild | 26 ++
 2 files changed, 29 insertions(+)

diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index 1271dd5a569d..a622652fa023 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -1,3 +1,6 @@
 DIST shim-aa64-15-5.aarch64.rpm 397028 BLAKE2B 
4e89dd2029238e9b455c469b2857610bfa0d686c43a6f93b7daa70625317c68552967e6761e2c4912b098880c2ccf04278736ca51b7c2e95bcfc700a716bf69d
 SHA512 
1d27ec70bf8b18777bb38cec6769172bd56aa72e9f910e9fa21039dc1c133ebf789fe46fbfe079df6167c3982f6c47bdcad26d3175d6cf9494f89dc9a8a0c823
+DIST shim-aa64-15.6-2.aarch64.rpm 466804 BLAKE2B 
706f31835be24fee7202b8f8eb49204741d7726f106fad993ff524f475434ab3f23bebcd427f8a2aa4cd9a9c2494fdec9c2a49c29025364f0ebe989786f74c2f
 SHA512 
72c2a62f380e76c3ea0fe5b13ef4e4bcd5e62e1b26b0b277c6ed8dd5d5e76f0f92770497da09e8ce12e6c60ee57d679d134f960a10639644dd751811563f1f29
 DIST shim-ia32-15-5.x86_64.rpm 1026312 BLAKE2B 
42f01463b0da1edbb2ae7379e63b79cea84208ef7ce069c3753bad2f232cb156d73e16864da279c31e8f8f25daa01d6ccc16a6fd13daa286d88460232f9b
 SHA512 
a5d297265480b6a77f05050ecb31b31d2275df0b2f9bfa5ef1a4851163501f295fb81c142aa9fd30826b9e001f876c3d864b3d7b2f89575e6839f3939bca4755
+DIST shim-ia32-15.6-2.x86_64.rpm 419081 BLAKE2B 
f7160dd1330bfd7ad2d64cfe370750f576f1e3291aa8bc8313d52869f3dd23228db8514e7578c2609428479e430a1d39c1992450f4f42197216c00c420a0a150
 SHA512 
045325802474f53c6e86eff1166f1a966268c9ad706fac4c08966f211dbc32fba21ed3a07c46445ec579ac1e2819a1313ff54d6169737806954962945c61bdc2
 DIST shim-x64-15-5.x86_64.rpm 669944 BLAKE2B 
25d7fb6a4869212610158313f9b8d55f102d6d4e8fc562a43b4654e29fcdb6cef4ba4421d56afb1ad98b7df1c7fe121558a757f06db86cc391ea0ad3e2f9982e
 SHA512 
4888e9422d71f4f8f05343e8dc161f8e48a31ba28469fe3671ce20283e5f7fced656f2d0583d76532dddecc49c2a8504a504b5da951a1e2c6302bf38fac5048e
+DIST shim-x64-15.6-2.x86_64.rpm 479835 BLAKE2B 
7d12b97275c25659f94a8dd4c8678eb7df9e11fd3258966cb65c762467f28744b9403e13d5b5c98d6d6a5244ce4d81ef31b9d802040be99da03c1bb56be21275
 SHA512 
971978bddee95a6a134ef05c4d88cf5df41926e631de863b74ef772307f3e106c82c8f6889c18280d47187986abd774d8671c5be4b85b1b0bb3d1858b65d02cf

diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
new file mode 100644
index ..30c5747e54d4
--- /dev/null
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+DESCRIPTION="Fedora's signed UEFI shim"
+HOMEPAGE="https://src.fedoraproject.org/rpms/shim;
+SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm
+   
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm
 )
+   x86? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm
+   
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm
 )
+   arm64? ( 
https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/aarch64/shim-aa64-${PV}-2.aarch64.rpm
 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+S="${WORKDIR}/boot/efi/EFI"
+
+src_install() {
+   insinto /usr/share/${PN}
+   doins BOOT/BOOT*.EFI
+   doins fedora/mm*.efi
+}



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

2018-08-15 Thread Ben Kohler
commit: 29cfaa80ca47f8feef43d7e5fa824293030d52d7
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Aug 15 16:49:41 2018 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Aug 15 16:50:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29cfaa80

sys-boot/shim: stable on amd64 arm64 x86

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 sys-boot/shim/shim-15.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/shim/shim-15.5-r1.ebuild 
b/sys-boot/shim/shim-15.5-r1.ebuild
index 2d159131085..0cb553a678a 100644
--- a/sys-boot/shim/shim-15.5-r1.ebuild
+++ b/sys-boot/shim/shim-15.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 S="${WORKDIR}/boot/efi/EFI"



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

2018-07-30 Thread Richard Farina
commit: 4bb0ef3b3d20561d8877fc042584ce716206aa88
Author: Zero_Chaos  gentoo  org>
AuthorDate: Mon Jul 30 19:55:23 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Mon Jul 30 19:55:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb0ef3b

sys-boot/shim: 32 bit user != 32 bit system

users may wish to run 32 bit despite system being 64 bit, so just
install both

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 sys-boot/shim/{shim-15.5.ebuild => shim-15.5-r1.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-boot/shim/shim-15.5.ebuild b/sys-boot/shim/shim-15.5-r1.ebuild
similarity index 81%
rename from sys-boot/shim/shim-15.5.ebuild
rename to sys-boot/shim/shim-15.5-r1.ebuild
index e946b3ad5dc..2d159131085 100644
--- a/sys-boot/shim/shim-15.5.ebuild
+++ b/sys-boot/shim/shim-15.5-r1.ebuild
@@ -10,8 +10,9 @@ HOMEPAGE="https://apps.fedoraproject.org/packages/shim/;
 MY_PV="${PV/./-}"
 SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm

https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm
 )
-   arm64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm
 )
-   x86? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm
 )"
+   x86? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
+   
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm
 )
+   arm64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm
 )"
 
 LICENSE="BSD"
 SLOT="0"



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

2018-06-19 Thread Richard Farina
commit: 90b8a747344b8962217678070497af87f5ee0da6
Author: Zero_Chaos  gentoo  org>
AuthorDate: Tue Jun 19 20:57:45 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Tue Jun 19 20:58:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b8a747

sys-boot/shim: sh

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-boot/shim/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys-boot/shim/metadata.xml b/sys-boot/shim/metadata.xml
index f513208bf39..2b9b4266ca5 100644
--- a/sys-boot/shim/metadata.xml
+++ b/sys-boot/shim/metadata.xml
@@ -5,6 +5,4 @@
zeroch...@gentoo.org
Rick Farina

-   
-   
 



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

2018-06-18 Thread Richard Farina
commit: 5a011fe958e8db4f8677209480a0521e6f5097f9
Author: Zero_Chaos  gentoo  org>
AuthorDate: Tue Jun 19 03:09:29 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Tue Jun 19 03:09:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a011fe9

sys-boot/shim: fix src_uri

duplicate a line so amd64 also gets x86 version but arm64 does not.
some bios makers save money by putting a 32 bit uefi on a 64 bit system

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-boot/shim/shim-15.5.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-boot/shim/shim-15.5.ebuild b/sys-boot/shim/shim-15.5.ebuild
index 704138381a9..e946b3ad5dc 100644
--- a/sys-boot/shim/shim-15.5.ebuild
+++ b/sys-boot/shim/shim-15.5.ebuild
@@ -8,9 +8,10 @@ inherit rpm
 DESCRIPTION="Fedora's signed UEFI shim"
 HOMEPAGE="https://apps.fedoraproject.org/packages/shim/;
 MY_PV="${PV/./-}"
-SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
 )
+SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
+   
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm
 )
arm64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm
 )
-   
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm;
+   x86? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm
 )"
 
 LICENSE="BSD"
 SLOT="0"



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

2018-06-18 Thread Richard Farina
commit: e635fb1a92428c291737544019d9ba4e3e0bc012
Author: Zero_Chaos  gentoo  org>
AuthorDate: Tue Jun 19 02:58:19 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Tue Jun 19 02:58:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e635fb1a

sys-boot/shim: initial commit, seems to work

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-boot/shim/Manifest |  3 +++
 sys-boot/shim/metadata.xml | 10 ++
 sys-boot/shim/shim-15.5.ebuild | 26 ++
 3 files changed, 39 insertions(+)

diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
new file mode 100644
index 000..1271dd5a569
--- /dev/null
+++ b/sys-boot/shim/Manifest
@@ -0,0 +1,3 @@
+DIST shim-aa64-15-5.aarch64.rpm 397028 BLAKE2B 
4e89dd2029238e9b455c469b2857610bfa0d686c43a6f93b7daa70625317c68552967e6761e2c4912b098880c2ccf04278736ca51b7c2e95bcfc700a716bf69d
 SHA512 
1d27ec70bf8b18777bb38cec6769172bd56aa72e9f910e9fa21039dc1c133ebf789fe46fbfe079df6167c3982f6c47bdcad26d3175d6cf9494f89dc9a8a0c823
+DIST shim-ia32-15-5.x86_64.rpm 1026312 BLAKE2B 
42f01463b0da1edbb2ae7379e63b79cea84208ef7ce069c3753bad2f232cb156d73e16864da279c31e8f8f25daa01d6ccc16a6fd13daa286d88460232f9b
 SHA512 
a5d297265480b6a77f05050ecb31b31d2275df0b2f9bfa5ef1a4851163501f295fb81c142aa9fd30826b9e001f876c3d864b3d7b2f89575e6839f3939bca4755
+DIST shim-x64-15-5.x86_64.rpm 669944 BLAKE2B 
25d7fb6a4869212610158313f9b8d55f102d6d4e8fc562a43b4654e29fcdb6cef4ba4421d56afb1ad98b7df1c7fe121558a757f06db86cc391ea0ad3e2f9982e
 SHA512 
4888e9422d71f4f8f05343e8dc161f8e48a31ba28469fe3671ce20283e5f7fced656f2d0583d76532dddecc49c2a8504a504b5da951a1e2c6302bf38fac5048e

diff --git a/sys-boot/shim/metadata.xml b/sys-boot/shim/metadata.xml
new file mode 100644
index 000..f513208bf39
--- /dev/null
+++ b/sys-boot/shim/metadata.xml
@@ -0,0 +1,10 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   zeroch...@gentoo.org
+   Rick Farina
+   
+   
+   
+

diff --git a/sys-boot/shim/shim-15.5.ebuild b/sys-boot/shim/shim-15.5.ebuild
new file mode 100644
index 000..704138381a9
--- /dev/null
+++ b/sys-boot/shim/shim-15.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm
+
+DESCRIPTION="Fedora's signed UEFI shim"
+HOMEPAGE="https://apps.fedoraproject.org/packages/shim/;
+MY_PV="${PV/./-}"
+SRC_URI="amd64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
 )
+   arm64? ( 
https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm
 )
+   
https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/boot/efi/EFI"
+
+src_install() {
+   insinto /usr/share/${PN}
+   doins BOOT/BOOT*.EFI
+   doins fedora/mm*.efi
+}