summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog10
-rw-r--r--profiles/hardened/linux/make.defaults4
-rw-r--r--profiles/hardened/linux/x86/2008.0/make.defaults5
-rw-r--r--profiles/hardened/linux/x86/make.defaults4
4 files changed, 14 insertions, 9 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index cfc9caf207a7..add3b1b28efd 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for profile directory
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1348 2008/04/21 19:38:34 jokey Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1349 2008/04/21 20:11:12 phreak Exp $
+
+ 21 Apr 2008; Christian Heim <phreak@gentoo.org>
+ hardened/linux/make.defaults, hardened/linux/x86/make.defaults,
+ hardened/linux/x86/2008.0/make.defaults:
+ Fixing the "new style" hardened profile, to *not* enable either USE=ipv6,
+ USE=nls or USE=unicode by default.
+
21 Apr 2008; Markus Ullmann <jokey@gentoo.org> package.mask:
Mask gloox beta version
diff --git a/profiles/hardened/linux/make.defaults b/profiles/hardened/linux/make.defaults
index 1b1ce2ef68ce..1da0f5fc79c8 100644
--- a/profiles/hardened/linux/make.defaults
+++ b/profiles/hardened/linux/make.defaults
@@ -1,7 +1,7 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.1 2008/04/01 17:41:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.2 2008/04/21 20:11:13 phreak Exp $
STAGE1_USE="hardened nptl nptlonly pic"
-USE="hardened pic urandom -fortran -iconv"
+USE="-fortran -ipv6 -nls hardened pic urandom"
diff --git a/profiles/hardened/linux/x86/2008.0/make.defaults b/profiles/hardened/linux/x86/2008.0/make.defaults
index 3675827476af..5baa4c83fa76 100644
--- a/profiles/hardened/linux/x86/2008.0/make.defaults
+++ b/profiles/hardened/linux/x86/2008.0/make.defaults
@@ -1,9 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/2008.0/make.defaults,v 1.1 2008/04/01 17:41:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/2008.0/make.defaults,v 1.2 2008/04/21 20:11:14 phreak Exp $
# STAGE1_USE does not stack
STAGE1_USE="hardened nptl nptlonly pic"
-USE="-nls -unicode"
-
+USE="-unicode"
diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults
index 3e5381b68285..5c513a56d007 100644
--- a/profiles/hardened/linux/x86/make.defaults
+++ b/profiles/hardened/linux/x86/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v 1.1 2008/04/01 17:41:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v 1.2 2008/04/21 20:11:14 phreak Exp $
ARCH="x86"
ACCEPT_KEYWORDS="x86"
@@ -9,7 +9,7 @@ CHOST="i486-pc-linux-gnu"
CFLAGS="-O2 -mcpu=i486 -pipe -fforce-addr"
CXXFLAGS="${CFLAGS}"
-USE="berkdb crypt hardened nls nptl nptlonly pam pic readline ssl tcpd zlib"
+USE="berkdb crypt hardened nptl nptlonly pam pic readline ssl tcpd zlib"
# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
# Defaults for video drivers