grsec1 has been deprecated upstream and thus will no longer be supported by gentoo either. This means it's time to flush your old policies and begin using the really nice gradm2 learning mode offers. Note: also that the gradm2 package has also been deprecated and is now simply this one. This gradm-2 works for both 2.4.x and 2.6.x kernels. Gentoo init.d/conf.d scripts comming in due time.. User contributions welcome for that.

10 files changed, 102 insertions, 161 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index a039547ccea2..a718e10b90c3 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/gradm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.28 2004/03/11 22:45:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.29 2004/04/19 01:48:53 solar Exp $
+
+*gradm-2.0 (18 Apr 2004)
+
+  18 Apr 2004; <solar@gentoo.org> gradm-1.9.11.ebuild, gradm-1.9.12.ebuild,
+  gradm-1.9.13.ebuild, gradm-2.0.ebuild:
+  grsec1 has been deprecated upstream and thus will no longer be supported by
+  gentoo either. This means it's time to flush your old policies and begin using
+  the really nice gradm2 learning mode offers. Note: also that the gradm2
+  package has also been deprecated and is now simply this one. This gradm-2
+  works for both 2.4.x and 2.6.x kernels. Gentoo init.d/conf.d scripts comming
+  in due time.. User contributions welcome for that.
 
 *gradm-1.9.14 (11 Mar 2004)
 
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 622778955fc2..d535bea5ba6e 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,13 +1,7 @@
-MD5 5b699f43f556946512eaa60f1d825ec7 gradm-1.9.14.ebuild 1646
-MD5 41971cfb8a30ffde8e5eda975ed7bba7 gradm-1.9.11.ebuild 992
-MD5 eb061ed8cafe91d8f497b743e42af4a3 gradm-1.9.13.ebuild 1637
-MD5 f72e0ee53027f8138ed5b629e6dc40ec gradm-1.9.12.ebuild 992
-MD5 8dea518573a97e13814c8bfe0a44c089 ChangeLog 3948
+MD5 a4b40333bf860d1876df583ea77d59de ChangeLog 4533
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1f31101dab2d3a9deb64ea31bf7339e3 files/grsecurity.rc 1821
-MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
+MD5 1d303d9ea63a6bd9b4a7857067b28ec0 gradm-2.0.ebuild 2369
+MD5 62ba83f9a7bd71b4011ad2a2cf48f4a3 files/digest-gradm-2.0 60
 MD5 c2618fc7963e008681dfd08db6886058 files/gradm_parse.c-1.9.x.patch 524
