diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-02-09 20:34:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-09 20:34:28 +0000 |
| commit | f31c0d55dc74a75e0ec6f87f90f1754a1e4ec11d (patch) | |
| tree | 796f13a44e78a4f0772f3783d3dde51d70f67b33 /sys-apps/shadow | |
| parent | Version bump; remove old (diff) | |
| download | gentoo-2-f31c0d55dc74a75e0ec6f87f90f1754a1e4ec11d.tar.gz gentoo-2-f31c0d55dc74a75e0ec6f87f90f1754a1e4ec11d.tar.bz2 gentoo-2-f31c0d55dc74a75e0ec6f87f90f1754a1e4ec11d.zip | |
Use -delete with find, and fix prefix handling in a few places.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-apps/shadow')
| -rw-r--r-- | sys-apps/shadow/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.2.1.ebuild | 14 |
2 files changed, 12 insertions, 9 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index df56068c0e8c..b4808c6b6493 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/shadow -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.295 2014/12/09 01:50:57 heroxbd Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.296 2015/02/09 20:34:28 vapier Exp $ + + 09 Feb 2015; Mike Frysinger <vapier@gentoo.org> shadow-4.2.1.ebuild: + Use -delete with find, and fix prefix handling in a few places. 09 Dec 2014; Benda Xu <heroxbd@gentoo.org> shadow-4.2.1.ebuild: Prefix support: trivial D -> ED and ROOT -> EROOT. diff --git a/sys-apps/shadow/shadow-4.2.1.ebuild b/sys-apps/shadow/shadow-4.2.1.ebuild index 3ccb577a1aae..6fe5211f0afd 100644 --- a/sys-apps/shadow/shadow-4.2.1.ebuild +++ b/sys-apps/shadow/shadow-4.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.2 2014/12/09 01:50:57 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.3 2015/02/09 20:34:28 vapier Exp $ EAPI=4 @@ -101,7 +101,7 @@ src_install() { doins "${FILESDIR}"/default/useradd # move passwd to / to help recover broke systems #64441 - mv "${ED}"/usr/bin/passwd "${ED}"/bin/ + mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die dosym /bin/passwd /usr/bin/passwd cd "${S}" @@ -158,7 +158,7 @@ src_install() { # and/or don't apply when using pam find "${ED}"/usr/share/man \ '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + + -delete # Remove pam.d files provided by pambase. rm "${ED}"/etc/pam.d/{login,passwd,su} || die @@ -167,7 +167,7 @@ src_install() { # Remove manpages that are handled by other packages find "${ED}"/usr/share/man \ '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + + -delete cd "${S}" dodoc ChangeLog NEWS TODO @@ -184,8 +184,8 @@ pkg_preinst() { pkg_postinst() { # Enable shadow groups. if [ ! -f "${EROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" + if grpck -r -R "${EROOT}" 2>/dev/null ; then + grpconv -R "${EROOT}" else ewarn "Running 'grpck' returned errors. Please run it by hand, and then" ewarn "run 'grpconv' afterwards!" |