bump to 2.1.9

(Portage version: 2.1_pre7-r4)

5 files changed, 97 insertions, 1 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 8250992c1e60..66cd7caacf16 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/gradm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.77 2006/04/09 16:29:17 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.78 2006/04/09 16:30:53 johnm Exp $
+
+*gradm-2.1.9.200602141850 (09 Apr 2006)
+
+  09 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  +files/gradm_2.1.9.200602141850-fix-admin-role.patch,
+  +files/gradm_2.1.9.200602141850-fix-define-order.patch,
+  +gradm-2.1.9.200602141850.ebuild:
+  gradm bump to 2.1.9
 
   09 Apr 2006; Markus Rothe <corsair@gentoo.org>
   gradm-2.1.8.200601212342-r1.ebuild:
diff --git a/sys-apps/gradm/files/digest-gradm-2.1.9.200602141850 b/sys-apps/gradm/files/digest-gradm-2.1.9.200602141850
new file mode 100644
index 000000000000..a1e53bac0edd
--- /dev/null
+++ b/sys-apps/gradm/files/digest-gradm-2.1.9.200602141850
@@ -0,0 +1,3 @@
+MD5 8bbcd04c99988d8b0e45f11a5c22cd2c gradm-2.1.9-200602141850.tar.gz 61618
+RMD160 2c2d750fcbac114d87867be553ec25b9725744a8 gradm-2.1.9-200602141850.tar.gz 61618
+SHA256 f67761b2aff2c9643b029de5d2cc327d3c7277f9a6d13f88eef425ff92382073 gradm-2.1.9-200602141850.tar.gz 61618
diff --git a/sys-apps/gradm/files/gradm_2.1.9.200602141850-fix-admin-role.patch b/sys-apps/gradm/files/gradm_2.1.9.200602141850-fix-admin-role.patch
new file mode 100644
index 000000000000..f68275961170
--- /dev/null
+++ b/sys-apps/gradm/files/gradm_2.1.9.200602141850-fix-admin-role.patch
@@ -0,0 +1,11 @@
+--- gradm2/gradm_analyze.c	2006/01/08 17:45:37	1.36
++++ gradm2/gradm_analyze.c	2006/03/05 00:35:52	1.37
+@@ -260,6 +260,8 @@ handle_notrojan_mode(void)
+ 					for_each_role(role2, current_role) {
+ 						if (!strcmp(role2->rolename, ":::kernel:::"))
+ 							continue;
++						if (role2->roletype & GR_ROLE_GOD)
++							continue;
+ 						for_each_subject(subj2, role2) {
+ 							if (subj2 == subj
+ 							    || (subj2->
diff --git a/sys-apps/gradm/files/gradm_2.1.9.200602141850-fix-define-order.patch b/sys-apps/gradm/files/gradm_2.1.9.200602141850-fix-define-order.patch
new file mode 100644
index 000000000000..c64466fb130d
--- /dev/null
+++ b/sys-apps/gradm/files/gradm_2.1.9.200602141850-fix-define-order.patch
@@ -0,0 +1,17 @@
+--- gradm2/gradm_sym.c	2004/12/15 21:21:50	1.8
++++ gradm2/gradm_sym.c	2006/03/13 23:07:49	1.9
+@@ -10,8 +10,12 @@ static unsigned int symtab_size = 0;
+ 
+ void interpret_variable(struct var_object *var)
+ {
+-	for (; var; var = var->prev) {
+-		add_proc_object_acl(current_subject, var->filename, var->mode, GR_FEXIST);
++	struct var_object *tmp;
++	for (tmp = var; tmp->prev; tmp = tmp->prev)
++		;
++
++	for (; tmp; tmp = tmp->next) {
++		add_proc_object_acl(current_subject, tmp->filename, tmp->mode, GR_FEXIST);
+ 	}
+ 
+ 	return;
diff --git a/sys-apps/gradm/gradm-2.1.9.200602141850.ebuild b/sys-apps/gradm/gradm-2.1.9.200602141850.ebuild
new file mode 100644
index 000000000000..273b13914f84
--- /dev/null
+++ b/sys-apps/gradm/gradm-2.1.9.200602141850.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.9.200602141850.ebuild,v 1.1 2006/04/09 16:30:53 johnm Exp $
+
+inherit flag-o-matic toolchain-funcs eutils versionator
+
+myPV="$(replace_version_separator 3 -)"
+
+DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
+HOMEPAGE="http://www.grsecurity.net/"
+SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
+#SRC_URI="mirror://gentoo/gradm-${myPV}.tar.gz"
+#RESTRICT=primaryuri
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam"
+RDEPEND=""
+DEPEND="virtual/libc
+	sys-devel/bison
+	sys-devel/flex
+	pam? ( virtual/pam )
+	|| (
+		sys-apps/paxctl
+		sys-apps/chpax
+	)"
+
+S="${WORKDIR}/${PN}2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/2.1.7.200511041858-non-lazy-bindings.patch
+	epatch "${FILESDIR}/${PN}_${PV}-fix-admin-role.patch"
+	epatch "${FILESDIR}/${PN}_${PV}-fix-define-order.patch"
+}
+
+src_compile() {
+	local target=""
+	use pam || target="nopam"
+
+	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "compile problem"
+}
+
+src_install() {
+	einstall DESTDIR="${D}" || die "einstall failed"
+	fperms 711 /sbin/gradm
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}"/dev/grsec ] ; then
+		einfo "Making character device for grsec2 learning mode"
+		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"
+}