virtual/shadow related updates.

8 files changed, 20 insertions, 14 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index cbb1cc63105a..b43c0539e9a7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6299 2012/03/11 18:40:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6300 2012/03/12 09:13:37 phajdan.jr Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  12 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> base/packages,
+  default/bsd/package.mask, default/bsd/packages, default/linux/packages.build,
+  prefix/package.provided, prefix/packages, uclibc/packages.build:
+  virtual/shadow related updates.
+
   11 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Lastrite gecko-sharp, Gtk2-MozEmbed and ntfsprogs.
 
diff --git a/profiles/base/packages b/profiles/base/packages
index b62eaf4722aa..2f6aecfa21db 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/packages,v 1.61 2012/02/26 21:22:12 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/packages,v 1.62 2012/03/12 09:13:37 phajdan.jr Exp $
 
 # Gentoo Base Profile
 
@@ -49,8 +49,6 @@
 *sys-process/procps
 *sys-process/psmisc
 *sys-apps/sed
-# eutils.eclass relies on options from newer shadow #367633
-*>=sys-apps/shadow-4.1
 *sys-apps/texinfo
 *sys-apps/which
 #*sys-devel/autoconf
@@ -73,4 +71,5 @@
 *virtual/os-headers
 *virtual/package-manager
 *virtual/pager
+*virtual/shadow
 *virtual/ssh
diff --git a/profiles/default/bsd/package.mask b/profiles/default/bsd/package.mask
index 2f46220f249e..e01c7d8bd2fb 100644
--- a/profiles/default/bsd/package.mask
+++ b/profiles/default/bsd/package.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.mask,v 1.3 2011/03/31 15:36:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.mask,v 1.4 2012/03/12 09:13:37 phajdan.jr Exp $
 
 # Mask out the GNU versions of various packages.
 # We want BSD versions wherever possible
@@ -9,6 +9,7 @@ sys-apps/apmd
 sys-block/eject
 sys-apps/net-tools
 net-misc/iputils
+sys-apps/hardened-shadow
 sys-apps/shadow
 sys-apps/utempter
 sys-apps/util-linux
diff --git a/profiles/default/bsd/packages b/profiles/default/bsd/packages
index ee3c4a5fc1f6..2702d6ecfd84 100644
--- a/profiles/default/bsd/packages
+++ b/profiles/default/bsd/packages
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/packages,v 1.8 2012/02/25 07:05:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/packages,v 1.9 2012/03/12 09:13:37 phajdan.jr Exp $
 
 -*virtual/dev-manager
 -*sys-fs/e2fsprogs
 -*sys-process/procps
 -*sys-process/psmisc
--*>=sys-apps/shadow-4.1
+-*virtual/shadow
 -*sys-apps/which
 -*virtual/modutils
 -*sys-apps/kbd
diff --git a/profiles/default/linux/packages.build b/profiles/default/linux/packages.build
index 874bd435bcca..bff7d5c22882 100644
--- a/profiles/default/linux/packages.build
+++ b/profiles/default/linux/packages.build
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation.
+# Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/packages.build,v 1.6 2011/07/14 01:18:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/packages.build,v 1.7 2012/03/12 09:13:37 phajdan.jr Exp $
 
 # This file describes the packages needed to build a stage1 based on this
 # profile.  Packages in this file are built in order.
@@ -42,4 +42,4 @@ virtual/libc
 virtual/os-headers
 virtual/package-manager
 sys-fs/udev
-sys-apps/shadow
+virtual/shadow
diff --git a/profiles/prefix/package.provided b/profiles/prefix/package.provided
index 9ff51f3f7b90..e5ebf90d61a7 100644
--- a/profiles/prefix/package.provided
+++ b/profiles/prefix/package.provided
@@ -1,3 +1,4 @@
 # some apps depend on this, and in prefix the best we can assume is that
 # we have it
 sys-apps/shadow-0
+virtual/shadow-0
diff --git a/profiles/prefix/packages b/profiles/prefix/packages
index 6da1e8830362..65114c8b7ae4 100644
--- a/profiles/prefix/packages
+++ b/profiles/prefix/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/packages,v 1.6 2012/02/20 07:51:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/packages,v 1.7 2012/03/12 09:13:37 phajdan.jr Exp $
 
 # Gentoo Base Prefix Profile
 
@@ -19,10 +19,10 @@
 -*sys-apps/kbd
 -*sys-process/procps
 -*sys-process/psmisc
--*>=sys-apps/shadow-4.1
 -*sys-fs/e2fsprogs
 -*virtual/dev-manager
 -*virtual/modutils
+-*virtual/shadow
 
 # add back prefix baselayout
 *sys-apps/baselayout-prefix
diff --git a/profiles/uclibc/packages.build b/profiles/uclibc/packages.build
index 627fe56be707..579dfcb01855 100644
--- a/profiles/uclibc/packages.build
+++ b/profiles/uclibc/packages.build
@@ -1,4 +1,4 @@
 # this should be added by nls only
 -sys-devel/gettext
 
-sys-apps/shadow
+virtual/shadow