small profile update

3 files changed, 50 insertions, 27 deletions

diff --git a/profiles/hardened/amd64/packages b/profiles/hardened/amd64/packages
index 6f4af8aa8c6c..b88b2f0d93b3 100644
--- a/profiles/hardened/amd64/packages
+++ b/profiles/hardened/amd64/packages
@@ -1,14 +1,14 @@
 >dev-lang/gpc-2.1
-*>=sys-apps/baselayout-1.8.6.13
-*>=sys-apps/portage-2.0.50
+*>=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.3_pre20040420-r1
+*>=sys-libs/glibc-2.3.4.20040605
 *virtual/modutils
 >=sys-apps/sysklogd-1.4.1
 *dev-lang/python
 
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xfree-4.3.0-r6
 # sash - static shell for system recovery
 *app-shells/sash
 *sys-apps/paxctl
@@ -45,12 +45,12 @@
 *<sys-apps/shadow-5
 *sys-apps/pam-login
 *app-arch/tar
-*>=sys-apps/texinfo-4.2-r1
+*>=sys-apps/texinfo-4.5
 *sys-apps/coreutils
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
-*>=sys-devel/automake-1.6.1-r5
+*>=sys-devel/automake-1.8.3
 *sys-devel/bc
 *sys-devel/bison
 *sys-devel/flex
@@ -60,11 +60,11 @@
 *sys-devel/patch
 *sys-libs/cracklib  
 *sys-libs/db
-*>=sys-libs/ncurses-5.2.20020112a
-*>=sys-libs/pam-0.75-r9
+*>=sys-libs/ncurses-5.4
+*>=sys-libs/pam-0.77
 *sys-libs/pwdb      
 *sys-libs/readline  
 *sys-libs/zlib
 *net-misc/openssh
-*sys-fs/devfsd
+*virtual/dev-manager
 *sys-apps/linux32
diff --git a/profiles/hardened/amd64/use.mask b/profiles/hardened/amd64/use.mask
index df86d09ef2fc..aeffbff4ec18 100644
--- a/profiles/hardened/amd64/use.mask
+++ b/profiles/hardened/amd64/use.mask
@@ -1,36 +1,59 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.1 2004/08/05 18:51:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.2 2004/08/05 19:09:54 lv Exp $
 
+# WON'T BUILD - SECTION
+
+# 2004/06/22 - Taken from 2004.0 profile
 # Anything that relies on vm86.h will not built on amd64
 # SVGAlib doesnt build
 svga
 
+# 2004/06/22 - Taken from 2004.0 profile
+# Firebird doesnt build on amd64
+firebird
+
+# 2004/06/22 - Taken from 2004.0 profile
+# x86 binary only, used by php
+fdftk
+
+# 2004/06/22 - Danny van Dyk <kugelfang@gentoo.org>
+# version in portage does not work on amd64 yet
+uclibc
+
+# 2004/06/22 - Taken from 2004.0 profile
+# versions that are in portage do not support amd64,
+# will be removed when Intel issues an update and it gets into portage
+# (it seems to be in the works)
+icc
+ifc
+
+# 2004/06/22 - Taken from 2004.0 profile
+# masked
+3dfx
+
+# 2004/07/22 - Danny van Dyk <kugelfang@gentoo.org>
+# libcaca part of libSDL causes breakage due to missing shared object.
+# BUG #53857
+libcaca
+
+# NOT NECESSARY - SECTION
+
+# 2004/06/22 - Taken from 2004.0 profile
 # Too many packages assume that mmx/sse/sse2/3dnow are 86-32 only things to
 # make them useful on amd64. Anyway, all amd64 cpus have them, so they should
 # not be many flag dependant in this case
 mmx
-#sse
-#sse2
+sse
+sse2
 3dnow
 
-# x86 binary only for now
-icc
-
-# Firebird doesnt build on amd64
-firebird
-
+# 2004/06/22 - Taken from 2004.0 profile
 # Chris PeBenito <pebenito@gentoo.org>
 # must use a SELinux profile
 selinux
 
-# x86 binary only, used by php
-fdftk
-uclibc
-
 # altivec is a ppc instruction set.
 altivec
 
-ifc
-
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
 # Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
 # all of these are binary-only, and not presently available on this
diff --git a/profiles/hardened/amd64/virtuals b/profiles/hardened/amd64/virtuals
index 8511e4aa19fa..9108cb3bd957 100644
--- a/profiles/hardened/amd64/virtuals
+++ b/profiles/hardened/amd64/virtuals
@@ -1,12 +1,12 @@
 sys-apps/sh-utils	sys-apps/coreutils
 sys-apps/textutils	sys-apps/coreutils
 sys-apps/fileutils	sys-apps/coreutils
-virtual/os-headers	sys-kernel/linux-headers
+virtual/os-headers	sys-kernel/linux26-headers
 virtual/lpr             net-print/cups
 virtual/python          dev-lang/python
 virtual/mta             mail-mta/ssmtp
 virtual/alsa            sys-kernel/hardened-dev-sources
-virtual/kernel          sys-kernel/linux-headers
+virtual/kernel          sys-kernel/linux26-headers
 virtual/linux-sources   sys-kernel/hardened-dev-sources
 virtual/glibc           sys-libs/glibc
 virtual/libc           sys-libs/glibc
@@ -34,7 +34,7 @@ virtual/bootloader	sys-boot/grub-static
 virtual/editor		app-editors/nano
 virtual/jack		media-sound/jack-audio-connection-kit
 virtual/quicktime	media-libs/libquicktime
-virtual/os-headers	sys-kernel/linux-headers
+virtual/os-headers	sys-kernel/linux26-headers
 virtual/ghc             dev-lang/ghc-bin
 #sys-apps/modutils	sys-apps/module-init-tools
 virtual/modutils	sys-apps/module-init-tools