install updates. adds patch which fixes install problems bug #59996. Added ewarn about needing to do gradm -P before enabling learning mode bug #60056

5 files changed, 98 insertions, 2 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 37c3390f2ece..08aaaf7d7c5e 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/gradm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.36 2004/08/10 19:07:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.37 2004/08/11 20:18:21 solar Exp $
+
+*gradm-2.0.1-r1 (11 Aug 2004)
+
+  11 Aug 2004; <solar@gentoo.org> gradm-2.0.1-r1.ebuild,
+  files/gradm-2.0.1-install.patch:
+  install updates. adds patch which fixes install problems bug #59996. Added
+  ewarn about needing to do gradm -P before enabling learning mode bug #60056
 
   10 Aug 2004; <solar@gentoo.org> gradm-2.0.1.ebuild:
   marking x86 stable
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 32a9fcbe1e78..a27f57a5dc66 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,7 +1,8 @@
 MD5 1b3c6a4feb6d2518c5bb4d4a1fe26597 gradm-1.9.14.ebuild 1639
+MD5 6d03cb7a6faac73611863a80988eb39d gradm-2.0.1-r1.ebuild 2203
 MD5 9791a80e805ca8976c56063fa7a38e00 gradm-2.0.1.ebuild 2505
 MD5 dd780c1382fa681402cc19cd6c1559f9 gradm-2.0.ebuild 2315
-MD5 54ea12d70d22db601c58368669b7b47f ChangeLog 5141
+MD5 b794f0695a95fd64c2484d977fdcbd2e ChangeLog 5420
 MD5 2413c7ee7a3e8df9cee929e1318a456b gradm-2.0-r1.ebuild 2505
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 f2401396b01c577f727c2da3b694c779 files/grsecurity.rc 1810
@@ -10,5 +11,7 @@ MD5 838722234beedbde03008d451ec2327d files/digest-gradm-2.0.1 62
 MD5 62ba83f9a7bd71b4011ad2a2cf48f4a3 files/digest-gradm-2.0 60
 MD5 264e377e7c3221570d3730444e84d792 files/gradm2-cvs-20Jun2004.diff 8251
 MD5 c2618fc7963e008681dfd08db6886058 files/gradm_parse.c-1.9.x.patch 524
+MD5 838722234beedbde03008d451ec2327d files/digest-gradm-2.0.1-r1 62
 MD5 f008a8f1133ea0db35a4ee305d390c23 files/digest-gradm-1.9.14 63
+MD5 c016f75a48190153dcb63f9cba78abef files/gradm-2.0.1-install.patch 488
 MD5 62ba83f9a7bd71b4011ad2a2cf48f4a3 files/digest-gradm-2.0-r1 60
diff --git a/sys-apps/gradm/files/digest-gradm-2.0.1-r1 b/sys-apps/gradm/files/digest-gradm-2.0.1-r1
new file mode 100644
index 000000000000..fb4207ac5639
--- /dev/null
+++ b/sys-apps/gradm/files/digest-gradm-2.0.1-r1
@@ -0,0 +1 @@
+MD5 26a33a884a8f92d29ddb34be81334429 gradm-2.0.1.tar.gz 50464
diff --git a/sys-apps/gradm/files/gradm-2.0.1-install.patch b/sys-apps/gradm/files/gradm-2.0.1-install.patch
new file mode 100644
index 000000000000..48dfaebf6dcd
--- /dev/null
+++ b/sys-apps/gradm/files/gradm-2.0.1-install.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2004-08-11 15:41:06.000000000 -0400
++++ Makefile	2004-08-11 15:41:27.000000000 -0400
+@@ -103,7 +103,7 @@
+ 	$(STRIP) $(DESTDIR)/sbin/grlearn
+ 	mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR)
+ 	@if [ ! -f $(DESTDIR)$(GRSEC_DIR)/policy ] ; then \
+-		if [ ! -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
++		if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \
+ 			mv $(DESTDIR)$(GRSEC_DIR)/acl $(DESTDIR)$(GRSEC_DIR)/policy ; \
+ 		else \
+ 			$(INSTALL) -m 0600 policy $(DESTDIR)$(GRSEC_DIR) ; \
diff --git a/sys-apps/gradm/gradm-2.0.1-r1.ebuild b/sys-apps/gradm/gradm-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..b3a283b07d7c
--- /dev/null
+++ b/sys-apps/gradm/gradm-2.0.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2004 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.1 2004/08/11 20:18:21 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"
+
+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 10 || die "Cant mknod for grsec learning device"
+	fi
+	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
+}