-MD5 056158b3d525f5c9408814b8de558aff files/digest-gradm-1.9.11 63
-MD5 0e2f7f82f168a922e16d0c5312a44a93 files/digest-gradm-1.9.12 63
-MD5 6f65d72fd28be60fec03949a96a0431b files/digest-gradm-1.9.13 63
-MD5 f008a8f1133ea0db35a4ee305d390c23 files/digest-gradm-1.9.14 63
+MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
+MD5 1f31101dab2d3a9deb64ea31bf7339e3 files/grsecurity.rc 1821
diff --git a/sys-apps/gradm/files/digest-gradm-1.9.11 b/sys-apps/gradm/files/digest-gradm-1.9.11
deleted file mode 100644
index 9a797114ed10..000000000000
--- a/sys-apps/gradm/files/digest-gradm-1.9.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e868f2ba6a469426b42820d5a7ce512 gradm-1.9.11.tar.gz 32417
diff --git a/sys-apps/gradm/files/digest-gradm-1.9.12 b/sys-apps/gradm/files/digest-gradm-1.9.12
deleted file mode 100644
index b2b4c8351bdb..000000000000
--- a/sys-apps/gradm/files/digest-gradm-1.9.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 41f918a3bc6c74a5218a16d34dfdafa7 gradm-1.9.12.tar.gz 32037
diff --git a/sys-apps/gradm/files/digest-gradm-1.9.13 b/sys-apps/gradm/files/digest-gradm-1.9.13
deleted file mode 100644
index 59547cb39962..000000000000
--- a/sys-apps/gradm/files/digest-gradm-1.9.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e0f1fb998275b87a8f23a5da0d42523 gradm-1.9.13.tar.gz 32070
diff --git a/sys-apps/gradm/files/digest-gradm-2.0 b/sys-apps/gradm/files/digest-gradm-2.0
new file mode 100644
index 000000000000..48bc98e985b1
--- /dev/null
+++ b/sys-apps/gradm/files/digest-gradm-2.0
@@ -0,0 +1 @@
+MD5 4b1c99ec6ea415fcc75ac1b89edc90f0 gradm-2.0.tar.gz 48424
diff --git a/sys-apps/gradm/gradm-1.9.11.ebuild b/sys-apps/gradm/gradm-1.9.11.ebuild
deleted file mode 100644
index fb5b2922af4b..000000000000
--- a/sys-apps/gradm/gradm-1.9.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.11.ebuild,v 1.5 2004/02/23 17:28:57 mr_bones_ Exp $
-
-DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
-SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
-HOMEPAGE="http://www.grsecurity.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64 sparc ~ppc hppa"
-SLOT="0"
-
-IUSE=""
-DEPEND="virtual/glibc
-	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
-	mv Makefile{,.orig}
-	sed -e "s|-O2|${CFLAGS}|" Makefile.orig > Makefile
-}
-
-src_compile() {
-	emake CC="${CC}" || 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-1.9.12.ebuild b/sys-apps/gradm/gradm-1.9.12.ebuild
deleted file mode 100644
index 9ccb79552161..000000000000
--- a/sys-apps/gradm/gradm-1.9.12.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.12.ebuild,v 1.3 2004/02/23 17:28:57 mr_bones_ Exp $
-
-DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
-SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
-HOMEPAGE="http://www.grsecurity.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64 sparc ~ppc hppa"
-SLOT="0"
-
-IUSE=""
-DEPEND="virtual/glibc
-	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
-	mv Makefile{,.orig}
-	sed -e "s|-O2|${CFLAGS}|" Makefile.orig > Makefile
-}
-
-src_compile() {
-	emake CC="${CC}" || 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-1.9.13.ebuild b/sys-apps/gradm/gradm-1.9.13.ebuild
deleted file mode 100644
index bdececf2d375..000000000000
--- a/sys-apps/gradm/gradm-1.9.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.13.ebuild,v 1.4 2004/03/08 21:09:58 avenj Exp $
-
-inherit gcc flag-o-matic
-
-DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
-SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
-HOMEPAGE="http://www.grsecurity.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 sparc ~ppc hppa"
-SLOT="0"
-
-IUSE=""
-DEPEND="virtual/glibc
-	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.ebuild b/sys-apps/gradm/gradm-2.0.ebuild
new file mode 100644
index 000000000000..627caa50ba50
--- /dev/null
+++ b/sys-apps/gradm/gradm-2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/19 01:48:53 solar Exp $
+
+inherit flag-o-matic gcc
+
+#MY_PV=2.0-${PV/*_/}
+
+MAINTAINER="solar@gentoo.org"
+DESCRIPTION="Administrative interface for grsecuritys2 access control lists"
+SRC_URI="http://www.grsecurity.net/gradm-${PV}.tar.gz"
+HOMEPAGE="http://www.grsecurity.net/"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc" ; # ~alpha"
+SLOT="0"
+
+IUSE=""
+DEPEND="virtual/glibc
+	sys-devel/bison
+	sys-devel/flex
+	sys-apps/chpax
+	sys-apps/paxctl"
+
+S="${WORKDIR}/${PN}2"
+
+src_unpack() {
+	unpack ${A} || die "Cant 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
+	dosbin gradm
+
+	# 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
+}