15 files changed, 29 insertions, 498 deletions
diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 46b2d11443fb..629e991c9546 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/gradm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.43 2005/01/25 14:24:18 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.44 2005/02/25 19:02:35 solar Exp $
+
+  25 Feb 2005; <solar@gentoo.org> -gradm-1.9.14.ebuild, -gradm-2.0-r1.ebuild,
+  -gradm-2.0.1-r1.ebuild, -gradm-2.0.1.ebuild, -gradm-2.0.2.ebuild,
+  -gradm-2.0.ebuild, gradm-2.1.0.ebuild:
+  - removed older ebuilds. If somebody needs them they can get them from the
+  viewcvs Attic. Updated /dev/grsec to use ROOT for device nod creation. Thanks
+  carlo for pointing this out.
 
   25 Jan 2005; Jason Wever <weeve@gentoo.org> gradm-2.1.0.ebuild:
   Marking back to ~sparc as, to my knowledge, the sparc team didn't change
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 73117dfc2078..0ebce7352c51 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,21 +1,21 @@
-MD5 f3d9ccaeb99863c240244f4a23675352 ChangeLog 6423
-MD5 25344cec9f60885c980bb6e225c9a159 gradm-2.0.ebuild 2314
-MD5 cde2aba87b28b9da933b5477e98f830a gradm-2.0-r1.ebuild 2504
-MD5 ae49cf3ffc8c65a8082ee9fa257969b4 gradm-1.9.14.ebuild 1638
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6a863234df9194498d45e96031138d7a gradm-2.1.0.ebuild 1313
+MD5 1945930231d0dfbb07ee73a7d10bbd2a ChangeLog 6799
 MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221
-MD5 ad1108de5611c7bcf57d3183390ebcaf gradm-2.0.1.ebuild 2551
-MD5 92c6aac45c95a48fd62876851fd3af0c gradm-2.0.1-r1.ebuild 2249
-MD5 d14408f62bd5ed82444bc955ee9c55ef gradm-2.0.2.ebuild 2255
-MD5 b7e652c785c7a467e3f71c8c749ee7ab gradm-2.1.0.ebuild 1292
-MD5 62ba83f9a7bd71b4011ad2a2cf48f4a3 files/digest-gradm-2.0 60
-MD5 62ba83f9a7bd71b4011ad2a2cf48f4a3 files/digest-gradm-2.0-r1 60
-MD5 838722234beedbde03008d451ec2327d files/digest-gradm-2.0.1 62
-MD5 f008a8f1133ea0db35a4ee305d390c23 files/digest-gradm-1.9.14 63
-MD5 c2618fc7963e008681dfd08db6886058 files/gradm_parse.c-1.9.x.patch 524
-MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
 MD5 f2401396b01c577f727c2da3b694c779 files/grsecurity.rc 1810
+MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
+MD5 1535781388eb902dfef66f6240f53137 files/digest-gradm-2.1.0 75
 MD5 264e377e7c3221570d3730444e84d792 files/gradm2-cvs-20Jun2004.diff 8251
-MD5 838722234beedbde03008d451ec2327d files/digest-gradm-2.0.1-r1 62
+MD5 c2618fc7963e008681dfd08db6886058 files/gradm_parse.c-1.9.x.patch 524
 MD5 c016f75a48190153dcb63f9cba78abef files/gradm-2.0.1-install.patch 488
