summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2007-05-24 04:40:53 +0000
committerNed Ludd <solar@gentoo.org>2007-05-24 04:40:53 +0000
commit3f6df23a368a9b15deee942663a98275a83d7aec (patch)
treee63483f52281acec67041a65b5229268937e94b0
parentAdd pidgin-latex, which is the continuation of x11-plugins/gaim-latex (diff)
downloadgentoo-2-3f6df23a368a9b15deee942663a98275a83d7aec.tar.gz
gentoo-2-3f6df23a368a9b15deee942663a98275a83d7aec.tar.bz2
gentoo-2-3f6df23a368a9b15deee942663a98275a83d7aec.zip
- update glibc maskings, copyright headers and USE_ORDER
-rw-r--r--profiles/hardened/package.mask4
-rw-r--r--profiles/hardened/virtuals4
-rw-r--r--profiles/hardened/x86/2.6/minimal/make.defaults5
3 files changed, 6 insertions, 7 deletions
diff --git a/profiles/hardened/package.mask b/profiles/hardened/package.mask
index ae2722616c0d..0861362a4fd0 100644
--- a/profiles/hardened/package.mask
+++ b/profiles/hardened/package.mask
@@ -1,6 +1,6 @@
# Copyright 2007 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.24 2007/05/23 14:36:19 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.25 2007/05/24 04:40:53 solar Exp $
# This file is additional masking for the hardened profile
@@ -33,7 +33,7 @@ app-i18n/uim-svn
=sys-libs/glibc-2.4*
# And 2.5...
# 2006-10-09 kevquinn
-=sys-libs/glibc-2.5*
+<=sys-libs/glibc-2.5-r2
# needs >=sys-libs/glibc-2.4
>=app-arch/rar-3.7.0_beta1
diff --git a/profiles/hardened/virtuals b/profiles/hardened/virtuals
index d468fb6eedd4..c1ca40944985 100644
--- a/profiles/hardened/virtuals
+++ b/profiles/hardened/virtuals
@@ -1,7 +1,7 @@
# Copyright 1999-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/virtuals,v 1.16 2007/01/20 14:35:11 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/virtuals,v 1.17 2007/05/24 04:40:53 solar Exp $
virtual/alsa sys-kernel/hardened-sources
-virtual/linux-sources sys-kernel/hardened-sources
+virtual/linux-sources sys-kernel/hardened-sources
virtual/os-headers sys-kernel/linux-headers
diff --git a/profiles/hardened/x86/2.6/minimal/make.defaults b/profiles/hardened/x86/2.6/minimal/make.defaults
index b7e131899da8..984133854278 100644
--- a/profiles/hardened/x86/2.6/minimal/make.defaults
+++ b/profiles/hardened/x86/2.6/minimal/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 2006 Gentoo Foundation.
+# Copyright 2007 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/minimal/make.defaults,v 1.2 2007/02/20 22:43:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/minimal/make.defaults,v 1.3 2007/05/24 04:40:53 solar Exp $
# - TESTING PROFILE - TESTING PROFILE -
# ------ USE AT YOUR OWN RISK ------
@@ -8,7 +8,6 @@
ARCH="x86"
ACCEPT_KEYWORDS="${ARCH}"
USE="-* ${ARCH} crypt hardened minimal multicall ncurses pic readline zlib"
-USE_ORDER=env:pkg:conf:defaults
PORTDIR=/usr/portage/
PKGDIR=${PORTDIR}/packages/${ARCH}/