summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-03-12 09:13:37 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-03-12 09:13:37 +0000
commit35772379b4c68660c38c12ae603796d917eb2ce4 (patch)
tree2340f82c2f62f0bb67695784ece6b23fe018de00 /profiles/default
parentRemove old. (diff)
downloadgentoo-2-35772379b4c68660c38c12ae603796d917eb2ce4.tar.gz
gentoo-2-35772379b4c68660c38c12ae603796d917eb2ce4.tar.bz2
gentoo-2-35772379b4c68660c38c12ae603796d917eb2ce4.zip
virtual/shadow related updates.
Diffstat (limited to 'profiles/default')
-rw-r--r--profiles/default/bsd/package.mask5
-rw-r--r--profiles/default/bsd/packages4
-rw-r--r--profiles/default/linux/packages.build6
3 files changed, 8 insertions, 7 deletions
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