- profile updates for bug 89181 and added ppc64 profile for dostrow and IBM

9 files changed, 132 insertions, 3 deletions

diff --git a/profiles/hardened/amd64/make.defaults b/profiles/hardened/amd64/make.defaults
index 0b0f6d1799e4..2657dcbce833 100644
--- a/profiles/hardened/amd64/make.defaults
+++ b/profiles/hardened/amd64/make.defaults
@@ -1,9 +1,14 @@
 # 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.4 2005/03/24 21:06:09 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/make.defaults,v 1.5 2005/04/15 16:58:18 solar Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
 GRP_STAGE23_USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic pie hardened nls justify userlocales"
 USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic pie hardened nls justify userlocales"
 MULTILIB_ABIS="amd64"
+
+# amd64
+CHOST="x86_64-pc-linux-gnu"
+CFLAGS="-march=x86-64 -O2 -pipe -fforce-addr"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/ppc/make.defaults b/profiles/hardened/ppc/make.defaults
index 3f03dbfcc350..75011601bb55 100644
--- a/profiles/hardened/ppc/make.defaults
+++ b/profiles/hardened/ppc/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/make.defaults,v 1.1 2005/01/06 21:32:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/make.defaults,v 1.2 2005/04/15 16:58:18 solar Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -8,3 +8,9 @@ GRP_STAGE23_USE="${ARCH} berkdb crypt dlloader hardened nls pam pic pie readline
 USE="${ARCH} dlloader ${GRP_STAGE23_USE}"
 PORTDIR=/usr/portage/
 PKGDIR=${PORTDIR}/packages/${ARCH}/
+
+# ppc
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FEATURES="-sandbox"
diff --git a/profiles/hardened/ppc64/README b/profiles/hardened/ppc64/README
new file mode 100644
index 000000000000..75da7811fc43
--- /dev/null
+++ b/profiles/hardened/ppc64/README
@@ -0,0 +1,2 @@
+This profile is in testing only and results may very.
+Please send feedback and patches to solar.
diff --git a/profiles/hardened/ppc64/make.defaults b/profiles/hardened/ppc64/make.defaults
new file mode 100644
index 000000000000..7b237b04685f
--- /dev/null
+++ b/profiles/hardened/ppc64/make.defaults
@@ -0,0 +1,16 @@
+# Copyright 2005 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/make.defaults,v 1.1 2005/04/15 16:58:18 solar Exp $
+
+ARCH="ppc64"
+ACCEPT_KEYWORDS="${ARCH}"
+GRP_STAGE23_USE="${ARCH} berkdb crypt hardened pam pic pie readline ssl zlib"
+USE="${ARCH} ${GRP_STAGE23_USE}"
+PORTDIR=/usr/portage/
+PKGDIR=${PORTDIR}/packages/${ARCH}/
+
+# ppc64
+CHOST="powerpc64-unknown-linux-gnu"
+CFLAGS="-O2 -pipe -fforce-addr"
+CXXFLAGS="${CFLAGS}"
+FEATURES="-sandbox"
diff --git a/profiles/hardened/ppc64/packages b/profiles/hardened/ppc64/packages
new file mode 100644
index 000000000000..c41c1872e2da
--- /dev/null
+++ b/profiles/hardened/ppc64/packages
@@ -0,0 +1,9 @@
+# Copyright 2005 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/packages,v 1.1 2005/04/15 16:58:18 solar Exp $
+
+*sys-fs/hfsutils
+*>=sys-devel/binutils-2.15
+*>=sys-devel/gcc-3.4.0-r6
+*>=sys-libs/glibc-2.3.3_pre20040529
+*sys-fs/mac-fdisk
diff --git a/profiles/hardened/ppc64/parent b/profiles/hardened/ppc64/parent
new file mode 100644
index 000000000000..9a49c7541e1e
--- /dev/null
+++ b/profiles/hardened/ppc64/parent
@@ -0,0 +1,5 @@
+# Copyright 2005 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/parent,v 1.1 2005/04/15 16:58:18 solar Exp $
+
+..
diff --git a/profiles/hardened/ppc64/use.mask b/profiles/hardened/ppc64/use.mask
new file mode 100644
index 000000000000..f20b877dbaaa
--- /dev/null
+++ b/profiles/hardened/ppc64/use.mask
@@ -0,0 +1,69 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/use.mask,v 1.1 2005/04/15 16:58:18 solar Exp $
+# This is an exact copy of the ppc64 use.mask
+
+# this is a list of USE flags
+# that should not be used on PPC64
+# Tom Gall <tgall@gentoo.org> manages this list
+afs
+acpi
+3dfx
+directfb
+emboss
+avi
+icc
+icc-pgo
+ifc
+krb4
+mplayer
+pda
+prelude
+ruby
+svga
+scanner
+firebird
+mzscheme
+chasen
+fdftk
+mono
+
+# should be ok
+jikes
+junit
+
+guile
+caps
+
+# for now from xorg ... but likely not for long as this is desirable!
+dlloader
+
+# 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
+# architecture.
+adabas
+birdstep
+cpdflib
+db2
+dbmaker
+empress
+empress-bcs
+esoob
+filepro
+frontbase
+hyperwave
+informix
+ingres
+oracle7
+oci8
+pfpro
+solid
+sybase
+sybase-ct
+glitz
+cairo
+
+# dietlibc
+diet
+
+# Unmask our instruction sets
+-altivec
diff --git a/profiles/hardened/ppc64/virtuals b/profiles/hardened/ppc64/virtuals
new file mode 100644
index 000000000000..75a6cf660396
--- /dev/null
+++ b/profiles/hardened/ppc64/virtuals
@@ -0,0 +1,10 @@
+# Copyright 2005 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/virtuals,v 1.1 2005/04/15 16:58:18 solar Exp $
+
+virtual/bootloader     sys-boot/yaboot-static
+virtual/jdk            dev-java/ibm-jdk-bin
+virtual/jre            dev-java/ibm-jre-bin
+virtual/linux-sources  sys-kernel/hardened-sources
+virtual/kernel         sys-kernel/linux-headers
+virtual/os-headers     sys-kernel/linux-headers
diff --git a/profiles/hardened/x86/make.defaults b/profiles/hardened/x86/make.defaults
index 344f15726c4a..3d9be5b5a5ed 100644
--- a/profiles/hardened/x86/make.defaults
+++ b/profiles/hardened/x86/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/x86/make.defaults,v 1.9 2005/03/24 21:15:13 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.10 2005/04/15 16:58:18 solar Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -8,3 +8,10 @@ GRP_STAGE23_USE="${ARCH} berkdb crypt readline nls ssl tcpd zlib pam pic pie har
 USE="${ARCH} berkdb crypt dlloader hardened nls pam pic pie readline ssl tcpd zlib userlocales"
 PORTDIR=/usr/portage/
 PKGDIR=${PORTDIR}/packages/${ARCH}/
+
+# x86
+CHOST="i386-pc-linux-gnu"
+CFLAGS="-O2 -mcpu=i386 -pipe -fforce-addr"
+CXXFLAGS="${CFLAGS}"
+
+