| 1 |
vapier 15/02/09 20:34:28 |
| 2 |
|
| 3 |
Modified: shadow-4.2.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use -delete with find, and fix prefix handling in a few places. |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sys-apps/shadow/shadow-4.2.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: shadow-4.2.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- shadow-4.2.1.ebuild 9 Dec 2014 01:50:57 -0000 1.2 |
| 23 |
+++ shadow-4.2.1.ebuild 9 Feb 2015 20:34:28 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.2 2014/12/09 01:50:57 heroxbd Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.3 2015/02/09 20:34:28 vapier Exp $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
|
| 33 |
@@ -101,7 +101,7 @@ |
| 34 |
doins "${FILESDIR}"/default/useradd |
| 35 |
|
| 36 |
# move passwd to / to help recover broke systems #64441 |
| 37 |
- mv "${ED}"/usr/bin/passwd "${ED}"/bin/ |
| 38 |
+ mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die |
| 39 |
dosym /bin/passwd /usr/bin/passwd |
| 40 |
|
| 41 |
cd "${S}" |
| 42 |
@@ -158,7 +158,7 @@ |
| 43 |
# and/or don't apply when using pam |
| 44 |
find "${ED}"/usr/share/man \ |
| 45 |
'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ |
| 46 |
- -exec rm {} + |
| 47 |
+ -delete |
| 48 |
|
| 49 |
# Remove pam.d files provided by pambase. |
| 50 |
rm "${ED}"/etc/pam.d/{login,passwd,su} || die |
| 51 |
@@ -167,7 +167,7 @@ |
| 52 |
# Remove manpages that are handled by other packages |
| 53 |
find "${ED}"/usr/share/man \ |
| 54 |
'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ |
| 55 |
- -exec rm {} + |
| 56 |
+ -delete |
| 57 |
|
| 58 |
cd "${S}" |
| 59 |
dodoc ChangeLog NEWS TODO |
| 60 |
@@ -184,8 +184,8 @@ |
| 61 |
pkg_postinst() { |
| 62 |
# Enable shadow groups. |
| 63 |
if [ ! -f "${EROOT}"/etc/gshadow ] ; then |
| 64 |
- if grpck -r -R "${ROOT}" 2>/dev/null ; then |
| 65 |
- grpconv -R "${ROOT}" |
| 66 |
+ if grpck -r -R "${EROOT}" 2>/dev/null ; then |
| 67 |
+ grpconv -R "${EROOT}" |
| 68 |
else |
| 69 |
ewarn "Running 'grpck' returned errors. Please run it by hand, and then" |
| 70 |
ewarn "run 'grpconv' afterwards!" |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.296 sys-apps/shadow/ChangeLog |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/ChangeLog?rev=1.296&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/ChangeLog?rev=1.296&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/shadow/ChangeLog?r1=1.295&r2=1.296 |
| 79 |
|
| 80 |
Index: ChangeLog |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v |
| 83 |
retrieving revision 1.295 |
| 84 |
retrieving revision 1.296 |
| 85 |
diff -u -r1.295 -r1.296 |
| 86 |
--- ChangeLog 9 Dec 2014 01:50:57 -0000 1.295 |
| 87 |
+++ ChangeLog 9 Feb 2015 20:34:28 -0000 1.296 |
| 88 |
@@ -1,6 +1,9 @@ |
| 89 |
# ChangeLog for sys-apps/shadow |
| 90 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.295 2014/12/09 01:50:57 heroxbd Exp $ |
| 92 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 93 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.296 2015/02/09 20:34:28 vapier Exp $ |
| 94 |
+ |
| 95 |
+ 09 Feb 2015; Mike Frysinger <vapier@g.o> shadow-4.2.1.ebuild: |
| 96 |
+ Use -delete with find, and fix prefix handling in a few places. |
| 97 |
|
| 98 |
09 Dec 2014; Benda Xu <heroxbd@g.o> shadow-4.2.1.ebuild: |
| 99 |
Prefix support: trivial D -> ED and ROOT -> EROOT. |
Archives