diff options
Diffstat (limited to 'app-admin/sudo')
-rw-r--r-- | app-admin/sudo/Manifest | 10 | ||||
-rw-r--r-- | app-admin/sudo/sudo-1.8.31_p2.ebuild (renamed from app-admin/sudo/sudo-1.9.1.ebuild) | 41 | ||||
-rw-r--r-- | app-admin/sudo/sudo-1.9.2.ebuild (renamed from app-admin/sudo/sudo-1.9.0-r1.ebuild) | 5 | ||||
-rw-r--r-- | app-admin/sudo/sudo-9999.ebuild | 2 |
4 files changed, 32 insertions, 26 deletions
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 1866b73319b8..f96f47e02bb5 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,10 +1,10 @@ DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075a00c3e0d338c9892570a416a2b3a8f19940c0893715f4eeab991e804831a87ef656ffd91e7f1ba047c119261 SHA512 b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a DIST sudo-1.8.31p1.tar.gz 3351312 BLAKE2B 85775ef574a3a1a9cc749809fe81f8350f7a4e3f46a905bc3392790b20bb7bc8e3c99fb504e01776f3a92aa6afa7972d3ff1c071aadd3a08ee1d2281f8b9ba50 SHA512 9344fd1d8a8445e8afb9c5628cdc832fe32ea29199f071f35fb6ec694371801556df560f4382afec199f468b1f3264ad5e3a89e964612e571b8d911f823724cc -DIST sudo-1.9.0.tar.gz 3743850 BLAKE2B 47d557afb13eee300d379ae31aae34cf7cf1e5ad140c6d7e599f687cca2cc259ec17f9ec0b3ca6f0badef81bb6e9d659e3e2bb77d9994218a9a3d88ec7ff2c19 SHA512 f2a191ea5fc65865718b110d4aca187cb5e2cd55c9c891fab32f21401e56f825f34c373e346c55c64fa49cec4d802efb63ccebf3d4a4e31d9a433077daf013b1 -DIST sudo-1.9.1.tar.gz 3834744 BLAKE2B 835eaae5b61627da65f40f04646b261093c56f77bdfb1b64f746e569a4bfafcfbb31d88ab301bf8544a8714f43d3416a792ee8b0fdcb75d81dbc6fcf29551f0b SHA512 7994c7d8f020188eda51787bb5f6fe7668518cc89b711e7840470db7e5bac1219490ffccc73854fecb14ceb3ffaf0fc605f3438c87b83f27921ea3626365105c +DIST sudo-1.8.31p2.tar.gz 3353538 BLAKE2B 274c72232e18c8ff5006b61ad4d384582ec0296af6326377f08ff4e59c6a4a4fc5e2245874bf9a7c6b010addae600dd41f042660d5bf9c4bc8eb98983704a5da SHA512 ad1bbbde74d3ab6e947071c6f21e436ebabcf5af11ecc75cde8f0c01ca0b8c6ae1cce2ff42f21612816c636e96722a2a14daa57757644ceab6577091f82242be +DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21 EBUILD sudo-1.8.31.ebuild 6863 BLAKE2B 605dcb95b2668e74e9fbc915c98aad1c787919036b450476e9c9d50e2151489154d2232d0c1e445bfc6647cccecc240f508c2ef636e64331fcfbce385025ad72 SHA512 ccf9c659c89e469ad9cd0282ef2165a549344734dd3638226506944e39a39574af5f56d96ff0108880571a56a9eb457077fd2e73889fbb9c27a0e766b88f9abc EBUILD sudo-1.8.31_p1.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89 -EBUILD sudo-1.9.0-r1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9 -EBUILD sudo-1.9.1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9 -EBUILD sudo-9999.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296 +EBUILD sudo-1.8.31_p2.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89 +EBUILD sudo-1.9.2.ebuild 6929 BLAKE2B 948fdcbe5caf74d63fd11480ba55c30bd3b02c27800535c4022f83eb17ef4f0313fe0c10f76c5d85af395ada58bf9e57bee0be71f751b36c2b7a59487e286a8a SHA512 afa68f7077fc674a20242fc7bed81a31c1d46b6ad4b443f1c3a858290b196b82d3ce4df918efecb9b3b2ff3a6771e9febfba541fc03f96c3811fe2d98f127264 +EBUILD sudo-9999.ebuild 6821 BLAKE2B 6ec4c8325e4275d902df02e971ca9b3e87a24b312cabcec7909c8ce94c4662aabada79fe550305603ad92151483bb3ba02a92b1ac49807ed0ba6fa7b14da0f12 SHA512 92536adcffa6e1c62e701d7a00a9032a60d559aa114d196e9851f198321ea8d027e9f7caf598f9d0eae2182362520a3c1ba62117d13b8e8b8ed6c5d9f212e7ac MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6 diff --git a/app-admin/sudo/sudo-1.9.1.ebuild b/app-admin/sudo/sudo-1.8.31_p2.ebuild index 896554456b5a..f0df8a6c9e22 100644 --- a/app-admin/sudo/sudo-1.9.1.ebuild +++ b/app-admin/sudo/sudo-1.8.31_p2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit pam multilib libtool systemd tmpfiles +inherit pam multilib libtool tmpfiles MY_P="${P/_/}" MY_P="${MY_P/beta/b}" @@ -30,11 +30,10 @@ fi # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd" +IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest" DEPEND=" sys-libs/zlib:= - gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( @@ -45,11 +44,14 @@ DEPEND=" pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) sssd? ( sys-auth/sssd[sudo] ) + system-digest? ( + gcrypt? ( dev-libs/libgcrypt:= ) + !gcrypt? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) " RDEPEND=" ${DEPEND} @@ -135,34 +137,36 @@ src_configure() { # until `make` time, so we have to use a full path here rather than # basing off other values. myeconfargs=( - # requires some python eclass - --disable-python - --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d --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}"/run/sudo + $(use_with secure-path secure-path "${SECURE_PATH}") --with-vardir="${EPREFIX}"/var/db/sudo --without-linux-audit --without-opie $(use_enable gcrypt) $(use_enable nls) $(use_enable sasl) - $(use_enable ssl openssl) - $(use_with ldap) - $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) $(use_with offensive insults) $(use_with offensive all-insults) + $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) + $(use_with ldap) $(use_with pam) - $(use_with pam pam-login) - $(use_with secure-path secure-path "${SECURE_PATH}") - $(use_with selinux) - $(use_with sendmail) $(use_with skey) $(use_with sssd) + $(use_with selinux) + $(use_with sendmail) ) + if use system-digest && ! use gcrypt; then + myeconfargs+=("--enable-openssl") + else + myeconfargs+=("--disable-openssl") + fi + econf "${myeconfargs[@]}" } @@ -198,7 +202,6 @@ src_install() { fi pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session keepdir /var/db/sudo/lectured fperms 0700 /var/db/sudo/lectured @@ -206,7 +209,7 @@ src_install() { # Don't install into /run as that is a tmpfs most of the time # (bug #504854) - rm -rf "${ED}"/run || die + rm -rf "${ED}"/run find "${ED}" -type f -name "*.la" -delete || die #697812 } diff --git a/app-admin/sudo/sudo-1.9.0-r1.ebuild b/app-admin/sudo/sudo-1.9.2.ebuild index 896554456b5a..301a917d9637 100644 --- a/app-admin/sudo/sudo-1.9.0-r1.ebuild +++ b/app-admin/sudo/sudo-1.9.2.ebuild @@ -22,7 +22,7 @@ else 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 ~sparc ~x86 ~sparc-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris" fi fi @@ -62,6 +62,7 @@ RDEPEND=" " BDEPEND=" sys-devel/bison + virtual/pkgconfig " S="${WORKDIR}/${MY_P}" @@ -71,6 +72,8 @@ REQUIRED_USE=" skey? ( !pam ) " +REQUIRED_USE="?? ( gcrypt ssl )" + MAKEOPTS+=" SAMPLES=" src_prepare() { diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index cecc68448ea9..7d0daa6f3504 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -49,7 +49,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - sssd? ( sys-auth/sssd[sudo] ) + sssd? ( sys-auth/sssd[sudo(+)] ) " RDEPEND=" ${DEPEND} |