summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2010-08-23 21:54:42 +0000
committerMagnus Granberg <zorry@gentoo.org>2010-08-23 21:54:42 +0000
commit9168d0c125ea43677c290c56ec36c0d6e389f5ec (patch)
tree1737f511fc6f4e19ee69276ac125295337e124be /profiles
parentold (diff)
downloadgentoo-2-9168d0c125ea43677c290c56ec36c0d6e389f5ec.tar.gz
gentoo-2-9168d0c125ea43677c290c56ec36c0d6e389f5ec.tar.bz2
gentoo-2-9168d0c125ea43677c290c56ec36c0d6e389f5ec.zip
Undo the move hardened to base/package.use.mask #280413
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/package.use.mask7
-rw-r--r--profiles/default/linux/package.use.mask5
4 files changed, 14 insertions, 9 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 48a97b6fc116..f3725c3f2afe 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4493 2010/08/23 20:47:12 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4494 2010/08/23 21:54:42 zorry 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
@@ -8,6 +8,10 @@
23 Aug 2010; Magnus Granberg <zorry@gentoo.org> base/package.use.mask,
default/linux/package.use.mask:
+ Undo the hardened USE move #280413
+
+ 23 Aug 2010; Magnus Granberg <zorry@gentoo.org> base/package.use.mask,
+ default/linux/package.use.mask:
Move hardened to base/package.use.mask #280413
22 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index cfaa43560e58..af78eb30777d 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.171 2010/08/23 20:47:12 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.172 2010/08/23 21:54:42 zorry Exp $
+
+ 23 Aug 2010; Magnus Granberg <zorry@gentoo.org> package.use.mask:
+ Undo the change for hardened #280413
23 Aug 2010; Magnus Granberg <zorry@gentoo.org> package.use.mask:
Moved hardened from default/linux/package.use.mask #280413
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index cbcf66bf95cd..407d1699d742 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,11 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.160 2010/08/23 20:47:12 zorry Exp $
-
-# Magnus Granberg <zorry@gentoo.org> (23 Aug 2010)
-# Moved from default/linux/package.use.mask #280413
-sys-devel/gcc hardened
-sys-libs/glibc hardened
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.161 2010/08/23 21:54:42 zorry Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 347305ff343d..c57e611fcda9 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,6 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.use.mask,v 1.17 2010/08/23 20:47:13 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.use.mask,v 1.18 2010/08/23 21:54:42 zorry Exp $
+
+sys-devel/gcc hardened
+sys-libs/glibc hardened
# Diego E. Pettenò <flameeyes@gentoo.org> (20 Aug 2009)
#