summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-10-25 16:06:42 +0000
committerAnthony G. Basile <blueness@gentoo.org>2012-10-25 16:06:42 +0000
commitd671576fd033da5796199fb9199365eb7b860450 (patch)
treec6a8e9de70346b5f99ed28c3d52b590d81aaa5b0 /profiles
parentAdd upstream patch to avoid crash when DISPLAY is unset. #439134 (diff)
downloadgentoo-2-d671576fd033da5796199fb9199365eb7b860450.tar.gz
gentoo-2-d671576fd033da5796199fb9199365eb7b860450.tar.bz2
gentoo-2-d671576fd033da5796199fb9199365eb7b860450.zip
Remove redundant default USE flags for hardened/linux/uclibc profiles
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/hardened/linux/uclibc/make.defaults6
-rw-r--r--profiles/hardened/linux/uclibc/use.mask6
3 files changed, 13 insertions, 5 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a63d59786afe..94ef3ac000aa 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7060 2012/10/24 22:25:29 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7061 2012/10/25 16:06:42 blueness Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 25 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+ hardened/linux/uclibc/make.defaults, hardened/linux/uclibc/use.mask:
+ Remove redundant default USE flags for hardened/linux/uclibc profiles
+
24 Oct 2012; Alex Alexander <wired@gentoo.org> package.mask:
(re-)masked pf-sources-3.6.{3,4} due to ext4 data loss regression, bug
#439502
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index 447348169786..3ff6b6378ffe 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/make.defaults,v 1.3 2012/10/08 17:57:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/make.defaults,v 1.4 2012/10/25 16:06:42 blueness Exp $
PORTAGE_LIBC="uClibc"
ELIBC=uclibc
FEATURES="sandbox sfperms strict"
-USE="hardened ncurses nptl pax_kernel pic readline unicode xattr zlib -jit -orc -pam "
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic zlib pax_kernel pic -jit -orc -pam"
+USE="hardened nptl pax_kernel pic unicode xattr -berkdb"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb"
SYMLINK_LIB="no"
diff --git a/profiles/hardened/linux/uclibc/use.mask b/profiles/hardened/linux/uclibc/use.mask
index abe2b60c53e8..2af0481cac82 100644
--- a/profiles/hardened/linux/uclibc/use.mask
+++ b/profiles/hardened/linux/uclibc/use.mask
@@ -1,10 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/use.mask,v 1.2 2012/10/07 11:42:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/use.mask,v 1.3 2012/10/25 16:06:42 blueness Exp $
nls
pam
+# JIT leads to RWX mmap denials with a PaX kernel
+jit
+orc
+
emul-linux-x86
-uclibc