commit: 0288da0b9150787ffd816cf5c62497ed2e503261
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 20:13:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 20:13:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0288da0b
app-admin/sudo: add 1.9.16_p1
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/sudo/Manifest | 2 ++
.../sudo/{sudo-9999.ebuild => sudo-1.9.16_p1.ebuild} | 18 ++++++++----------
app-admin/sudo/sudo-9999.ebuild | 18 ++++++++----------
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index f24674d78d62..fa15ed866e76 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,3 +2,5 @@ DIST sudo-1.9.15p5.tar.gz 5306611 BLAKE2B
73ee598c2a2848d5be24f97492b13eba2f326c
DIST sudo-1.9.15p5.tar.gz.sig 566 BLAKE2B
ddd8fed1b3721aafdb32b762834168063c3f0f003ef5d83f1883615320da6fe89b08d72c8e893c8b2bf9fd892a40e47cc77d72672e43b5a24db50e7194d9bc4c
SHA512
97480a3d27b546a93e997c3a1e8169904a7625ab8fa6198d0b7e1d2d040f55b2d58462cd08e5cc97c2f1c817b12343e35cdd7db207aee42785f2b95b17c600b0
DIST sudo-1.9.16.tar.gz 5392026 BLAKE2B
19daa789af3ca2c4832950f0dd6f26a97285fdc155f0d7c18ec1f1accafce9b86f2f5730d3bb0b8e7717c0c55f4079928e03acb3974cb2652c58d4bcb2f74a12
SHA512
1b0254eb5b75422bffd31a2ae8c56cb4e8e2ecc08e2fa687eddb638d4f2de2585fa7621c868c03423e9d636bfb5679a3758d504155dbdfd3eebfbdcbd8b58f7c
DIST sudo-1.9.16.tar.gz.sig 566 BLAKE2B
9eb9fd2db0de5b9ce965c2109a9722e0b5f0793b7c9003123b1540d7cb5b8178043221296fd51c7f0b24ce1b1cda9f196a6d50083da172ca2afcb8f130d8eae1
SHA512
edf066f9ffdf2653468f8b45866a65214f0dff0164318d5f6bd9252f6211e82522161b1b9621798fbc9112253e6940d7137d18e8b42e8c6e5ba52ccac64d99cf
+DIST sudo-1.9.16p1.tar.gz 5396038 BLAKE2B
7f973510658e91af54121d8c4c634b26231ef270abac50f658c9ad8a446a7dbbc44cb878561fb8da51e4ec15ebc8873fdaed05be142907f96964ff42c7e4f896
SHA512
3239d16513c431383b6d54cf40690a9b8fcf905d9b8f5a2085679dd5daeaacbd7efb153b41fd672fc634277c3203aaa1dc18e6a6c01799ebc9948763ec93a038
+DIST sudo-1.9.16p1.tar.gz.sig 566 BLAKE2B
0f68bb4a653cfaacf05d6c148f690ae0022035090e6e60df7efde6b25193ac46d12905ca898e5aadb8339ca3f08e27a4408edeb75f26f7e483f136026835aa24
SHA512
96cdd7f646d2fe7eeefce7710ba421be12a9bfd6811284ba8ccb3f7288b328531bbd7215cf0182c13670f2ec7c0ee25dfd6396214ddd61ee4ee153fec19bef7e
diff --git a/app-admin/sudo/sudo-9999.ebuild
b/app-admin/sudo/sudo-1.9.16_p1.ebuild
similarity index 96%
copy from app-admin/sudo/sudo-9999.ebuild
copy to app-admin/sudo/sudo-1.9.16_p1.ebuild
index 6e25ed577a92..5a882d3247ac 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-1.9.16_p1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools pam tmpfiles toolchain-funcs
+inherit pam tmpfiles toolchain-funcs
MY_P="${P/_/}"
MY_P="${MY_P/beta/b}"
@@ -12,11 +12,11 @@ DESCRIPTION="Allows users or groups to run commands as
other users"
HOMEPAGE="https://www.sudo.ws/";
if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
+ inherit autotools mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo";
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc
- inherit verify-sig
+ inherit libtool verify-sig
uri_prefix=
case ${P} in
@@ -86,16 +86,14 @@ REQUIRED_USE="
MAKEOPTS+=" SAMPLES="
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9.16-allow-disabling-secure-path.patch
-)
-
src_prepare() {
default
- # eautoreconf temporarily for allow-disabling-secure-path patch
- # in 1.9.16; revert to elibtoolize once that is gone.
- eautoreconf
+ if [[ ${PV} == 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
}
set_secure_path() {
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 6e25ed577a92..5a882d3247ac 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools pam tmpfiles toolchain-funcs
+inherit pam tmpfiles toolchain-funcs
MY_P="${P/_/}"
MY_P="${MY_P/beta/b}"
@@ -12,11 +12,11 @@ DESCRIPTION="Allows users or groups to run commands as
other users"
HOMEPAGE="https://www.sudo.ws/";
if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
+ inherit autotools mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo";
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc
- inherit verify-sig
+ inherit libtool verify-sig
uri_prefix=
case ${P} in
@@ -86,16 +86,14 @@ REQUIRED_USE="
MAKEOPTS+=" SAMPLES="
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9.16-allow-disabling-secure-path.patch
-)
-
src_prepare() {
default
- # eautoreconf temporarily for allow-disabling-secure-path patch
- # in 1.9.16; revert to elibtoolize once that is gone.
- eautoreconf
+ if [[ ${PV} == 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
}
set_secure_path() {
