From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RmpPQ-00040q-UE for garchives@archives.gentoo.org; Mon, 16 Jan 2012 16:27:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D57ADE059B; Mon, 16 Jan 2012 16:27:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 91DAEE059B for ; Mon, 16 Jan 2012 16:27:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0705C1B401A for ; Mon, 16 Jan 2012 16:27:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3ED8880042 for ; Mon, 16 Jan 2012 16:27:40 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/hardened/linux/uclibc/amd64/, profiles/hardened/linux/uclibc/, ... X-VCS-Repository: proj/hardened-dev X-VCS-Files: profiles/hardened/linux/uclibc/amd64/make.defaults profiles/hardened/linux/uclibc/amd64/package.accept_keywords profiles/hardened/linux/uclibc/amd64/package.mask profiles/hardened/linux/uclibc/amd64/package.use.mask profiles/hardened/linux/uclibc/make.defaults profiles/hardened/linux/uclibc/package.accept_keywords profiles/hardened/linux/uclibc/package.mask profiles/hardened/linux/uclibc/package.use.mask profiles/hardened/linux/uclibc/x86/make.defaults profiles/hardened/linux/uclibc/x86/package.accept_keywords profiles/hardened/linux/uclibc/x86/package.mask profiles/hardened/linux/uclibc/x86/package.use.mask X-VCS-Directories: profiles/hardened/linux/uclibc/amd64/ profiles/hardened/linux/uclibc/ profiles/hardened/linux/uclibc/x86/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: ec8992d6268f218a99742b237d4ff0220636b3c2 Date: Mon, 16 Jan 2012 16:27:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c2d89ad5-1ebf-40ac-8b3f-b7933f4e4ef0 X-Archives-Hash: 22ee70dce71ecee332eb30580812ef4a commit: ec8992d6268f218a99742b237d4ff0220636b3c2 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Jan 16 16:27:32 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jan 16 16:27:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3Dec8992d6 profiles: consolidate hardened x86 and amd64 to parent --- profiles/hardened/linux/uclibc/amd64/make.defaults | 1 - profiles/hardened/linux/uclibc/amd64/package.mask | 1 - .../hardened/linux/uclibc/amd64/package.use.mask | 1 - profiles/hardened/linux/uclibc/make.defaults | 4 +--- .../uclibc/{amd64 =3D> }/package.accept_keywords | 0 profiles/hardened/linux/uclibc/package.mask | 3 +++ .../linux/uclibc/{x86 =3D> }/package.use.mask | 0 profiles/hardened/linux/uclibc/x86/make.defaults | 1 - .../linux/uclibc/x86/package.accept_keywords | 4 ---- profiles/hardened/linux/uclibc/x86/package.mask | 2 -- 10 files changed, 4 insertions(+), 13 deletions(-) diff --git a/profiles/hardened/linux/uclibc/amd64/make.defaults b/profile= s/hardened/linux/uclibc/amd64/make.defaults index e30b842..c4a8a7b 100644 --- a/profiles/hardened/linux/uclibc/amd64/make.defaults +++ b/profiles/hardened/linux/uclibc/amd64/make.defaults @@ -1,4 +1,3 @@ ARCH=3D"amd64" ACCEPT_KEYWORDS=3D"${ARCH}" CHOST=3D"x86_64-gentoo-linux-uclibc" -USE=3D"pic" diff --git a/profiles/hardened/linux/uclibc/amd64/package.mask b/profiles= /hardened/linux/uclibc/amd64/package.mask deleted file mode 100644 index 9298f3b..0000000 --- a/profiles/hardened/linux/uclibc/amd64/package.mask +++ /dev/null @@ -1 +0,0 @@ ->sys-fs/udev-141 diff --git a/profiles/hardened/linux/uclibc/amd64/package.use.mask b/prof= iles/hardened/linux/uclibc/amd64/package.use.mask deleted file mode 100644 index 0388180..0000000 --- a/profiles/hardened/linux/uclibc/amd64/package.use.mask +++ /dev/null @@ -1 +0,0 @@ -net-misc/iputils ipv6 diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hard= ened/linux/uclibc/make.defaults index 36dab83..3cc0723 100644 --- a/profiles/hardened/linux/uclibc/make.defaults +++ b/profiles/hardened/linux/uclibc/make.defaults @@ -3,6 +3,4 @@ CXXFLAGS=3D"${CFLAGS}" PORTAGE_LIBC=3D"uClibc" ELIBC=3Duclibc FEATURES=3D"sandbox sfperms strict" - -USE=3D"hardened ncurses nptl readline uclibc unicode xattr zlib -pam" -BOOTSTRAP_USE=3D"${BOOTSTRAP_USE} uclibc" +USE=3D"hardened ncurses nptl pic readline uclibc unicode xattr zlib -pam= " diff --git a/profiles/hardened/linux/uclibc/amd64/package.accept_keywords= b/profiles/hardened/linux/uclibc/package.accept_keywords similarity index 100% rename from profiles/hardened/linux/uclibc/amd64/package.accept_keywords rename to profiles/hardened/linux/uclibc/package.accept_keywords diff --git a/profiles/hardened/linux/uclibc/package.mask b/profiles/harde= ned/linux/uclibc/package.mask index be69761..81ab164 100644 --- a/profiles/hardened/linux/uclibc/package.mask +++ b/profiles/hardened/linux/uclibc/package.mask @@ -1,2 +1,5 @@ -sys-libs/uclibc sys-libs/glibc +# +>sys-fs/udev-141 +>sys-libs/pam-1.1.2 diff --git a/profiles/hardened/linux/uclibc/x86/package.use.mask b/profil= es/hardened/linux/uclibc/package.use.mask similarity index 100% rename from profiles/hardened/linux/uclibc/x86/package.use.mask rename to profiles/hardened/linux/uclibc/package.use.mask diff --git a/profiles/hardened/linux/uclibc/x86/make.defaults b/profiles/= hardened/linux/uclibc/x86/make.defaults index 16d6e1b..fa5e874 100644 --- a/profiles/hardened/linux/uclibc/x86/make.defaults +++ b/profiles/hardened/linux/uclibc/x86/make.defaults @@ -1,4 +1,3 @@ ARCH=3D"x86" ACCEPT_KEYWORDS=3D"x86" CHOST=3D"i386-gentoo-linux-uclibc" -USE=3D"pic" diff --git a/profiles/hardened/linux/uclibc/x86/package.accept_keywords b= /profiles/hardened/linux/uclibc/x86/package.accept_keywords deleted file mode 100644 index 81cac73..0000000 --- a/profiles/hardened/linux/uclibc/x86/package.accept_keywords +++ /dev/null @@ -1,4 +0,0 @@ -dev-libs/glib -dev-libs/libiconv ** -sys-kernel/linux-headers -sys-devel/gettext diff --git a/profiles/hardened/linux/uclibc/x86/package.mask b/profiles/h= ardened/linux/uclibc/x86/package.mask deleted file mode 100644 index 4f427dd..0000000 --- a/profiles/hardened/linux/uclibc/x86/package.mask +++ /dev/null @@ -1,2 +0,0 @@ ->sys-fs/udev-141 ->sys-libs/pam-1.1.2