diff options
| -rw-r--r-- | app-admin/mysudo/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/mysudo/mysudo-1.8.25_p1-r1.ebuild (renamed from app-admin/mysudo/mysudo-1.8.23-r1.ebuild) | 50 |
2 files changed, 33 insertions, 19 deletions
diff --git a/app-admin/mysudo/Manifest b/app-admin/mysudo/Manifest index db97359..5a30d2d 100644 --- a/app-admin/mysudo/Manifest +++ b/app-admin/mysudo/Manifest @@ -1 +1 @@ -DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342 +DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72 diff --git a/app-admin/mysudo/mysudo-1.8.23-r1.ebuild b/app-admin/mysudo/mysudo-1.8.25_p1-r1.ebuild index 4fa51c3..7935a0a 100644 --- a/app-admin/mysudo/mysudo-1.8.23-r1.ebuild +++ b/app-admin/mysudo/mysudo-1.8.25_p1-r1.ebuild @@ -1,6 +1,13 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + EAPI=6 -inherit eutils pam multilib libtool +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} @@ -13,37 +20,40 @@ esac DESCRIPTION="Allows users or groups to run commands as other users" HOMEPAGE="https://www.sudo.ws/" -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} != "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" + fi +fi # Basic license is ISC-style as-is, some files are released under # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -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" -fi -IUSE="with-secure-path gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey" +IUSE="with-secure-path gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey sssd" CDEPEND=" + sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) - openssl? ( dev-libs/openssl:0= ) - pam? ( virtual/pam ) - sasl? ( dev-libs/cyrus-sasl ) - skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) - sys-libs/zlib + 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] ) " RDEPEND=" ${CDEPEND} - selinux? ( sec-policy/selinux-sudo ) - ldap? ( dev-lang/perl ) - pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor + ldap? ( dev-lang/perl ) + pam? ( sys-auth/pambase ) + selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) " DEPEND=" @@ -124,10 +134,11 @@ src_configure() { # basing off other values. myeconfargs=( --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}"/var/run/sudo + --with-rundir="${EPREFIX}"/run/sudo $(use_with with-secure-path with-secure-path ${SECURE_PATH}) --with-vardir="${EPREFIX}"/var/db/sudo --without-linux-audit @@ -142,6 +153,7 @@ src_configure() { $(use_with ldap) $(use_with pam) $(use_with skey) + $(use_with sssd) $(use_with selinux) $(use_with sendmail) ) @@ -177,12 +189,14 @@ src_install() { fperms 0700 /var/db/sudo/lectured fperms 0711 /var/db/sudo #652958 - # Don't install into /var/run as that is a tmpfs most of the time + # Don't install into /run as that is a tmpfs most of the time # (bug #504854) - rm -rf "${ED}"/var/run + rm -rf "${ED%/}"/run } pkg_postinst() { + tmpfiles_process sudo.conf + #652958 local sudo_db="${EROOT}/var/db/sudo" if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then |