- more profile updates from r2d2

3 files changed, 10 insertions, 102 deletions

diff --git a/profiles/hardened/amd64/make.defaults b/profiles/hardened/amd64/make.defaults
index 36378fb96b74..9d1c6047fb85 100644
--- a/profiles/hardened/amd64/make.defaults
+++ b/profiles/hardened/amd64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/make.defaults,v 1.8 2005/07/09 19:45:04 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/make.defaults,v 1.9 2005/07/09 23:30:07 solar Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -8,13 +8,14 @@ GRP_STAGE23_USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic hardened nl
 USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic hardened nls justify userlocales"
 MULTILIB_ABIS="amd64"
 DEFAULT_ABI="amd64"
+ABI="amd64"
 
 # amd64
 CHOST="x86_64-pc-linux-gnu"
 CFLAGS="-march=x86-64 -O2 -pipe -fforce-addr"
 CXXFLAGS="${CFLAGS}"
 
-CFLAGS_amd64="-m64"
+CFLAGS_amd64=""
 LDFLAGS_amd64="-m elf_x86_64"
 CHOST_amd64="x86_64-pc-linux-gnu"
 CDEFINE_amd64="__x86_64__"
diff --git a/profiles/hardened/amd64/packages b/profiles/hardened/amd64/packages
index 886eb2a00773..d7124ebf8aae 100644
--- a/profiles/hardened/amd64/packages
+++ b/profiles/hardened/amd64/packages
@@ -1,69 +1,7 @@
->dev-lang/gpc-2.1
-*>=sys-apps/baselayout-1.8.11
-*>=sys-apps/portage-2.0.50-r8
-*>=sys-devel/binutils-2.14.90.0.8-r1
-*>=sys-devel/gcc-3.3.3
-*>=sys-libs/glibc-2.3.4.20040605
--<sys-libs/glibc-2.3.4
-*virtual/modutils
->=sys-apps/sysklogd-1.4.1
-*dev-lang/python
+*>=sys-devel/binutils-2.13.90.0.4
+
+>=x11-base/xorg-x11-6.8.0-r4
 
->=x11-base/xorg-x11-4.3.0-r6
-# busybox for system recovery
-*sys-apps/busybox
-*dev-lang/perl
-*virtual/editor
-*net-misc/dhcpcd
-*net-misc/iputils
-*net-misc/rsync
-*net-misc/wget
-*app-shells/bash
-*app-arch/bzip2
-*sys-apps/kbd
-*app-arch/cpio
-*sys-apps/debianutils
-*sys-apps/diffutils
-*sys-fs/e2fsprogs
-*sys-apps/ed
-*sys-apps/file
-*sys-apps/findutils
-*sys-apps/gawk
-*sys-apps/grep
-*sys-apps/groff
-*app-arch/gzip
-*sys-apps/hdparm
-*sys-apps/less
-*sys-apps/man
-*sys-apps/man-pages
-*sys-apps/net-tools
-*sys-process/procps
-*sys-process/psmisc
-*sys-apps/sed
-*sys-apps/setserial
-*<sys-apps/shadow-5
-*sys-apps/pam-login
-*app-arch/tar
-*>=sys-apps/texinfo-4.5
-*sys-apps/coreutils
-*sys-apps/util-linux
-*sys-apps/which
-*sys-devel/autoconf
-*sys-devel/automake
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
 *sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-libs/cracklib  
-*sys-libs/db
-*>=sys-libs/ncurses-5.4
-*>=sys-libs/pam-0.77
-*sys-libs/pwdb      
-*sys-libs/readline  
-*sys-libs/zlib
-*net-misc/openssh
-*virtual/dev-manager
-*sys-apps/linux32
+*sys-libs/pwdb
+*virtual/dev-manager 
diff --git a/profiles/hardened/x86/packages b/profiles/hardened/x86/packages
index 76dc8b576c66..39bd19efa2e3 100644
--- a/profiles/hardened/x86/packages
+++ b/profiles/hardened/x86/packages
@@ -1,43 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.8 2005/01/21 22:20:21 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages,v 1.9 2005/07/09 23:30:07 solar Exp $
 
 # 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.
-
 *>=sys-devel/binutils-2.13.90.0.4
 
->=x11-base/xorg-x11-4.1.0-r2
+>=x11-base/xorg-x11-6.8.0-r4
 
 *sys-devel/bin86
 *sys-devel/libtool