From 27e8716f81571bf8c7604cfc288da978826b65c8 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 20 Feb 2007 22:43:17 +0000 Subject: [PATCH] Removed all of the last instances of dlloader in the tree and also made sure nobody had GRP_STAGE23_USE anymore, since catalyst hasn't used it for well over a year. --- profiles/ChangeLog | 12 +++++++++++- profiles/default-bsd/fbsd/make.defaults | 6 +----- profiles/default-linux/make.defaults | 6 +----- profiles/hardened/amd64/make.defaults | 5 ++--- profiles/hardened/ppc/make.defaults | 5 ++--- profiles/hardened/ppc64/make.defaults | 4 ++-- profiles/hardened/x86/2.6/make.defaults | 4 ++-- profiles/hardened/x86/2.6/minimal/make.defaults | 5 ++--- profiles/hardened/x86/make.defaults | 5 ++--- profiles/selinux/2005.1/x86/hardened/make.defaults | 5 ++--- 10 files changed, 27 insertions(+), 30 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 61327b17e3fb..005e1adbc7e4 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.126 2007/02/20 19:23:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.127 2007/02/20 22:43:17 wolf31o2 Exp $ + + 20 Feb 2007; Chris Gianelloni + default-bsd/fbsd/make.defaults, default-linux/make.defaults, + hardened/amd64/make.defaults, hardened/ppc/make.defaults, + hardened/ppc64/make.defaults, hardened/x86/2.6/make.defaults, + hardened/x86/2.6/minimal/make.defaults, hardened/x86/make.defaults, + selinux/2005.1/x86/hardened/make.defaults: + Removed all of the last instances of dlloader in the tree and also made sure + nobody had GRP_STAGE23_USE anymore, since catalyst hasn't used it for well + over a year. 20 Feb 2007; Raúl Porcel package.mask: p.mask www-client/mozilla[-bin] again for removal, bug 135257 diff --git a/profiles/default-bsd/fbsd/make.defaults b/profiles/default-bsd/fbsd/make.defaults index 6f77bba1b6b6..addaef70e7be 100644 --- a/profiles/default-bsd/fbsd/make.defaults +++ b/profiles/default-bsd/fbsd/make.defaults @@ -1,6 +1,6 @@ # Copyright 2004-2005 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/make.defaults,v 1.8 2006/10/30 17:10:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/make.defaults,v 1.9 2007/02/20 22:43:17 wolf31o2 Exp $ FEATURES="-sandbox" @@ -27,10 +27,6 @@ USE="${USE} cli pcre reflection session spl" # Modular X: Build the Xorg X server by default USE="${USE} xorg" -# 2006/07/01 - Donnie Berkholz -# X: Build dlloader-using drivers, since >=6.9 uses dlloader, not elfloader -USE="${USE} dlloader" - # 2006/08/18 - Donnie Berkholz # Defaults for video drivers VIDEO_CARDS="dummy fbdev vmware" diff --git a/profiles/default-linux/make.defaults b/profiles/default-linux/make.defaults index 4a7af0f78626..23b6d2c36966 100644 --- a/profiles/default-linux/make.defaults +++ b/profiles/default-linux/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/make.defaults,v 1.25 2006/10/27 23:37:00 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/make.defaults,v 1.26 2007/02/20 22:43:17 wolf31o2 Exp $ # # System-wide defaults for the Portage system # See portage(5) manpage @@ -36,10 +36,6 @@ USE="${USE} xorg" # Sane defaults for input drivers INPUT_DEVICES="keyboard mouse evdev" -# 2006/07/01 - Donnie Berkholz -# X: Build dlloader-using drivers, since >=6.9 uses dlloader, not elfloader -USE="${USE} dlloader" - # 2006/08/18 - Donnie Berkholz # Lowest common denominator defaults for video drivers, # except hppa, which lacks v4l so removes it in the hppa profile diff --git a/profiles/hardened/amd64/make.defaults b/profiles/hardened/amd64/make.defaults index 7e5ca7b7f659..1588c92d1249 100644 --- a/profiles/hardened/amd64/make.defaults +++ b/profiles/hardened/amd64/make.defaults @@ -1,11 +1,10 @@ # 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.11 2007/01/20 14:21:41 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/make.defaults,v 1.12 2007/02/20 22:43:17 wolf31o2 Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" -GRP_STAGE23_USE="${ARCH} berkdb crypt hardened justify nls pam pic readline ssl tcpd zlib" -USE="${ARCH} berkdb crypt dlloader hardened justify nls pam pic readline ssl tcpd zlib" +USE="${ARCH} berkdb crypt hardened justify nls pam pic readline ssl tcpd zlib" MULTILIB_ABIS="amd64" DEFAULT_ABI="amd64" ABI="amd64" diff --git a/profiles/hardened/ppc/make.defaults b/profiles/hardened/ppc/make.defaults index 9be455ceb755..4bca7ed08f4a 100644 --- a/profiles/hardened/ppc/make.defaults +++ b/profiles/hardened/ppc/make.defaults @@ -1,11 +1,10 @@ # 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.6 2007/01/28 17:20:18 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/make.defaults,v 1.7 2007/02/20 22:43:17 wolf31o2 Exp $ ARCH="ppc" ACCEPT_KEYWORDS="${ARCH}" -GRP_STAGE23_USE="${ARCH} berkdb crypt dlloader hardened nls pam pic readline ssl tcpd zlib" -USE="${ARCH} dlloader ${GRP_STAGE23_USE}" +USE="${ARCH} berkdb crypt hardened nls pam pic readline ssl tcpd zlib" # ppc CHOST="powerpc-unknown-linux-gnu" diff --git a/profiles/hardened/ppc64/make.defaults b/profiles/hardened/ppc64/make.defaults index 0f4de9e291c7..1e895cbff144 100644 --- a/profiles/hardened/ppc64/make.defaults +++ b/profiles/hardened/ppc64/make.defaults @@ -1,10 +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/make.defaults,v 1.7 2007/01/28 17:20:18 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/make.defaults,v 1.8 2007/02/20 22:43:17 wolf31o2 Exp $ ARCH="ppc64" ACCEPT_KEYWORDS="${ARCH}" -USE="${ARCH} berkdb crypt dlloader hardened pam pic readline ssl zlib" +USE="${ARCH} berkdb crypt hardened pam pic readline ssl zlib" # ppc64 CHOST="powerpc64-unknown-linux-gnu" diff --git a/profiles/hardened/x86/2.6/make.defaults b/profiles/hardened/x86/2.6/make.defaults index 092568989b49..ccf1a1fe8d38 100644 --- a/profiles/hardened/x86/2.6/make.defaults +++ b/profiles/hardened/x86/2.6/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/x86/2.6/make.defaults,v 1.9 2007/01/20 14:40:59 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/make.defaults,v 1.10 2007/02/20 22:43:17 wolf31o2 Exp $ ARCH="x86" ACCEPT_KEYWORDS="x86" @@ -9,4 +9,4 @@ CHOST="i386-pc-linux-gnu" CFLAGS="-O2 -mcpu=i386 -pipe -fforce-addr" CXXFLAGS="${CFLAGS}" -USE="berkdb crypt dlloader hardened nls pam pic readline ssl tcpd zlib" +USE="berkdb crypt hardened nls pam pic readline ssl tcpd zlib" diff --git a/profiles/hardened/x86/2.6/minimal/make.defaults b/profiles/hardened/x86/2.6/minimal/make.defaults index 1a40b8e83fe3..b7e131899da8 100644 --- a/profiles/hardened/x86/2.6/minimal/make.defaults +++ b/profiles/hardened/x86/2.6/minimal/make.defaults @@ -1,14 +1,13 @@ # Copyright 2006 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.1 2006/02/05 04:15:13 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/minimal/make.defaults,v 1.2 2007/02/20 22:43:17 wolf31o2 Exp $ # - TESTING PROFILE - TESTING PROFILE - # ------ USE AT YOUR OWN RISK ------ ARCH="x86" ACCEPT_KEYWORDS="${ARCH}" -GRP_STAGE23_USE="${ARCH} crypt dlloader hardened minimal multicall ncurses pic readline zlib" -USE="-* ${ARCH} ${GRP_STAGE23_USE}" +USE="-* ${ARCH} crypt hardened minimal multicall ncurses pic readline zlib" USE_ORDER=env:pkg:conf:defaults PORTDIR=/usr/portage/ PKGDIR=${PORTDIR}/packages/${ARCH}/ diff --git a/profiles/hardened/x86/make.defaults b/profiles/hardened/x86/make.defaults index 4ad2ef1a01c4..1005d86c2a95 100644 --- a/profiles/hardened/x86/make.defaults +++ b/profiles/hardened/x86/make.defaults @@ -1,11 +1,10 @@ # 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.14 2007/01/28 17:20:18 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.15 2007/02/20 22:43:17 wolf31o2 Exp $ ARCH="x86" ACCEPT_KEYWORDS="${ARCH}" -USE="${ARCH} berkdb crypt dlloader hardened ncurses nls pam pic readline ssl tcpd zlib" -GRP_STAGE23_USE="${ARCH} ${USE}" +USE="${ARCH} berkdb crypt hardened ncurses nls pam pic readline ssl tcpd zlib" # x86 CHOST="i386-pc-linux-gnu" diff --git a/profiles/selinux/2005.1/x86/hardened/make.defaults b/profiles/selinux/2005.1/x86/hardened/make.defaults index c57702f40e15..b68e7f820516 100644 --- a/profiles/selinux/2005.1/x86/hardened/make.defaults +++ b/profiles/selinux/2005.1/x86/hardened/make.defaults @@ -1,7 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/hardened/make.defaults,v 1.2 2005/04/18 19:46:38 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/x86/hardened/make.defaults,v 1.3 2007/02/20 22:43:17 wolf31o2 Exp $ -USE="dlloader hardened pic" +USE="hardened pic" STAGE1_USE="hardened pic" -GRP_STAGE23_USE="hardened pic" -- 2.26.2