heroxbd 14/12/09 01:50:57 Modified: shadow-4.2.1.ebuild ChangeLog Log: Prefix support: trivial D -> ED and ROOT -> EROOT. (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 sys-apps/shadow/shadow-4.2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild?r1=1.1&r2=1.2 Index: shadow-4.2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shadow-4.2.1.ebuild 16 Jun 2014 05:52:43 -0000 1.1 +++ shadow-4.2.1.ebuild 9 Dec 2014 01:50:57 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.1 2014/06/16 05:52:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.2 2014/12/09 01:50:57 heroxbd Exp $ EAPI=4 @@ -62,8 +62,8 @@ [[ -z ${val} ]] && comment="#" sed -i -r \ -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) + "${ED}"/etc/login.defs + local res=$(grep "^${comment}${opt}" "${ED}"/etc/login.defs) einfo ${res:-Unable to find ${opt} in /etc/login.defs} } @@ -75,7 +75,7 @@ # Currently, libshadow.a is for internal use only, so if you see # -lshadow in a Makefile of some other package, it is safe to # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} + rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} insinto /etc # Using a securetty with devfs device names added @@ -93,7 +93,7 @@ arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttymxc2 ttymxc3 ttyO0 ttyO1 ttyO2";; sh) devs="ttySC0 ttySC1";; esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty + [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${ED}"/etc/securetty # needed for 'useradd -D' insinto /etc/default @@ -101,7 +101,7 @@ doins "${FILESDIR}"/default/useradd # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ + mv "${ED}"/usr/bin/passwd "${ED}"/bin/ dosym /bin/passwd /usr/bin/passwd cd "${S}" @@ -152,20 +152,20 @@ done sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs + "${ED}"/etc/login.defs # remove manpages that pam will install for us # and/or don't apply when using pam - find "${D}"/usr/share/man \ + find "${ED}"/usr/share/man \ '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ -exec rm {} + # Remove pam.d files provided by pambase. - rm "${D}"/etc/pam.d/{login,passwd,su} || die + rm "${ED}"/etc/pam.d/{login,passwd,su} || die fi # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ + find "${ED}"/usr/share/man \ '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ -exec rm {} + @@ -177,13 +177,13 @@ } pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" + rm -f "${EROOT}"/etc/pam.d/system-auth.new \ + "${EROOT}/etc/login.defs.new" } pkg_postinst() { # Enable shadow groups. - if [ ! -f "${ROOT}"/etc/gshadow ] ; then + if [ ! -f "${EROOT}"/etc/gshadow ] ; then if grpck -r -R "${ROOT}" 2>/dev/null ; then grpconv -R "${ROOT}" else 1.295 sys-apps/shadow/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/ChangeLog?rev=1.295&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/ChangeLog?rev=1.295&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/ChangeLog?r1=1.294&r2=1.295 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- ChangeLog 13 Jul 2014 17:52:55 -0000 1.294 +++ ChangeLog 9 Dec 2014 01:50:57 -0000 1.295 @@ -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.294 2014/07/13 17:52:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.295 2014/12/09 01:50:57 heroxbd Exp $ + + 09 Dec 2014; Benda Xu <[email protected]> shadow-4.2.1.ebuild: + Prefix support: trivial D -> ED and ROOT -> EROOT. 13 Jul 2014; Mike Frysinger <[email protected]> files/securetty: Allow root login via any serial device.
