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 3A13D138334 for ; Sun, 4 Aug 2019 09:43:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B90BE087E; Sun, 4 Aug 2019 09:43:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 43EE5E0874 for ; Sun, 4 Aug 2019 09:43:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DD07B34961F for ; Sun, 4 Aug 2019 09:43:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 662CD73C for ; Sun, 4 Aug 2019 09:43:38 +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: <1564911813.caaa80ff7dc52981268dc3245459ba3ddcbd61b3.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: caaa80ff7dc52981268dc3245459ba3ddcbd61b3 X-VCS-Branch: master Date: Sun, 4 Aug 2019 09:43:38 +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: 5155d11a-0294-4515-814b-1f65f5edb19c X-Archives-Hash: a640294899633677755d1e7905d96384 commit: caaa80ff7dc52981268dc3245459ba3ddcbd61b3 Author: Lars Wendler gentoo org> AuthorDate: Sun Aug 4 09:35:13 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Aug 4 09:43:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caaa80ff app-admin/sudo: Synced live ebuild Package-Manager: Portage-2.3.70, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> app-admin/sudo/sudo-9999.ebuild | 42 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index 7dded75d56c..69778e4b8d4 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() {