summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-06-10 16:54:22 +0000
committerRoy Marples <uberlord@gentoo.org>2006-06-10 16:54:22 +0000
commit077195d039c0029ffd13d11f298362d3fe34b002 (patch)
treec7877d7a500f9a5c23b081c2ce97b43d276d6795 /sys-apps/shadow
parentremove bogus character at end of file (diff)
downloadgentoo-2-077195d039c0029ffd13d11f298362d3fe34b002.tar.gz
gentoo-2-077195d039c0029ffd13d11f298362d3fe34b002.tar.bz2
gentoo-2-077195d039c0029ffd13d11f298362d3fe34b002.zip
Move grpconv from baselayout to shadow where it belongs.
(Portage version: 2.1)
Diffstat (limited to 'sys-apps/shadow')
-rw-r--r--sys-apps/shadow/ChangeLog6
-rw-r--r--sys-apps/shadow/shadow-4.0.14-r1.ebuild13
-rw-r--r--sys-apps/shadow/shadow-4.0.15-r2.ebuild13
-rw-r--r--sys-apps/shadow/shadow-4.0.16.ebuild13
4 files changed, 41 insertions, 4 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index ae3ff1108d08..e5aad9dd31f0 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/shadow
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.150 2006/06/09 20:34:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.151 2006/06/10 16:54:22 uberlord Exp $
+
+ 10 Jun 2006; <roy@gentoo.org> shadow-4.0.14-r1.ebuild,
+ shadow-4.0.15-r2.ebuild, shadow-4.0.16.ebuild:
+ Move grpconv from baselayout to shadow where it belongs.
09 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
Make the login.defs installed not throw warning about GETPASS_ASTERISKS, by
diff --git a/sys-apps/shadow/shadow-4.0.14-r1.ebuild b/sys-apps/shadow/shadow-4.0.14-r1.ebuild
index 22dbf6b65b62..276657a8b0ed 100644
--- a/sys-apps/shadow/shadow-4.0.14-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.14-r1.ebuild,v 1.13 2006/04/23 18:24:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.14-r1.ebuild,v 1.14 2006/06/10 16:54:22 uberlord Exp $
inherit eutils libtool toolchain-funcs flag-o-matic
@@ -213,6 +213,17 @@ pkg_preinst() {
}
pkg_postinst() {
+ # Enable shadow groups (we need ROOT=/ here, as grpconv only
+ # operate on / ...).
+ if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
+ if grpck -r &>/dev/null; then
+ grpconv
+ else
+ ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+ ewarn "run 'grpconv' afterwards!"
+ fi
+ fi
+
use pam || return 0
if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
diff --git a/sys-apps/shadow/shadow-4.0.15-r2.ebuild b/sys-apps/shadow/shadow-4.0.15-r2.ebuild
index d395e1cab6d1..ac6939ac9775 100644
--- a/sys-apps/shadow/shadow-4.0.15-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.15-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.15-r2.ebuild,v 1.9 2006/06/07 13:13:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.15-r2.ebuild,v 1.10 2006/06/10 16:54:22 uberlord Exp $
inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
@@ -205,6 +205,17 @@ pkg_preinst() {
}
pkg_postinst() {
+ # Enable shadow groups (we need ROOT=/ here, as grpconv only
+ # operate on / ...).
+ if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
+ if grpck -r &>/dev/null; then
+ grpconv
+ else
+ ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+ ewarn "run 'grpconv' afterwards!"
+ fi
+ fi
+
use pam || return 0
if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
diff --git a/sys-apps/shadow/shadow-4.0.16.ebuild b/sys-apps/shadow/shadow-4.0.16.ebuild
index 5028b55fa9fb..74c421ccd3e3 100644
--- a/sys-apps/shadow/shadow-4.0.16.ebuild
+++ b/sys-apps/shadow/shadow-4.0.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.16.ebuild,v 1.2 2006/06/09 20:34:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.16.ebuild,v 1.3 2006/06/10 16:54:22 uberlord Exp $
inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
@@ -207,6 +207,17 @@ pkg_preinst() {
}
pkg_postinst() {
+ # Enable shadow groups (we need ROOT=/ here, as grpconv only
+ # operate on / ...).
+ if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
+ if grpck -r &>/dev/null; then
+ grpconv
+ else
+ ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+ ewarn "run 'grpconv' afterwards!"
+ fi
+ fi
+
use pam || return 0
if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then