1 |
commit: de9d455dc27b7289fd9a135a260c731cae9f9ef4 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 6 23:01:44 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 6 23:33:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de9d455d |
7 |
|
8 |
app-arch/xz-utils: add verify-sig |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
app-arch/xz-utils/Manifest | 1 + |
13 |
app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild | 6 ++++++ |
14 |
app-arch/xz-utils/xz-utils-9999.ebuild | 9 +++++++++ |
15 |
3 files changed, 16 insertions(+) |
16 |
|
17 |
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest |
18 |
index dc2229967e78..77263933d735 100644 |
19 |
--- a/app-arch/xz-utils/Manifest |
20 |
+++ b/app-arch/xz-utils/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce |
23 |
+DIST xz-5.2.5.tar.gz.sig 566 BLAKE2B 8b40d8d7913eaebe2595ea41a735d972d1969d8b58f42b2bee6591b51e2e626473fc85d64f1bbbff3cba6b0e1b4423556d6ddaf16f646ccc18ba1bad5cf45d83 SHA512 3aa21484bef0282ed0b83e3fcd5cf3d87bf51fa68e24d55bb11f91bc96f0ac29f468949bc4c8cc20fbd6ad12f5735686fe09ee42efe2b8d728010da9668aa5a9 |
24 |
|
25 |
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild |
26 |
index c67793d89db9..57c99a21e49d 100644 |
27 |
--- a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild |
28 |
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild |
29 |
@@ -15,8 +15,13 @@ if [[ ${PV} == 9999 ]] ; then |
30 |
# bug #272880 and bug #286068 |
31 |
BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" |
32 |
else |
33 |
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc |
34 |
+ inherit verify-sig |
35 |
+ |
36 |
MY_P="${PN/-utils}-${PV/_}" |
37 |
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" |
38 |
+ SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )" |
39 |
+ |
40 |
if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then |
41 |
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" |
42 |
fi |
43 |
@@ -35,6 +40,7 @@ RDEPEND="!<app-arch/lzma-4.63 |
44 |
!<app-arch/p7zip-4.57 |
45 |
!<app-i18n/man-pages-de-2.16" |
46 |
DEPEND="${RDEPEND}" |
47 |
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )" |
48 |
|
49 |
# Tests currently do not account for smaller feature set |
50 |
RESTRICT="!extra-filters? ( test )" |
51 |
|
52 |
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild |
53 |
index c67793d89db9..0397c369c1bb 100644 |
54 |
--- a/app-arch/xz-utils/xz-utils-9999.ebuild |
55 |
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild |
56 |
@@ -15,8 +15,13 @@ if [[ ${PV} == 9999 ]] ; then |
57 |
# bug #272880 and bug #286068 |
58 |
BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" |
59 |
else |
60 |
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc |
61 |
+ inherit verify-sig |
62 |
+ |
63 |
MY_P="${PN/-utils}-${PV/_}" |
64 |
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" |
65 |
+ SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )" |
66 |
+ |
67 |
if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then |
68 |
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" |
69 |
fi |
70 |
@@ -36,6 +41,10 @@ RDEPEND="!<app-arch/lzma-4.63 |
71 |
!<app-i18n/man-pages-de-2.16" |
72 |
DEPEND="${RDEPEND}" |
73 |
|
74 |
+if [[ ${PV} != 9999 ]] ; then |
75 |
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )" |
76 |
+fi |
77 |
+ |
78 |
# Tests currently do not account for smaller feature set |
79 |
RESTRICT="!extra-filters? ( test )" |