-MD5 a631aadfb61d10c6a99256f1cf0fbc53 files/digest-gradm-2.0.2 62
-MD5 1535781388eb902dfef66f6240f53137 files/digest-gradm-2.1.0 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iQCVAwUBQh92Np4WFLgrx1GWAQJxrwQAyBBj4DBwmGoWus57Ro9D7zRaw/JTdKLq
+olN52URIk6QCUhdkxiUyZtwpIvL/jfymkDQFZ0Y1QD3tMMxp2XM2VAmsB3WsONma
+sptNKMlp84MvydMnS5Wb8rFUkBzLYj1jZ7gkW7NCwEnTtkhc5HMZ2nAgG3BHsl2h
+a3S1yzeZLc8=
+=6Gy+
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gradm/files/digest-gradm-1.9.14 b/sys-apps/gradm/files/digest-gradm-1.9.14
deleted file mode 100644
index 9a774cb0ae51..000000000000
--- a/sys-apps/gradm/files/digest-gradm-1.9.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64b4f00004d24eeca54ef7b6f0885ded gradm-1.9.14.tar.gz 32139
diff --git a/sys-apps/gradm/files/digest-gradm-2.0 b/sys-apps/gradm/files/digest-gradm-2.0
deleted file mode 100644
index 48bc98e985b1..000000000000
--- a/sys-apps/gradm/files/digest-gradm-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b1c99ec6ea415fcc75ac1b89edc90f0 gradm-2.0.tar.gz 48424
diff --git a/sys-apps/gradm/files/digest-gradm-2.0-r1 b/sys-apps/gradm/files/digest-gradm-2.0-r1
deleted file mode 100644
index 48bc98e985b1..000000000000
--- a/sys-apps/gradm/files/digest-gradm-2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4b1c99ec6ea415fcc75ac1b89edc90f0 gradm-2.0.tar.gz 48424
diff --git a/sys-apps/gradm/files/digest-gradm-2.0.1 b/sys-apps/gradm/files/digest-gradm-2.0.1
deleted file mode 100644
index fb4207ac5639..000000000000
--- a/sys-apps/gradm/files/digest-gradm-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26a33a884a8f92d29ddb34be81334429 gradm-2.0.1.tar.gz 50464
diff --git a/sys-apps/gradm/files/digest-gradm-2.0.1-r1 b/sys-apps/gradm/files/digest-gradm-2.0.1-r1
deleted file mode 100644
index fb4207ac5639..000000000000
--- a/sys-apps/gradm/files/digest-gradm-2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26a33a884a8f92d29ddb34be81334429 gradm-2.0.1.tar.gz 50464
diff --git a/sys-apps/gradm/files/digest-gradm-2.0.2 b/sys-apps/gradm/files/digest-gradm-2.0.2
deleted file mode 100644
index f462d31c5a92..000000000000
--- a/sys-apps/gradm/files/digest-gradm-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a766edd7027d78117307af66e6fe326a gradm-2.0.2.tar.gz 50978
diff --git a/sys-apps/gradm/gradm-1.9.14.ebuild b/sys-apps/gradm/gradm-1.9.14.ebuild
deleted file mode 100644
index 53d7b94e0836..000000000000
--- a/sys-apps/gradm/gradm-1.9.14.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.14.ebuild,v 1.5 2005/01/08 21:26:59 solar Exp $
-
-inherit gcc flag-o-matic eutils
-
-DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gradm_parse.c-1.9.x.patch
-
-	# (Jan 2 2004) - <solar@gentoo>
-	# static linking required for proper operation of gradm
-	# however ssp is known to break static linking when it's enabled
-	# in >=gcc-3.3.1 && <=gcc-3.3.2-r5 . So we strip ssp if needed. 
-	gmicro=$(gcc-micro-version)
-	if [ "$(gcc-version)" == "3.3" -a -n "${gmicro}" -a ${gmicro} -le 2 ]; then
-		# extract out gentoo revision
-		gentoo_gcc_r=$($(gcc-getCC) -v 2>&1 | tail -n 1 | awk '{print $7}')
-		gentoo_gcc_r=${gentoo_gcc_r/,/}
-		gentoo_gcc_r=${gentoo_gcc_r/-/ }
-		gentoo_gcc_r=${gentoo_gcc_r:7}
-		[ -n "${gentoo_gcc_r}" -a ${gentoo_gcc_r} -le 5 ] && \
-			filter-flags -fstack-protector -fstack-protector-all
-	fi
-
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-}
-
-src_compile() {
-	emake CC="$(gcc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	doman gradm.8
-	dodoc acl
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/grsecurity.rc grsecurity
-	insinto /etc/conf.d
-	doins ${FILESDIR}/grsecurity
-	into /
-	dosbin gradm
-	fperms 700 /sbin/gradm
-}
diff --git a/sys-apps/gradm/gradm-2.0-r1.ebuild b/sys-apps/gradm/gradm-2.0-r1.ebuild
deleted file mode 100644
index 13849af60518..000000000000
--- a/sys-apps/gradm/gradm-2.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.0-r1.ebuild,v 1.4 2005/01/08 21:26:59 solar Exp $
-
-inherit flag-o-matic gcc
-
-#MY_PV=2.0-${PV/*_/}
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://www.grsecurity.net/gradm-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64" ; # ~alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fixup for hardened-dev-sources-2.6.5-r5
-	ebegin "Patching gradm 2.0 sources with a few cvs fixes"
-	patch -p1 -s -N -E -d ${S} < ${FILESDIR}/gradm2-cvs-20Jun2004.diff || die
-	eend $?
-
-	# (Jan 03 2004) - <solar@gentoo>
-	# static linking required for proper operation of gradm        
-	# however ssp is known to break static linking when it's enabled
-	# in >=gcc-3.3.1 && <=gcc-3.3.2-r5 . So we strip ssp if needed.         
-	gmicro=$(gcc-micro-version)
-	if [ "$(gcc-version)" == "3.3" -a -n "${gmicro}" -a ${gmicro} -le 2 ]; then
-		# extract out gentoo revision                
-		gentoo_gcc_r=$($(gcc-getCC) -v 2>&1 | tail -n 1 | awk '{print $7}')
-		gentoo_gcc_r=${gentoo_gcc_r/,/}
-		gentoo_gcc_r=${gentoo_gcc_r/-/ }
-		gentoo_gcc_r=${gentoo_gcc_r:7}
-		[ -n "${gentoo_gcc_r}" -a ${gentoo_gcc_r} -le 5 ] && \
-			filter-flags -fstack-protector -fstack-protector-all
-	fi
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	cd ${S}
-	# Were not ready for init.d,script functions yet.
-		#exeinto /etc/init.d
-		#newexe ${FILESDIR}/grsecurity2.rc grsecurity2
-		#insinto /etc/conf.d
-		#doins ${FILESDIR}/grsecurity2
-
-	mkdir -p -m 700 ${D}/etc/grsec
-	doman gradm.8
-	dodoc acl
-
-	into /
-	dosbin grlearn gradm || die
-
-	# Normal users can authenticate to special roles now and thus 
-	# need execution permission on gradm2. We remove group,other readable bits 
-	# to help ensure that our gradm2 binary is as protected from misbehaving users.
-	fperms 711 ${D}/sbin/gradm
-}
-
-pkg_postinst() {
-	if [ ! -e /dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 /dev/
-		mknod -m 0622 /dev/grsec c 1 10 || die "Cant mknod for grsec learning device"
-	fi
-}
diff --git a/sys-apps/gradm/gradm-2.0.1-r1.ebuild b/sys-apps/gradm/gradm-2.0.1-r1.ebuild
deleted file mode 100644
index 523049fc049a..000000000000
--- a/sys-apps/gradm/gradm-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.0.1-r1.ebuild,v 1.4 2005/01/08 21:26:59 solar Exp $
-
-inherit flag-o-matic gcc eutils
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
-HOMEPAGE="http://www.grsecurity.net/"
-#SRC_URI="http://www.grsecurity.net/gradm-${PV}.tar.gz"
-SRC_URI="mirror://gentoo/gradm-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64" ; # ~alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# (Jan 03 2004) - <solar@gentoo>
-	# static linking required for proper operation of gradm        
-	# however ssp is known to break static linking when it's enabled
-	# in >=gcc-3.3.1 && <=gcc-3.3.2-r5 . So we strip ssp if needed.         
-	gmicro=$(gcc-micro-version)
-	if [ "$(gcc-version)" == "3.3" -a -n "${gmicro}" -a ${gmicro} -le 2 ]; then
-		# extract out gentoo revision
-		gentoo_gcc_r=$($(gcc-getCC) -v 2>&1 | tail -n 1 | awk '{print $7}')
-		gentoo_gcc_r=${gentoo_gcc_r/,/}
-		gentoo_gcc_r=${gentoo_gcc_r/-/ }
-		gentoo_gcc_r=${gentoo_gcc_r:7}
-		[ -n "${gentoo_gcc_r}" -a ${gentoo_gcc_r} -le 5 ] && \
-			filter-flags -fstack-protector -fstack-protector-all
-	fi
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-	[ "$PV" == "2.0.1" ] && epatch ${FILESDIR}/${PN}-${PV}-install.patch
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-	return 0
-}
-
-src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
-
-	# Normal users can authenticate to special roles now and thus 
-	# need execution permission on gradm2. We remove group,other readable bits 
-	# to help ensure that our gradm2 binary is as protected from misbehaving users.
-	fperms 711 /sbin/gradm
-
-	return 0
-}
-
-pkg_postinst() {
-	if [ ! -e /dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 /dev/
-		mknod -m 0622 /dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
-	fi
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-}
diff --git a/sys-apps/gradm/gradm-2.0.1.ebuild b/sys-apps/gradm/gradm-2.0.1.ebuild
deleted file mode 100644
index 0afdc925c9ab..000000000000
--- a/sys-apps/gradm/gradm-2.0.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.0.1.ebuild,v 1.5 2005/01/08 21:26:59 solar Exp $
-
-inherit flag-o-matic gcc
-
-#MY_PV=2.0-${PV/*_/}
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
-HOMEPAGE="http://www.grsecurity.net/"
-#SRC_URI="http://www.grsecurity.net/gradm-${PV}.tar.gz"
-SRC_URI="mirror://gentoo/gradm-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~arm ~amd64" ; # ~alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fixup for hardened-dev-sources-2.6.5-r5
-	#ebegin "Patching gradm 2.0 sources with a few cvs fixes"
-	#patch -p1 -s -N -E -d ${S} < ${FILESDIR}/gradm2-cvs-20Jun2004.diff || die
-	#eend $?
-
-	# (Jan 03 2004) - <solar@gentoo>
-	# static linking required for proper operation of gradm        
-	# however ssp is known to break static linking when it's enabled
-	# in >=gcc-3.3.1 && <=gcc-3.3.2-r5 . So we strip ssp if needed.         
-	gmicro=$(gcc-micro-version)
-	if [ "$(gcc-version)" == "3.3" -a -n "${gmicro}" -a ${gmicro} -le 2 ]; then
-		# extract out gentoo revision                
-		gentoo_gcc_r=$($(gcc-getCC) -v 2>&1 | tail -n 1 | awk '{print $7}')
-		gentoo_gcc_r=${gentoo_gcc_r/,/}
-		gentoo_gcc_r=${gentoo_gcc_r/-/ }
-		gentoo_gcc_r=${gentoo_gcc_r:7}
-		[ -n "${gentoo_gcc_r}" -a ${gentoo_gcc_r} -le 5 ] && \
-			filter-flags -fstack-protector -fstack-protector-all
-	fi
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	cd ${S}
-	# Were not ready for init.d,script functions yet.
-		#exeinto /etc/init.d
-		#newexe ${FILESDIR}/grsecurity2.rc grsecurity2
-		#insinto /etc/conf.d
-		#doins ${FILESDIR}/grsecurity2
-
-	mkdir -p -m 700 ${D}/etc/grsec
-	doman gradm.8
-	dodoc acl
-
-	into /
-	dosbin grlearn gradm || die
-
-	# Normal users can authenticate to special roles now and thus 
-	# need execution permission on gradm2. We remove group,other readable bits 
-	# to help ensure that our gradm2 binary is as protected from misbehaving users.
-	fperms 711 ${D}/sbin/gradm
-}
-
-pkg_postinst() {
-	if [ ! -e /dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 /dev/
-		mknod -m 0622 /dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
-	fi
-}
diff --git a/sys-apps/gradm/gradm-2.0.2.ebuild b/sys-apps/gradm/gradm-2.0.2.ebuild
deleted file mode 100644
index 3c5d617090a1..000000000000
--- a/sys-apps/gradm/gradm-2.0.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.0.2.ebuild,v 1.2 2005/01/08 21:26:59 solar Exp $
-
-inherit flag-o-matic gcc eutils
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://www.grsecurity.net/gradm-${PV}.tar.gz"
-#SRC_URI="mirror://gentoo/gradm-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~arm ~amd64" ; # ~alpha"
-IUSE=""
-RDEPEND=""
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# (Jan 03 2004) - <solar@gentoo>
-	# static linking required for proper operation of gradm        
-	# however ssp is known to break static linking when it's enabled
-	# in >=gcc-3.3.1 && <=gcc-3.3.2-r5 . So we strip ssp if needed.         
-	gmicro=$(gcc-micro-version)
-	if [ "$(gcc-version)" == "3.3" -a -n "${gmicro}" -a ${gmicro} -le 2 ]; then
-		# extract out gentoo revision
-		gentoo_gcc_r=$($(gcc-getCC) -v 2>&1 | tail -n 1 | awk '{print $7}')
-		gentoo_gcc_r=${gentoo_gcc_r/,/}
-		gentoo_gcc_r=${gentoo_gcc_r/-/ }
-		gentoo_gcc_r=${gentoo_gcc_r:7}
-		[ -n "${gentoo_gcc_r}" -a ${gentoo_gcc_r} -le 5 ] && \
-			filter-flags -fstack-protector -fstack-protector-all
-	fi
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-	[ "$PV" == "2.0.1" ] && epatch ${FILESDIR}/${PN}-${PV}-install.patch
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-	return 0
-}
-
-src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
-
-	# Normal users can authenticate to special roles now and thus 
-	# need execution permission on gradm2. We remove group,other readable bits 
-	# to help ensure that our gradm2 binary is as protected from misbehaving users.
-	fperms 711 /sbin/gradm
-
-	return 0
-}
-
-pkg_postinst() {
-	if [ ! -e /dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 /dev/
-		mknod -m 0622 /dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
-	fi
-	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
-}
diff --git a/sys-apps/gradm/gradm-2.0.ebuild b/sys-apps/gradm/gradm-2.0.ebuild
deleted file mode 100644
index 26fedf2fe92e..000000000000
--- a/sys-apps/gradm/gradm-2.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.0.ebuild,v 1.7 2005/01/08 21:26:59 solar Exp $
-
-inherit flag-o-matic gcc
-
-#MY_PV=2.0-${PV/*_/}
-
-MAINTAINER="solar@gentoo.org"
-DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="http://www.grsecurity.net/gradm-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~arm ~amd64" ; # ~alpha"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-devel/bison
-	sys-devel/flex
-	sys-apps/chpax"
-
-S="${WORKDIR}/${PN}2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# (Jan 03 2004) - <solar@gentoo>
-	# static linking required for proper operation of gradm        
-	# however ssp is known to break static linking when it's enabled
-	# in >=gcc-3.3.1 && <=gcc-3.3.2-r5 . So we strip ssp if needed.         
-	gmicro=$(gcc-micro-version)
-	if [ "$(gcc-version)" == "3.3" -a -n "${gmicro}" -a ${gmicro} -le 2 ]; then
-		# extract out gentoo revision                
-		gentoo_gcc_r=$($(gcc-getCC) -v 2>&1 | tail -n 1 | awk '{print $7}')
-		gentoo_gcc_r=${gentoo_gcc_r/,/}
-		gentoo_gcc_r=${gentoo_gcc_r/-/ }
-		gentoo_gcc_r=${gentoo_gcc_r:7}
-		[ -n "${gentoo_gcc_r}" -a ${gentoo_gcc_r} -le 5 ] && \
-			filter-flags -fstack-protector -fstack-protector-all
-	fi
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-
-}
-
-src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	cd ${S}
-	# Were not ready for init.d,script functions yet.
-		#exeinto /etc/init.d
-		#newexe ${FILESDIR}/grsecurity2.rc grsecurity2
-		#insinto /etc/conf.d
-		#doins ${FILESDIR}/grsecurity2
-
-	mkdir -p -m 700 ${D}/etc/grsec
-	doman gradm.8
-	dodoc acl
-
-	into /
-	dosbin grlearn gradm || die
-
-	# Normal users can authenticate to special roles now and thus 
-	# need execution permission on gradm2. We remove group,other readable bits 
-	# to help ensure that our gradm2 binary is as protected from misbehaving users.
-	fperms 711 ${D}/sbin/gradm
-}
-
-pkg_postinst() {
-	if [ ! -e /dev/grsec ] ; then
-		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 /dev/
-		mknod -m 0622 /dev/grsec c 1 10 || die "Cant mknod for grsec learning device"
-	fi
-}
diff --git a/sys-apps/gradm/gradm-2.1.0.ebuild b/sys-apps/gradm/gradm-2.1.0.ebuild
index 59728ff83e63..ab685f2cd360 100644
--- a/sys-apps/gradm/gradm-2.1.0.ebuild
+++ b/sys-apps/gradm/gradm-2.1.0.ebuild
@@ -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/sys-apps/gradm/gradm-2.1.0.ebuild,v 1.3 2005/01/25 14:24:18 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.0.ebuild,v 1.4 2005/02/25 19:02:35 solar Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -45,10 +45,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ ! -e /dev/grsec ] ; then
+	if [ ! -e ${ROOT}/dev/grsec ] ; then
 		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 /dev/
-		mknod -m 0622 /dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
+		mkdir -p -m 755 ${ROOT}/dev/
+		mknod -m 0622 ${ROOT}/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
 	fi
 	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
 }