diff options
Diffstat (limited to 'app-admin/sudo')
| -rw-r--r-- | app-admin/sudo/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/sudo/metadata.xml | 1 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.9.15_p5.ebuild (renamed from app-admin/sudo/sudo-1.9.8.ebuild) | 113 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.9.6_p1-r2.ebuild | 257 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-1.9.7_p2.ebuild | 255 | ||||
| -rw-r--r-- | app-admin/sudo/sudo-9999.ebuild | 113 |
6 files changed, 147 insertions, 597 deletions
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index e98ba0ccb8bb..90f9f2b10c40 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,3 +1,2 @@ -DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745 -DIST sudo-1.9.7p2.tar.gz 4200036 BLAKE2B b977c423670e5e34e84f3b009d5fe5f0379a0027e828fb903aa7ff1b11581572e8d5452a3666d963df3edfe1b83ffe16fbf8bddbf07881284f4507c8138859ad SHA512 39184127122014d0d1d194d455644191009835ffdcc0efda3a99028fe346ca3ff6b15341016f85029556e9f1f9deeaf83b52160effc47d1a5713affb36b99386 -DIST sudo-1.9.8.tar.gz 4301188 BLAKE2B 6731f5ad4b7002b2ec0d9f893a18070e220918bb6f4ffefdc6719221a5614912253f9547d83fc5e61c3cdada8b093d5e9c7f4c37ec6e3fc2fb9245bd10797dd2 SHA512 b1ef0464bbf5d7ab65066752769261640a142fa82b7d3d8698a7e098fbc2670c382211bce1ca0c44cb7a1c3b5a375a725a1e05a9fdfb4a31023c868285814fdc +DIST sudo-1.9.15p5.tar.gz 5306611 BLAKE2B 73ee598c2a2848d5be24f97492b13eba2f326c514799220e43a1aeafc6692224a7555fb7cc0a96a2720751d3e4d98e752804db589ac3c1476f24e71f5b9bc720 SHA512 ebac69719de2fe7bd587924701bdd24149bf376a68b17ec02f69b2b96d4bb6fa5eb8260a073ec5ea046d3ac69bb5b1c0b9d61709fe6a56f1f66e40817a70b15a +DIST sudo-1.9.15p5.tar.gz.sig 566 BLAKE2B ddd8fed1b3721aafdb32b762834168063c3f0f003ef5d83f1883615320da6fe89b08d72c8e893c8b2bf9fd892a40e47cc77d72672e43b5a24db50e7194d9bc4c SHA512 97480a3d27b546a93e997c3a1e8169904a7625ab8fa6198d0b7e1d2d040f55b2d58462cd08e5cc97c2f1c817b12343e35cdd7db207aee42785f2b95b17c600b0 diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml index 045c53c4fa14..7660289e000f 100644 --- a/app-admin/sudo/metadata.xml +++ b/app-admin/sudo/metadata.xml @@ -20,5 +20,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id> + <remote-id type="github">sudo-project/sudo</remote-id> </upstream> </pkgmetadata> diff --git a/app-admin/sudo/sudo-1.9.8.ebuild b/app-admin/sudo/sudo-1.9.15_p5.ebuild index de7fec385553..b130fe70e0ad 100644 --- a/app-admin/sudo/sudo-1.9.8.ebuild +++ b/app-admin/sudo/sudo-1.9.15_p5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit pam libtool tmpfiles toolchain-funcs @@ -10,22 +10,37 @@ 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 + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc + inherit verify-sig + 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 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris" + 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 + 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )" fi +S="${WORKDIR}/${MY_P}" + # Basic license is ISC-style as-is, some files are released under # 3-clause BSD license LICENSE="ISC BSD" @@ -37,16 +52,17 @@ DEPEND=" virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( - >=net-nds/openldap-2.1.30-r1 + >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl - net-nds/openldap[sasl] + net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) + selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) sssd? ( sys-auth/sssd[sudo] ) " RDEPEND=" @@ -58,13 +74,11 @@ RDEPEND=" selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) " -BDEPEND=" - sys-devel/bison +BDEPEND+=" + app-alternatives/yacc virtual/pkgconfig " -S="${WORKDIR}/${MY_P}" - REQUIRED_USE=" ?? ( pam skey ) ?? ( gcrypt ssl ) @@ -74,24 +88,27 @@ MAKEOPTS+=" SAMPLES=" src_prepare() { default + elibtoolize } set_secure_path() { - # first extract the default ROOTPATH from build env - 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 + # First extract the default ROOTPATH from build env + 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 + # Then remove duplicate path entries cleanpath() { local newpath thisp IFS=: for thisp in $1 ; do @@ -105,11 +122,13 @@ set_secure_path() { } cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} - # finally, strip gcc paths #136027 + # Finally, strip gcc paths, bug #136027 rmpath() { local e newpath thisp IFS=: for thisp in ${SECURE_PATH} ; do - for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done + for e ; do + [[ ${thisp} == ${e} ]] && continue 2 ; + done newpath+=:${thisp} done SECURE_PATH=${newpath#:} @@ -119,15 +138,25 @@ set_secure_path() { src_configure() { local SECURE_PATH + set_secure_path - tc-export PKG_CONFIG #767712 - # audit: somebody got to explain me how I can test this before I + # bug #767712 + tc-export PKG_CONFIG + + # - audit: somebody got to explain me how I can test this before I # enable it.. - Diego - # plugindir: autoconf code is crappy and does not delay evaluation + # - plugindir: autoconf code is crappy and does not delay evaluation # until `make` time, so we have to use a full path here rather than # basing off other values. - myeconfargs=( + local myeconfargs=( + # We set all of the relevant options by ourselves (patched + # into the toolchain) and setting these in the build system + # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3 + # (it'll downgrade to =2). So, this has no functional effect on + # the hardening for users. It's safe. + --disable-hardening + # requires some python eclass --disable-python --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d @@ -163,10 +192,10 @@ src_install() { default if use ldap ; then - dodoc README.LDAP + dodoc README.LDAP.md cat <<-EOF > "${T}"/ldap.conf.sudo - # See ldap.conf(5) and README.LDAP for details + # See ldap.conf(5) and README.LDAP.md for details # This file should only be readable by root # supported directives: host, port, ssl, ldap_version @@ -187,29 +216,31 @@ src_install() { fperms 0440 /etc/ldap.conf.sudo insinto /etc/openldap/schema - newins doc/schema.OpenLDAP sudo.schema + newins docs/schema.OpenLDAP sudo.schema fi - if use pam; then + if use pam ; then pamd_mimic system-auth sudo auth account session pamd_mimic system-auth sudo-i auth account session fi keepdir /var/db/sudo/lectured fperms 0700 /var/db/sudo/lectured - fperms 0711 /var/db/sudo #652958 + # bug #652958 + fperms 0711 /var/db/sudo # Don't install into /run as that is a tmpfs most of the time # (bug #504854) rm -rf "${ED}"/run || die - find "${ED}" -type f -name "*.la" -delete || die #697812 + # bug #697812 + find "${ED}" -type f -name "*.la" -delete || die } pkg_postinst() { tmpfiles_process sudo.conf - #652958 + # bug #652958 local sudo_db="${EROOT}/var/db/sudo" if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then chmod 711 "${sudo_db}" || die @@ -217,20 +248,20 @@ pkg_postinst() { if use ldap ; then ewarn - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." + ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration." ewarn if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" - ewarn "configured in /etc/nsswitch.conf." + ewarn "configured in ${ROOT}/etc/nsswitch.conf." ewarn - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" + ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:" ewarn " sudoers: ldap files" ewarn fi fi if use prefix ; then ewarn - ewarn "To use sudo, you need to change file ownership and permissions" + ewarn "To use sudo on Prefix, you need to change file ownership and permissions" ewarn "with root privileges, as follows:" ewarn ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" diff --git a/app-admin/sudo/sudo-1.9.6_p1-r2.ebuild b/app-admin/sudo/sudo-1.9.6_p1-r2.ebuild deleted file mode 100644 index 508aab94648c..000000000000 --- a/app-admin/sudo/sudo-1.9.6_p1-r2.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam multilib libtool systemd tmpfiles toolchain-funcs - -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 - 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 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~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" -IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd" - -DEPEND=" - sys-libs/zlib:= - virtual/libcrypt:= - gcrypt? ( dev-libs/libgcrypt:= ) - ldap? ( - >=net-nds/openldap-2.1.30-r1 - sasl? ( - dev-libs/cyrus-sasl - net-nds/openldap[sasl] - ) - ) - nls? ( virtual/libintl ) - pam? ( sys-libs/pam ) - sasl? ( dev-libs/cyrus-sasl ) - skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( dev-libs/openssl:0= ) - sssd? ( sys-auth/sssd[sudo] ) -" -RDEPEND=" - ${DEPEND} - >=app-misc/editor-wrapper-3 - virtual/editor - ldap? ( dev-lang/perl ) - pam? ( sys-auth/pambase ) - selinux? ( sec-policy/selinux-sudo ) - sendmail? ( virtual/mta ) -" -BDEPEND=" - sys-devel/bison - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ?? ( pam skey ) - ?? ( gcrypt ssl ) -" - -MAKEOPTS+=" SAMPLES=" - -src_prepare() { - default - elibtoolize -} - -set_secure_path() { - # first extract the default ROOTPATH from build env - 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 - cleanpath() { - local newpath thisp IFS=: - for thisp in $1 ; do - if [[ :${newpath}: != *:${thisp}:* ]] ; then - newpath+=:${thisp} - else - einfo " Duplicate entry ${thisp} removed..." - fi - done - SECURE_PATH=${newpath#:} - } - cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} - - # finally, strip gcc paths #136027 - rmpath() { - local e newpath thisp IFS=: - for thisp in ${SECURE_PATH} ; do - for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done - newpath+=:${thisp} - done - SECURE_PATH=${newpath#:} - } - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*' -} - -src_configure() { - local SECURE_PATH - set_secure_path - tc-export PKG_CONFIG #767712 - - # audit: somebody got to explain me how I can test this before I - # enable it.. - Diego - # plugindir: autoconf code is crappy and does not delay evaluation - # 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 - --with-editor="${EPREFIX}"/usr/libexec/editor - --with-env-editor - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo - --with-rundir="${EPREFIX}"/run/sudo - --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 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) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use ldap ; then - dodoc README.LDAP - - cat <<-EOF > "${T}"/ldap.conf.sudo - # See ldap.conf(5) and README.LDAP for details - # This file should only be readable by root - - # supported directives: host, port, ssl, ldap_version - # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key} - EOF - - if use sasl ; then - cat <<-EOF >> "${T}"/ldap.conf.sudo - - # SASL directives: use_sasl, sasl_mech, sasl_auth_id - # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname - EOF - fi - - insinto /etc - doins "${T}"/ldap.conf.sudo - fperms 0440 /etc/ldap.conf.sudo - - insinto /etc/openldap/schema - newins doc/schema.OpenLDAP sudo.schema - fi - - if use pam; then - pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session - fi - - keepdir /var/db/sudo/lectured - fperms 0700 /var/db/sudo/lectured - fperms 0711 /var/db/sudo #652958 - - # Don't install into /run as that is a tmpfs most of the time - # (bug #504854) - rm -rf "${ED}"/run || die - - find "${ED}" -type f -name "*.la" -delete || die #697812 -} - -pkg_postinst() { - tmpfiles_process sudo.conf - - #652958 - local sudo_db="${EROOT}/var/db/sudo" - if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then - chmod 711 "${sudo_db}" || die - fi - - if use ldap ; then - ewarn - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." - ewarn - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" - ewarn "configured in /etc/nsswitch.conf." - ewarn - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" - ewarn " sudoers: ldap files" - ewarn - fi - fi - if use prefix ; then - ewarn - ewarn "To use sudo, you need to change file ownership and permissions" - ewarn "with root privileges, as follows:" - ewarn - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d" - ewarn " # chown root:root ${EPREFIX}/var/db/sudo" - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo" - ewarn - fi - - elog "To use the -A (askpass) option, you need to install a compatible" - elog "password program from the following list. Starred packages will" - elog "automatically register for the use with sudo (but will not force" - elog "the -A option):" - elog "" - elog " [*] net-misc/ssh-askpass-fullscreen" - elog " net-misc/x11-ssh-askpass" - elog "" - elog "You can override the choice by setting the SUDO_ASKPASS environmnent" - elog "variable to the program you want to use." -} diff --git a/app-admin/sudo/sudo-1.9.7_p2.ebuild b/app-admin/sudo/sudo-1.9.7_p2.ebuild deleted file mode 100644 index 82fffc77e5e4..000000000000 --- a/app-admin/sudo/sudo-1.9.7_p2.ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam multilib libtool systemd tmpfiles toolchain-funcs - -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 - 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 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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" -IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd" - -DEPEND=" - sys-libs/zlib:= - virtual/libcrypt:= - gcrypt? ( dev-libs/libgcrypt:= ) - ldap? ( - >=net-nds/openldap-2.1.30-r1 - sasl? ( - dev-libs/cyrus-sasl - net-nds/openldap[sasl] - ) - ) - pam? ( sys-libs/pam ) - sasl? ( dev-libs/cyrus-sasl ) - skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( dev-libs/openssl:0= ) - sssd? ( sys-auth/sssd[sudo] ) -" -RDEPEND=" - ${DEPEND} - >=app-misc/editor-wrapper-3 - virtual/editor - ldap? ( dev-lang/perl ) - pam? ( sys-auth/pambase ) - selinux? ( sec-policy/selinux-sudo ) - sendmail? ( virtual/mta ) -" -BDEPEND=" - sys-devel/bison - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - ?? ( pam skey ) - ?? ( gcrypt ssl ) -" - -MAKEOPTS+=" SAMPLES=" - -src_prepare() { - default - elibtoolize -} - -set_secure_path() { - # first extract the default ROOTPATH from build env - 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 - cleanpath() { - local newpath thisp IFS=: - for thisp in $1 ; do - if [[ :${newpath}: != *:${thisp}:* ]] ; then - newpath+=:${thisp} - else - einfo " Duplicate entry ${thisp} removed..." - fi - done - SECURE_PATH=${newpath#:} - } - cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} - - # finally, strip gcc paths #136027 - rmpath() { - local e newpath thisp IFS=: - for thisp in ${SECURE_PATH} ; do - for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done - newpath+=:${thisp} - done - SECURE_PATH=${newpath#:} - } - rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*' -} - -src_configure() { - local SECURE_PATH - set_secure_path - tc-export PKG_CONFIG #767712 - - # audit: somebody got to explain me how I can test this before I - # enable it.. - Diego - # plugindir: autoconf code is crappy and does not delay evaluation - # 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 - --with-editor="${EPREFIX}"/usr/libexec/editor - --with-env-editor - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo - --with-rundir="${EPREFIX}"/run/sudo - --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 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) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use ldap ; then - dodoc README.LDAP - - cat <<-EOF > "${T}"/ldap.conf.sudo - # See ldap.conf(5) and README.LDAP for details - # This file should only be readable by root - - # supported directives: host, port, ssl, ldap_version - # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key} - EOF - - if use sasl ; then - cat <<-EOF >> "${T}"/ldap.conf.sudo - - # SASL directives: use_sasl, sasl_mech, sasl_auth_id - # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname - EOF - fi - - insinto /etc - doins "${T}"/ldap.conf.sudo - fperms 0440 /etc/ldap.conf.sudo - - insinto /etc/openldap/schema - newins doc/schema.OpenLDAP sudo.schema - fi - - if use pam; then - pamd_mimic system-auth sudo auth account session - pamd_mimic system-auth sudo-i auth account session - fi - - keepdir /var/db/sudo/lectured - fperms 0700 /var/db/sudo/lectured - fperms 0711 /var/db/sudo #652958 - - # Don't install into /run as that is a tmpfs most of the time - # (bug #504854) - rm -rf "${ED}"/run || die - - find "${ED}" -type f -name "*.la" -delete || die #697812 -} - -pkg_postinst() { - tmpfiles_process sudo.conf - - #652958 - local sudo_db="${EROOT}/var/db/sudo" - if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then - chmod 711 "${sudo_db}" || die - fi - - if use ldap ; then - ewarn - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." - ewarn - if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then - ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" - ewarn "configured in /etc/nsswitch.conf." - ewarn - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" - ewarn " sudoers: ldap files" - ewarn - fi - fi - if use prefix ; then - ewarn - ewarn "To use sudo, you need to change file ownership and permissions" - ewarn "with root privileges, as follows:" - ewarn - ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" - ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers" - ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d" - ewarn " # chown root:root ${EPREFIX}/var/db/sudo" - ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo" - ewarn - fi - - elog "To use the -A (askpass) option, you need to install a compatible" - elog "password program from the following list. Starred packages will" - elog "automatically register for the use with sudo (but will not force" - elog "the -A option):" - elog "" - elog " [*] net-misc/ssh-askpass-fullscreen" - elog " net-misc/x11-ssh-askpass" - elog "" - elog "You can override the choice by setting the SUDO_ASKPASS environmnent" - elog "variable to the program you want to use." -} diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index de7fec385553..8f632cd98d7b 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit pam libtool tmpfiles toolchain-funcs @@ -10,22 +10,37 @@ 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 + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc + inherit verify-sig + 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 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris" + 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 + 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )" fi +S="${WORKDIR}/${MY_P}" + # Basic license is ISC-style as-is, some files are released under # 3-clause BSD license LICENSE="ISC BSD" @@ -37,16 +52,17 @@ DEPEND=" virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( - >=net-nds/openldap-2.1.30-r1 + >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl - net-nds/openldap[sasl] + net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) + selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) sssd? ( sys-auth/sssd[sudo] ) " RDEPEND=" @@ -58,13 +74,11 @@ RDEPEND=" selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) " -BDEPEND=" - sys-devel/bison +BDEPEND+=" + app-alternatives/yacc virtual/pkgconfig " -S="${WORKDIR}/${MY_P}" - REQUIRED_USE=" ?? ( pam skey ) ?? ( gcrypt ssl ) @@ -74,24 +88,27 @@ MAKEOPTS+=" SAMPLES=" src_prepare() { default + elibtoolize } set_secure_path() { - # first extract the default ROOTPATH from build env - 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 + # First extract the default ROOTPATH from build env + 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 + # Then remove duplicate path entries cleanpath() { local newpath thisp IFS=: for thisp in $1 ; do @@ -105,11 +122,13 @@ set_secure_path() { } cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}} - # finally, strip gcc paths #136027 + # Finally, strip gcc paths, bug #136027 rmpath() { local e newpath thisp IFS=: for thisp in ${SECURE_PATH} ; do - for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done + for e ; do + [[ ${thisp} == ${e} ]] && continue 2 ; + done newpath+=:${thisp} done SECURE_PATH=${newpath#:} @@ -119,15 +138,25 @@ set_secure_path() { src_configure() { local SECURE_PATH + set_secure_path - tc-export PKG_CONFIG #767712 - # audit: somebody got to explain me how I can test this before I + # bug #767712 + tc-export PKG_CONFIG + + # - audit: somebody got to explain me how I can test this before I # enable it.. - Diego - # plugindir: autoconf code is crappy and does not delay evaluation + # - plugindir: autoconf code is crappy and does not delay evaluation # until `make` time, so we have to use a full path here rather than # basing off other values. - myeconfargs=( + local myeconfargs=( + # We set all of the relevant options by ourselves (patched + # into the toolchain) and setting these in the build system + # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3 + # (it'll downgrade to =2). So, this has no functional effect on + # the hardening for users. It's safe. + --disable-hardening + # requires some python eclass --disable-python --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d @@ -163,10 +192,10 @@ src_install() { default if use ldap ; then - dodoc README.LDAP + dodoc README.LDAP.md cat <<-EOF > "${T}"/ldap.conf.sudo - # See ldap.conf(5) and README.LDAP for details + # See ldap.conf(5) and README.LDAP.md for details # This file should only be readable by root # supported directives: host, port, ssl, ldap_version @@ -187,29 +216,31 @@ src_install() { fperms 0440 /etc/ldap.conf.sudo insinto /etc/openldap/schema - newins doc/schema.OpenLDAP sudo.schema + newins docs/schema.OpenLDAP sudo.schema fi - if use pam; then + if use pam ; then pamd_mimic system-auth sudo auth account session pamd_mimic system-auth sudo-i auth account session fi keepdir /var/db/sudo/lectured fperms 0700 /var/db/sudo/lectured - fperms 0711 /var/db/sudo #652958 + # bug #652958 + fperms 0711 /var/db/sudo # Don't install into /run as that is a tmpfs most of the time # (bug #504854) rm -rf "${ED}"/run || die - find "${ED}" -type f -name "*.la" -delete || die #697812 + # bug #697812 + find "${ED}" -type f -name "*.la" -delete || die } pkg_postinst() { tmpfiles_process sudo.conf - #652958 + # bug #652958 local sudo_db="${EROOT}/var/db/sudo" if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then chmod 711 "${sudo_db}" || die @@ -217,20 +248,20 @@ pkg_postinst() { if use ldap ; then ewarn - ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration." + ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration." ewarn if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly" - ewarn "configured in /etc/nsswitch.conf." + ewarn "configured in ${ROOT}/etc/nsswitch.conf." ewarn - ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:" + ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:" ewarn " sudoers: ldap files" ewarn fi fi if use prefix ; then ewarn - ewarn "To use sudo, you need to change file ownership and permissions" + ewarn "To use sudo on Prefix, you need to change file ownership and permissions" ewarn "with root privileges, as follows:" ewarn ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo" |