summaryrefslogtreecommitdiff
path: root/app-admin/sudo
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/sudo')
-rw-r--r--app-admin/sudo/Manifest8
-rw-r--r--app-admin/sudo/sudo-1.8.23-r2.ebuild (renamed from app-admin/sudo/sudo-1.8.24_beta4.ebuild)45
-rw-r--r--app-admin/sudo/sudo-1.8.24.ebuild (renamed from app-admin/sudo/sudo-1.8.23.ebuild)78
-rw-r--r--app-admin/sudo/sudo-9999.ebuild17
4 files changed, 88 insertions, 60 deletions
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d81016729e0a..3daf620dccd9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,9 +1,9 @@
DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
-DIST sudo-1.8.24b4.tar.gz 3167803 BLAKE2B 03e4ca426ee000d9a4ae8eb020fa081e0580634f036923cf3107c44dc18be7c5fa82169430c82f2b4d2d6dbe5041a63ecd4f91d6e0cb28cce9a94b1ed48fbc4a SHA512 743adfcc7fd5bfe838dfcd362ffe8daca54964d74318732cfe068e0331aa07feb8b3b9e6a98f4616b49b19f076a43dd62c068b6bde2cb24fa4f2b8657ddc215d
+DIST sudo-1.8.24.tar.gz 3175719 BLAKE2B 61fc469e2d8146b8bb59709192dc33828f0065d4dcf9625e72ae1da9a2c1d6925a0201e5999e146e2e15f5a103ad5690a88fcabb75f57e76b779fe07de53b459 SHA512 ec6295a456a300e81ea2356080d51a57e3eb5d8070d8aab228cece0100ef54954f6c3dd458316b0c2da6839c0d8dab7cdc1a360aceb2594641e064465ecb1ee8
EBUILD sudo-1.8.22-r2.ebuild 5990 BLAKE2B 3e9d5827271f71362f4e3a9664e6f22437764a49fd2c20c79d2e8c211058627bf288b885b65a8a3ca4768460074871d0269c13cddd186605f063bbffa7d39f50 SHA512 a165bdbca3ce48e969bfa9fc2d8d1768343fd3570735ab874237c0a0378fd0b3ec64820586d9040fe4ad19ae91ddad0a62e04626e3c4b38c336a44bce47b7690
EBUILD sudo-1.8.23-r1.ebuild 6154 BLAKE2B ca5c41cb76ca84b961cd1397bcf7914285347a32cc3a0bfe8385b0441e61e1995dc10c80b237cd55690f3f4e030f0c9ce0697b35bd79a37dc040a0de8f7e51d1 SHA512 08c9ca2d25a364a24325af96536996ce297c099e3632a4316467ec8abe5c27578e376607eee94a57c7a4c4ca444db4ca33879af9b745472ffb8766c48aeafa4e
-EBUILD sudo-1.8.23.ebuild 5962 BLAKE2B e65fc8e35531d64bd7ad8bc3954018164359513b54b2868f2215006a4dcc907d1355fec8c1b3327fae57f2642e72e99ed11709281a88579d68c53629bcf5841f SHA512 a83a23a13b892f661bfd467078e2b390d455d2e3228d60e1045a58091724c6939daa063549a66b669b8240d90cf69bb28812d5b9db91ffd34acf17bb005afa4c
-EBUILD sudo-1.8.24_beta4.ebuild 6154 BLAKE2B ca5c41cb76ca84b961cd1397bcf7914285347a32cc3a0bfe8385b0441e61e1995dc10c80b237cd55690f3f4e030f0c9ce0697b35bd79a37dc040a0de8f7e51d1 SHA512 08c9ca2d25a364a24325af96536996ce297c099e3632a4316467ec8abe5c27578e376607eee94a57c7a4c4ca444db4ca33879af9b745472ffb8766c48aeafa4e
-EBUILD sudo-9999.ebuild 6295 BLAKE2B e89dc623a7ada1424bedc74284b9acfa1f377ff4265a88dce4025c82f4cfe8b46a95b2c8c6d81e35b24f3b5f9386debfd1a1999a43c61a569bce7f30055f3138 SHA512 42fdb1275318ed17354ecf4765c5ce1cc4dbcdd2149f007bb48cccb01306f1b779f10ad62be60b4bd680b045d3e59bebe8f4a9cacdc99614f8f60be7a232b7b3
+EBUILD sudo-1.8.23-r2.ebuild 6366 BLAKE2B 54ac988d6be3e7e93dc13a45ada40a627e3ffeff4515d181a18ea9b2ad411d4c2a9e107fe718217668033bedec23e57216d4295d0df12c40ff5871c3ae9f9ec0 SHA512 3e7b3f21c550724a6ed048b0639d2630015c401dbe8c51d31310a26394b1a371ab18e438dc13357ff82b05715443f24f6cb42b1daac7ec5cc9d3776d6cbc96d7
+EBUILD sudo-1.8.24.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
+EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.24_beta4.ebuild b/app-admin/sudo/sudo-1.8.23-r2.ebuild
index 8e7d28d69bd5..797af1bfd337 100644
--- a/app-admin/sudo/sudo-1.8.24_beta4.ebuild
+++ b/app-admin/sudo/sudo-1.8.23-r2.ebuild
@@ -3,7 +3,11 @@
EAPI=6
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+ inherit mercurial
+fi
MY_P=${P/_/}
MY_P=${MY_P/beta/b}
@@ -15,37 +19,39 @@ esac
DESCRIPTION="Allows users or groups to run commands as other users"
HOMEPAGE="https://www.sudo.ws/"
-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"
+if [[ ${PV} != "9999" ]] ; then
+ 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"
+ if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+ fi
+fi
# Basic license is ISC-style as-is, some files are released under
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
-fi
-IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
CDEPEND="
+ sys-libs/zlib:=
gcrypt? ( dev-libs/libgcrypt:= )
- openssl? ( dev-libs/openssl:0= )
- pam? ( virtual/pam )
- sasl? ( dev-libs/cyrus-sasl )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- sys-libs/zlib
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
"
RDEPEND="
${CDEPEND}
- selinux? ( sec-policy/selinux-sudo )
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
>=app-misc/editor-wrapper-3
virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
DEPEND="
@@ -126,10 +132,11 @@ src_configure() {
# basing off other values.
myeconfargs=(
--enable-zlib=system
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
--with-secure-path="${SECURE_PATH}"
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
@@ -179,12 +186,14 @@ src_install() {
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
- # Don't install into /var/run as that is a tmpfs most of the time
+ # Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
- rm -rf "${ED}"/var/run
+ rm -rf "${ED%/}"/run
}
pkg_postinst() {
+ tmpfiles_process sudo.conf
+
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
diff --git a/app-admin/sudo/sudo-1.8.23.ebuild b/app-admin/sudo/sudo-1.8.24.ebuild
index b67fefb0afb3..f4ab4527b4fc 100644
--- a/app-admin/sudo/sudo-1.8.23.ebuild
+++ b/app-admin/sudo/sudo-1.8.24.ebuild
@@ -3,7 +3,11 @@
EAPI=6
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+ inherit mercurial
+fi
MY_P=${P/_/}
MY_P=${MY_P/beta/b}
@@ -15,37 +19,39 @@ esac
DESCRIPTION="Allows users or groups to run commands as other users"
HOMEPAGE="https://www.sudo.ws/"
-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"
+if [[ ${PV} != "9999" ]] ; then
+ 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"
+ if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+ fi
+fi
# Basic license is ISC-style as-is, some files are released under
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
-fi
-IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
CDEPEND="
+ sys-libs/zlib:=
gcrypt? ( dev-libs/libgcrypt:= )
- openssl? ( dev-libs/openssl:0= )
- pam? ( virtual/pam )
- sasl? ( dev-libs/cyrus-sasl )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- sys-libs/zlib
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
"
RDEPEND="
${CDEPEND}
- selinux? ( sec-policy/selinux-sudo )
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
>=app-misc/editor-wrapper-3
virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
DEPEND="
@@ -68,16 +74,23 @@ src_prepare() {
elibtoolize
}
-set_rootpath() {
- # FIXME: secure_path is a compile time setting. using ROOTPATH
- # is not perfect, env-update may invalidate this, but until it
+set_secure_path() {
+ # FIXME: secure_path is a compile time setting. using PATH or
+ # ROOTPATH is not perfect, env-update may invalidate this, but until it
# is available as a sudoers setting this will have to do.
einfo "Setting secure_path ..."
# first extract the default ROOTPATH from build env
- ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
- if [[ -z ${ROOTPATH} ]] ; then
- ewarn " Failed to find ROOTPATH, please report this"
+ SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+ echo "${ROOTPATH}")
+ case "${SECURE_PATH}" in
+ */usr/sbin*) ;;
+ *) SECURE_PATH=$(unset PATH;
+ . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+ ;;
+ esac
+ if [[ -z ${SECURE_PATH} ]] ; then
+ ewarn " Failed to detect SECURE_PATH, please report this"
fi
# then remove duplicate path entries
@@ -90,18 +103,18 @@ set_rootpath() {
einfo " Duplicate entry ${thisp} removed..."
fi
done
- ROOTPATH=${newpath#:}
+ SECURE_PATH=${newpath#:}
}
- cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
# finally, strip gcc paths #136027
rmpath() {
local e newpath thisp IFS=:
- for thisp in ${ROOTPATH} ; do
+ for thisp in ${SECURE_PATH} ; do
for e ; do [[ $thisp == $e ]] && continue 2 ; done
newpath+=:$thisp
done
- ROOTPATH=${newpath#:}
+ SECURE_PATH=${newpath#:}
}
rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
@@ -109,8 +122,8 @@ set_rootpath() {
}
src_configure() {
- local ROOTPATH
- set_rootpath
+ local SECURE_PATH
+ set_secure_path
# audit: somebody got to explain me how I can test this before I
# enable it.. - Diego
@@ -119,11 +132,12 @@ src_configure() {
# basing off other values.
myeconfargs=(
--enable-zlib=system
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
- --with-secure-path="${ROOTPATH}"
+ --with-rundir="${EPREFIX}"/run/sudo
+ --with-secure-path="${SECURE_PATH}"
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
--without-opie
@@ -172,12 +186,14 @@ src_install() {
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
- # Don't install into /var/run as that is a tmpfs most of the time
+ # Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
- rm -rf "${ED}"/var/run
+ rm -rf "${ED%/}"/run
}
pkg_postinst() {
+ tmpfiles_process sudo.conf
+
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index bfac67e52acd..f4ab4527b4fc 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool tmpfiles
if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
inherit mercurial
@@ -31,15 +31,15 @@ fi
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-IUSE="gcrypt ldap nls openssl offensive pam sasl selinux +sendmail skey"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
CDEPEND="
- sys-libs/zlib
+ sys-libs/zlib:=
+ gcrypt? ( dev-libs/libgcrypt:= )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- gcrypt? ( dev-libs/libgcrypt:= )
openssl? ( dev-libs/openssl:0= )
pam? ( virtual/pam )
sasl? ( dev-libs/cyrus-sasl )
@@ -132,10 +132,11 @@ src_configure() {
# basing off other values.
myeconfargs=(
--enable-zlib=system
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
--with-secure-path="${SECURE_PATH}"
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
@@ -185,12 +186,14 @@ src_install() {
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
- # Don't install into /var/run as that is a tmpfs most of the time
+ # Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
- rm -rf "${ED}"/var/run
+ rm -rf "${ED%/}"/run
}
pkg_postinst() {
+ tmpfiles_process sudo.conf
+
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then