commit: 306b9f5c24affe7980a4af447286b72a89f0192f
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Tue Mar 22 00:19:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 18:48:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306b9f5c
app-admin/sudo: Added verify-sig integration.
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/sudo/Manifest | 3 +++
app-admin/sudo/sudo-1.9.10-r1.ebuild | 12 ++++++++++--
app-admin/sudo/sudo-1.9.8_p2-r1.ebuild | 12 ++++++++++--
app-admin/sudo/sudo-1.9.9-r1.ebuild | 12 ++++++++++--
4 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index c9f961fd83ba..0bb46158608f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,4 +1,7 @@
DIST sudo-1.9.10.tar.gz 4516568 BLAKE2B
94d97379e31b41917616a829cbece3d3fce7dd6ab9d04791b928981c14249c306508298655c19dc59a054ccf7deed4e69e65367cbfe9f6d8b5aba8895cfa6064
SHA512
65cf92b67b64413cb807da8b9602fc90b75e5b30dd1402d682ca36f276a3d6209a8a59c14e463898abc9856bc56263e5ba4bb6d44774f56a2885a9eea4a35375
+DIST sudo-1.9.10.tar.gz.sig 566 BLAKE2B
808919c826faa4f63efc283461f9f2089fd745aaf7462bcc41c505e7f978e7d56307202f96548d95844c99236fec10cada8438b935a1e1b6ea3601ee857d6900
SHA512
4ea0b736783b8e7be47645f770d7684d99c31f901177d3527f1ff78f5126d41592a94d36c67762bf5cb941eed80b9f585637aaa81d7f4920576d31a83f447323
DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B
02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e
SHA512
632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
DIST sudo-1.9.8p2.tar.gz 4302256 BLAKE2B
ba40df539b3466bebe0d876ef4f1809867125e83983609eae0447f933fbd499b2eda88d2f6c475779654e68af9580a2998eca3c3f7953129ff73c923e1c88ad9
SHA512
899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3
+DIST sudo-1.9.8p2.tar.gz.sig 566 BLAKE2B
1e1cf69ea391602a214aef253a19fff2e26a908ffd9f5e54f2eeb20245f9518fde7d8417e7160b33d1067916fc7cd3df0b59e626d54d24dc8c6453a0efa95200
SHA512
18a7170a4654ff22b23181f589ae2115acd2d635d94977586aa15093bb5144f947584588ae03fc2dd941fb934fac4d9fa689b3fd5a4ef0295156e5b9772b8126
DIST sudo-1.9.9.tar.gz 4456969 BLAKE2B
1a661a24e9891c705ca1ff0ff0881be30888ac850d18478031379de6cfa10a581ee4b256fda7d8882e17c661bcaa03b1055ab0e525dc75a2b1feec2ca13283c8
SHA512
53064240431ae3d9409dc5cb7d72ab55d9ab5f802af4de99fadd987855461b3cca53f261d6256e3b6f35e30c7e162f4dfa3978ef6976415cf5be874fb2026614
+DIST sudo-1.9.9.tar.gz.sig 566 BLAKE2B
50bf100449312bc501d021b483694e2552e1f66db0fe7937281fa6a89b4131d8d3ee9560951e2ce6905e7b5ec8c68fbf9b8909475c099408f0df999e80079b0f
SHA512
a186f0acf3875347106f14e58567bb15361adb50d20310b29d9f136e900cfdbebd1674c6f4db9d0eda650c03784c77e67e20cece0e03d6bee270cf790cbaaf95
diff --git a/app-admin/sudo/sudo-1.9.10-r1.ebuild
b/app-admin/sudo/sudo-1.9.10-r1.ebuild
index 99a6793b4fc3..5c23d70b6741 100644
--- a/app-admin/sudo/sudo-1.9.10-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.10-r1.ebuild
@@ -14,13 +14,21 @@ if [[ ${PV} == "9999" ]] ; then
inherit mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo";
else
+ inherit verify-sig
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+
uri_prefix=
case ${P} in
*_beta*|*_rc*) uri_prefix=beta/ ;;
esac
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz";
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+ verify-sig? (
+
https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+ )"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
fi
@@ -58,7 +66,7 @@ RDEPEND="
selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
-BDEPEND="
+BDEPEND+="
sys-devel/bison
virtual/pkgconfig
"
diff --git a/app-admin/sudo/sudo-1.9.8_p2-r1.ebuild
b/app-admin/sudo/sudo-1.9.8_p2-r1.ebuild
index 0681ee84303b..2947d25f5b27 100644
--- a/app-admin/sudo/sudo-1.9.8_p2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.8_p2-r1.ebuild
@@ -14,13 +14,21 @@ if [[ ${PV} == "9999" ]] ; then
inherit mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo";
else
+ inherit verify-sig
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+
uri_prefix=
case ${P} in
*_beta*|*_rc*) uri_prefix=beta/ ;;
esac
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz";
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+ verify-sig? (
+
https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+ )"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
fi
@@ -58,7 +66,7 @@ RDEPEND="
selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
-BDEPEND="
+BDEPEND+="
sys-devel/bison
virtual/pkgconfig
"
diff --git a/app-admin/sudo/sudo-1.9.9-r1.ebuild
b/app-admin/sudo/sudo-1.9.9-r1.ebuild
index 99a6793b4fc3..5c23d70b6741 100644
--- a/app-admin/sudo/sudo-1.9.9-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.9-r1.ebuild
@@ -14,13 +14,21 @@ if [[ ${PV} == "9999" ]] ; then
inherit mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo";
else
+ inherit verify-sig
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+
uri_prefix=
case ${P} in
*_beta*|*_rc*) uri_prefix=beta/ ;;
esac
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz";
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+ verify-sig? (
+
https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+ )"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
fi
@@ -58,7 +66,7 @@ RDEPEND="
selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
-BDEPEND="
+BDEPEND+="
sys-devel/bison
virtual/pkgconfig
"
