syncing profile w/ default-x86

3 files changed, 19 insertions, 45 deletions

diff --git a/profiles/hardened-x86-1.4/make.defaults b/profiles/hardened-x86-1.4/make.defaults
index d369b774353a..baa72a80474d 100644
--- a/profiles/hardened-x86-1.4/make.defaults
+++ b/profiles/hardened-x86-1.4/make.defaults
@@ -1,4 +1,7 @@
-# Copyright 2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-1.4/make.defaults,v 1.9 2003/12/15 14:32:15 zhen Exp $
+
 # System-wide defaults for the gcc 3.2.3 Portage system
 
 GRP_STAGE23_USE="x86 berkdb crypt readline nls ssl tcpd zlib pam"
@@ -32,3 +35,4 @@ ACCEPT_KEYWORDS="x86"
 
 FEATURES="sandbox sfperms strict"
 #FEATURES="sandbox sfperms strict userpriv usersandbox"
+
diff --git a/profiles/hardened-x86-1.4/packages b/profiles/hardened-x86-1.4/packages
index 2e8543ffb18a..67dcf2c2fc71 100644
--- a/profiles/hardened-x86-1.4/packages
+++ b/profiles/hardened-x86-1.4/packages
@@ -1,51 +1,23 @@
-# IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
-
-# OK; you're staring at this file and you have no idea what these stars are
-# for.  Here's the scoop.  An initial "*" marks a package that is part of the
-# official "base" system profile.  If there's a "*", then "emerge system" will
-# use the line in its calculations of what "should" be installed for this
-# profile.  Lines without a "*" prefix will be ignored for profile
-# calculations.
-
-# Now, this is new: *all* lines (star or no star) will be used as a special
-# package *inclusion* mask.  For example, the line *=sys-devel/gcc-2.95.3-r1
-# will cause Portage to totally ignore all gcc ebuilds other than
-# gcc-2.95.3-r1.  >=, <=, <, > and ~ can be used to offer a bit more
-# flexibility.  For example, >=sys-libs/glibc-2.2.4 will cause emerge to ignore
-# all glibc ebuilds with a version less than 2.2.4.  This allows us to have
-# profile-specific package.mask settings.  *All* lines are used for this
-# masking process, whether they are prefixed with a * or not.  And if a generic
-# dep is used, like "sys-apps/foo", then all versions of foo are included.  If
-# there is no entry, then all versions of an app are included.  The key thing
-# to note is that this file does not need to end up being an exhaustive list
-# of portage packages; just the ones critical to this profile.
-
-# So, what happens to /usr/portage/profiles/package.mask?  It's still around,
-# and still useful.  But it should mainly be used for broken ebuilds only.
-# package.mask continues to function as normal, masking out ebuilds from *all*
-# system profiles.
-
-# Which to use?  Use the profile-specific stuff to "lock down" specific
-# versions of ebuilds.  Gentoo Linux 1.0_rc6 uses certain known-compatible
-# versions of binutils, gcc and glibc, so we lock them down here.  This
-# prevents the user from shooting himself/herself in the foot by installing a
-# wacky version.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-1.4/packages,v 1.12 2003/12/15 14:32:15 zhen Exp $
 
+# base system stuff
 >dev-lang/gpc-2.1
 *>=sys-apps/baselayout-1.8.6.10-r1
 *>=sys-apps/portage-2.0.49-r3
-*>=sys-devel/binutils-2.13.90.0.6-r2
 
+# toolchain stuff
+*>=sys-devel/binutils-2.13.90.0.6-r2
 *>=sys-devel/gcc-3.2.3-r2
-
 *>=sys-devel/hardened-gcc-2.4.5
 *>=sys-libs/glibc-2.3.2-r1
-#*>=sys-apps/module-init-utils-0.9.10-r5
 *virtual/modutils
 virtual/os-headers
+
+# regular package defs
 >=app-admin/sysklogd-1.4.1
 *dev-lang/python
-
 >=x11-base/xfree-4.1.0-r12
 *app-shells/sash
 *dev-lang/perl
@@ -84,6 +56,8 @@ virtual/os-headers
 
 # <zhen@gentoo.org> Again, added until bug 10135 is addressed
 *sys-apps/pam-login
+>=sys-libs/pam-0.75-r9
+*sys-libs/pwdb
 
 *app-arch/sharutils
 *app-arch/tar
@@ -101,15 +75,10 @@ virtual/os-headers
 *sys-devel/make
 *sys-devel/patch
 *sys-libs/cracklib  
-*<sys-libs/db-4.1.0
+*sys-libs/db
 *>=sys-libs/ncurses-5.2.20020112a
-
-# <zhen@gentoo.org> the following 2 lines are 
-# necessary until bug 10135 is addressed
->=sys-libs/pam-0.75-r9
-*sys-libs/pwdb
-
 *sys-libs/readline  
 *sys-libs/zlib
 *virtual/ssh
 *sys-fs/devfsd
+
diff --git a/profiles/hardened-x86-1.4/virtuals b/profiles/hardened-x86-1.4/virtuals
index 59cff69c08c5..9cbea113b41b 100644
--- a/profiles/hardened-x86-1.4/virtuals
+++ b/profiles/hardened-x86-1.4/virtuals
@@ -46,6 +46,7 @@ virtual/tetex			app-text/tetex
 virtual/bittorrent		net-p2p/bittorrent
 virtual/logger			app-admin/sysklogd
 virtual/ssh				net-misc/openssh
+virtual/commonlisp		dev-lisp/cmucl dev-lisp/sbcl dev-lisp/cmucl
 virtual/tftp			net-misc/tftp-hpa
 virtual/gzip			app-arch/gzip
-virtual/ghostscript	app-text/ghostscript
+virtual/ghostscript		app-text/ghostscript