diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /app-admin/sudo | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'app-admin/sudo')
-rw-r--r-- | app-admin/sudo/Manifest | 8 | ||||
-rw-r--r-- | app-admin/sudo/sudo-1.8.27-r1.ebuild | 2 | ||||
-rw-r--r-- | app-admin/sudo/sudo-1.8.28_beta2.ebuild (renamed from app-admin/sudo/sudo-1.8.26-r1.ebuild) | 64 | ||||
-rw-r--r-- | app-admin/sudo/sudo-9999.ebuild | 42 |
4 files changed, 61 insertions, 55 deletions
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 09a8f5a1346f..a618071a354e 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,8 +1,8 @@ DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72 -DIST sudo-1.8.26.tar.gz 3286368 BLAKE2B 8df947f3dfa32081020b8a19921ea5daf6f9250c1ae34aa29900e85e80669223f28573217cd7e0a28393c6f30aa2117347014aa0cb554f2b85632e335ae790be SHA512 f5596cdf753ffa54f651bb30126e690640125b2ee54e8022f3740bfbe2e5a23e1bee86ce52879e863b9386babbbcf33d3e2882c573995a7d4612e9eea14d8791 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac +DIST sudo-1.8.28b2.tar.gz 3301533 BLAKE2B 9805d01b87c497e8b169d48598753a1f274d00dbe8ac81b992cb08b0ac74400b4abbf1bcc5e4bb4e7c135556f0069f9db279c39e40460749801bbacd5a84caf3 SHA512 df7e352c14d586bf556cf63c6176f6f5ec8619b0f36089466abeb8a732bd190e763429d46552dc79efadc640369a82e213a9e14d9a596761cba005f52b0f0f8a EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1 -EBUILD sudo-1.8.26-r1.ebuild 6497 BLAKE2B 0ba8ace2f8e5ea21652e3b4d2f935068090396fd094247f216a5ea689171157a6494a7fa250e85963953e98f44c08e0e398bb9009a1a29826407dc3c6c8f56e5 SHA512 1709e1cb5c272a8885c42fa9b3216ec0ab00a1a97ec330b7982db6d67e1627d6cf2f40dadab7eab53e261ed69d3a548b1063b4d9efc8a19e34fad863ebf4941a -EBUILD sudo-1.8.27-r1.ebuild 6675 BLAKE2B 7a82b93effbb00aff99eb793120b3f512d74790f24737fd024669720a8da4843db0f65e2a746b9a61f6369aed4eec93d1e31b7eb5cff54ec47095751451ab344 SHA512 21b1835c6f39e46c79c740d00b87062cb17f7f5378e06047324eeccf977e310f74bf1a5d7185f1f4202d6e37ea6cc29a764a54dbe6713dd93c3c4dd72b0713be -EBUILD sudo-9999.ebuild 6675 BLAKE2B 7a82b93effbb00aff99eb793120b3f512d74790f24737fd024669720a8da4843db0f65e2a746b9a61f6369aed4eec93d1e31b7eb5cff54ec47095751451ab344 SHA512 21b1835c6f39e46c79c740d00b87062cb17f7f5378e06047324eeccf977e310f74bf1a5d7185f1f4202d6e37ea6cc29a764a54dbe6713dd93c3c4dd72b0713be +EBUILD sudo-1.8.27-r1.ebuild 6665 BLAKE2B a1f14a58d3ae68bba174ae1d5bdbf82d2408a036a6e22ae38393594f507390391e9ad7a0d10b6e0a4641e2037a37591d268fae02e28003418ef0a9f2fe228b0c SHA512 13b46e6da2f845b657b13ee302de36a38430c56ee4e45ec1a2c152ba077a838d7ad38e84250d902543d56f386a078706157493fb56fad65890f7e01d2e8d1f33 +EBUILD sudo-1.8.28_beta2.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd +EBUILD sudo-9999.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd MISC metadata.xml 1489 BLAKE2B 3739b522115082830f82f509804b6f6f5e3ad55633c20b51b1cfa48960af6189bd33dd71d1e9432d4adf7bb4ad7790d7eed62996ab5ad12aa55732eee85b50a0 SHA512 6fa51671c5fa3ca442da0982542a8290ed39c835106c40d2db278ae16ec45eed28e563e203c1d5519bbf637483d0779094bca2ec3505d6f466d0a2b62b5248f8 diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild index 7dded75d56c5..26ca23f617c5 100644 --- a/app-admin/sudo/sudo-1.8.27-r1.ebuild +++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild @@ -23,7 +23,7 @@ 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" + KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris" fi fi diff --git a/app-admin/sudo/sudo-1.8.26-r1.ebuild b/app-admin/sudo/sudo-1.8.28_beta2.ebuild index fd5b1a9c50b5..69778e4b8d41 100644 --- a/app-admin/sudo/sudo-1.8.26-r1.ebuild +++ b/app-admin/sudo/sudo-1.8.28_beta2.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils pam multilib libtool tmpfiles -if [[ ${PV} == "9999" ]] ; then - EHG_REPO_URI="https://www.sudo.ws/repos/sudo" - inherit mercurial -fi +inherit pam multilib libtool tmpfiles -MY_P=${P/_/} -MY_P=${MY_P/beta/b} - -uri_prefix= -case ${P} in - *_beta*|*_rc*) uri_prefix=beta/ ;; -esac +MY_P="${P/_/}" +MY_P="${MY_P/beta/b}" DESCRIPTION="Allows users or groups to run commands as other users" HOMEPAGE="https://www.sudo.ws/" -if [[ ${PV} != "9999" ]] ; then +if [[ ${PV} == "9999" ]] ; then + inherit mercurial + EHG_REPO_URI="https://www.sudo.ws/repos/sudo" +else + 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" if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then @@ -31,23 +30,28 @@ fi # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd" +IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest" -CDEPEND=" +DEPEND=" sys-libs/zlib:= - gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) - openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) + system-digest? ( + gcrypt? ( dev-libs/libgcrypt:= ) + !gcrypt? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) " RDEPEND=" - ${CDEPEND} + ${DEPEND} >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) @@ -55,8 +59,7 @@ RDEPEND=" selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) " -DEPEND=" - ${CDEPEND} +BDEPEND=" sys-devel/bison " @@ -65,7 +68,6 @@ S="${WORKDIR}/${MY_P}" REQUIRED_USE=" pam? ( !skey ) skey? ( !pam ) - ?? ( gcrypt openssl ) " MAKEOPTS+=" SAMPLES=" @@ -99,7 +101,7 @@ set_secure_path() { local newpath thisp IFS=: for thisp in $1 ; do if [[ :${newpath}: != *:${thisp}:* ]] ; then - newpath+=:$thisp + newpath+=:${thisp} else einfo " Duplicate entry ${thisp} removed..." fi @@ -112,8 +114,8 @@ set_secure_path() { rmpath() { local e newpath thisp IFS=: for thisp in ${SECURE_PATH} ; do - for e ; do [[ $thisp == $e ]] && continue 2 ; done - newpath+=:$thisp + for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done + newpath+=:${thisp} done SECURE_PATH=${newpath#:} } @@ -145,7 +147,6 @@ src_configure() { --without-opie $(use_enable gcrypt) $(use_enable nls) - $(use_enable openssl) $(use_enable sasl) $(use_with offensive insults) $(use_with offensive all-insults) @@ -157,6 +158,13 @@ src_configure() { $(use_with selinux) $(use_with sendmail) ) + + if use system-digest && ! use gcrypt; then + myeconfargs+=("--enable-openssl") + else + myeconfargs+=("--disable-openssl") + fi + econf "${myeconfargs[@]}" } @@ -191,7 +199,7 @@ src_install() { # Don't install into /run as that is a tmpfs most of the time # (bug #504854) - rm -rf "${ED%/}"/run + rm -rf "${ED}"/run } pkg_postinst() { diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index 7dded75d56c5..69778e4b8d41 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -1,25 +1,24 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -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} +inherit pam multilib libtool tmpfiles -uri_prefix= -case ${P} in - *_beta*|*_rc*) uri_prefix=beta/ ;; -esac +MY_P="${P/_/}" +MY_P="${MY_P/beta/b}" DESCRIPTION="Allows users or groups to run commands as other users" HOMEPAGE="https://www.sudo.ws/" -if [[ ${PV} != "9999" ]] ; then +if [[ ${PV} == "9999" ]] ; then + inherit mercurial + EHG_REPO_URI="https://www.sudo.ws/repos/sudo" +else + 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" if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then @@ -33,7 +32,7 @@ LICENSE="ISC BSD" SLOT="0" IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest" -CDEPEND=" +DEPEND=" sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 @@ -52,7 +51,7 @@ CDEPEND=" ) " RDEPEND=" - ${CDEPEND} + ${DEPEND} >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) @@ -60,8 +59,7 @@ RDEPEND=" selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) " -DEPEND=" - ${CDEPEND} +BDEPEND=" sys-devel/bison " @@ -103,7 +101,7 @@ set_secure_path() { local newpath thisp IFS=: for thisp in $1 ; do if [[ :${newpath}: != *:${thisp}:* ]] ; then - newpath+=:$thisp + newpath+=:${thisp} else einfo " Duplicate entry ${thisp} removed..." fi @@ -116,8 +114,8 @@ set_secure_path() { rmpath() { local e newpath thisp IFS=: for thisp in ${SECURE_PATH} ; do - for e ; do [[ $thisp == $e ]] && continue 2 ; done - newpath+=:$thisp + for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done + newpath+=:${thisp} done SECURE_PATH=${newpath#:} } @@ -201,7 +199,7 @@ src_install() { # Don't install into /run as that is a tmpfs most of the time # (bug #504854) - rm -rf "${ED%/}"/run + rm -rf "${ED}"/run } pkg_postinst() { |