From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99DFA138350 for ; Sat, 11 Apr 2020 12:48:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA01DE0909; Sat, 11 Apr 2020 12:48:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEB29E0909 for ; Sat, 11 Apr 2020 12:48:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8114434F011 for ; Sat, 11 Apr 2020 12:48:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53D1D1CD for ; Sat, 11 Apr 2020 12:48:05 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1586609281.3c9da0087fa88a9507cdea96fcca8688461279bb.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sudo/sudo-9999.ebuild X-VCS-Directories: app-admin/sudo/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3c9da0087fa88a9507cdea96fcca8688461279bb X-VCS-Branch: master Date: Sat, 11 Apr 2020 12:48:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 076a29b9-9bfc-40f8-904a-aa8aae5a5ccd X-Archives-Hash: fa2c9365c73715af0dbb49773939ddf0 commit: 3c9da0087fa88a9507cdea96fcca8688461279bb Author: Lars Wendler gentoo org> AuthorDate: Sat Apr 11 12:47:49 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Apr 11 12:48:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9da008 app-admin/sudo: Synced live ebuild Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Lars Wendler gentoo.org> app-admin/sudo/sudo-9999.ebuild | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index f0df8a6c9e2..cecc68448ea 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -30,10 +30,11 @@ fi # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest" +IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd" DEPEND=" sys-libs/zlib:= + gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( @@ -44,14 +45,11 @@ DEPEND=" pam? ( sys-libs/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= ) - ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) ) + sssd? ( sys-auth/sssd[sudo] ) " RDEPEND=" ${DEPEND} @@ -137,36 +135,34 @@ src_configure() { # until `make` time, so we have to use a full path here rather than # basing off other values. myeconfargs=( - --enable-zlib=system + # 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 - $(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 skey) - $(use_with sssd) + $(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) ) - if use system-digest && ! use gcrypt; then - myeconfargs+=("--enable-openssl") - else - myeconfargs+=("--disable-openssl") - fi - econf "${myeconfargs[@]}" } @@ -209,7 +205,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 || die find "${ED}" -type f -name "*.la" -delete || die #697812 }