From 6da8f88a6a3dcc1b1ccdf3624fac1f5c4d184538 Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Date: Mon, 29 Aug 2011 03:18:02 +0000
Subject: [PATCH] Added portage config files for the admincd. Dropped
 conflicting packages and fixed tcpdump name.

svn path=/trunk/; revision=807
---
 releases/weekly/portage/admincd/package.keywords/packages | 4 ++++
 releases/weekly/specs/amd64/hardened/admincd-stage1.spec  | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 releases/weekly/portage/admincd/package.keywords/packages

diff --git a/releases/weekly/portage/admincd/package.keywords/packages b/releases/weekly/portage/admincd/package.keywords/packages
new file mode 100644
index 00000000..2588469e
--- /dev/null
+++ b/releases/weekly/portage/admincd/package.keywords/packages
@@ -0,0 +1,4 @@
+sys-block/lsiutil ~amd64
+sys-block/megacli ~amd64
+sys-block/megarc ~amd64
+sys-fs/ext3grep ~amd64
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index faa13dfa..a4f4c976 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
@@ -5,6 +5,7 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: hardened/stage3-amd64-hardened-latest
+portage_confdir: /release/svn-releng/trunk/releases/weekly/portage/admincd
 livecd/use:
 	-*
 	deprecated
@@ -50,7 +51,6 @@ livecd/packages:
 	app-benchmarks/bonnie++
 	app-benchmarks/dbench
 	app-benchmarks/iozone
-	app-benchmarks/lmbench
 	app-benchmarks/piozone
 	app-benchmarks/stress
 	app-benchmarks/tiobench
@@ -75,7 +75,6 @@ livecd/packages:
 	app-shells/bash-completion
 	app-shells/gentoo-bashcomp
 	app-shells/zsh
-	app-text/dos2unix
 	app-text/tree
 	app-text/unix2dos
 	app-text/wgetpaste
@@ -85,12 +84,11 @@ livecd/packages:
 	media-gfx/fbgrab
 	net-analyzer/gnu-netcat
 	net-analyzer/iptraf-ng
-	net-analyzer/netcat
 	net-analyzer/netcat6
 	net-analyzer/tcptraceroute
 	net-analyzer/traceroute
 	net-analyzer/traceroute-nanog
-	net-analyzer/tpdump
+	net-analyzer/tcpdump
 	net-analyzer/nmap
 	net-dialup/mingetty
 	net-dialup/minicom
@@ -144,6 +142,7 @@ livecd/packages:
 	sys-apps/flashrom
 	sys-apps/fxload
 	sys-apps/gawk
+	sys-apps/gptfdisk
 	sys-apps/grep
 	sys-apps/hdparm
 	sys-apps/hwsetup