Changed the chpax dependency to a || dependency with paxctl. Modified to use non-lazy bindings for gradm_pam. Added support for the pam USE flag. Pass custom CFLAGS in a nicer way.

Package-Manager: portage-2.0.52-r1

5 files changed, 68 insertions, 53 deletions

diff --git a/sys-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 87cadf484464..f26c90454085 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.58 2005/09/16 10:49:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.59 2005/09/17 15:05:20 swegener Exp $
+
+  17 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  +files/2.1.6.200506131347-non-lazy-bindings.patch,
+  gradm-2.1.5.200504081812.ebuild, gradm-2.1.6.200506131347.ebuild:
+  Changed the chpax dependency to a || dependency with paxctl. Modified to
+  use non-lazy bindings for gradm_pam. Added support for the pam USE flag.
+  Pass custom CFLAGS in a nicer way.
 
   16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   gradm-2.1.6.200506131347.ebuild:
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 057ebff8311c..8860a5ee998d 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,8 +1,19 @@
-MD5 24ee08bec4963839997833c21dfc80c5 gradm-2.1.6.200506131347.ebuild 1471
-MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221
-MD5 9fbfbe32322a945773da022bc5efa988 ChangeLog 9099
-MD5 9908613aab7916d2ac6fe9f34146b467 gradm-2.1.5.200504081812.ebuild 1471
-MD5 f2401396b01c577f727c2da3b694c779 files/grsecurity.rc 1810
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3b6e45be29db72891be2c4940c7cc623 ChangeLog 9458
+MD5 0433ac1be1a1e05d61281b7a1ebe377b files/2.1.6.200506131347-non-lazy-bindings.patch 546
 MD5 4f610b1a69bb13a22080460f47de34a1 files/digest-gradm-2.1.5.200504081812 75
-MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
 MD5 071dc45d1922b65c304d4d8635470c0e files/digest-gradm-2.1.6.200506131347 75
+MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
+MD5 f2401396b01c577f727c2da3b694c779 files/grsecurity.rc 1810
+MD5 b98247eb3f77f4eda11cd38125fa734e gradm-2.1.5.200504081812.ebuild 1317
+MD5 d53ba3368011aec360b848c3f09e128b gradm-2.1.6.200506131347.ebuild 1496
+MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLDDGI1lqEGTUzyQRAqrhAKDeg2NKwIQIq5as2IYUy7f/PMSz5QCgseX/
+HNU/MaAdUzfGciVwiMOIBB4=
+=4LkR
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gradm/files/2.1.6.200506131347-non-lazy-bindings.patch b/sys-apps/gradm/files/2.1.6.200506131347-non-lazy-bindings.patch
new file mode 100644
index 000000000000..da0b1997f965
--- /dev/null
+++ b/sys-apps/gradm/files/2.1.6.200506131347-non-lazy-bindings.patch
@@ -0,0 +1,12 @@
+diff -Nur gradm2.orig/Makefile gradm2/Makefile
+--- gradm2.orig/Makefile	2005-05-14 19:10:34.000000000 +0000
++++ gradm2/Makefile	2005-09-17 14:47:32.573701563 +0000
+@@ -53,7 +53,7 @@
+ 	@if [ ! -f /usr/include/security/pam_appl.h ] ; then \
+ 		echo "Unable to detect PAM headers, disabling PAM support." ; \
+ 	else \
+-		$(CC) $(CFLAGS) -o $@ gradm_pam.c -lpam -lpam_misc $(LDFLAGS) ; \
++		$(CC) $(CFLAGS) -o $@ gradm_pam.c -lpam -lpam_misc -Wl,-z,now $(LDFLAGS) ; \
+ 	fi
+ 
+ grlearn: grlearn.c gradm_lib.c grlearn2_config.tab.c lex.grlearn_config.c
diff --git a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
index c1e63ea3f81c..be1f9bcc2a5c 100644
--- a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
+++ b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
@@ -1,12 +1,11 @@
 # 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.5.200504081812.ebuild,v 1.2 2005/05/15 22:40:25 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild,v 1.3 2005/09/17 15:05:20 swegener Exp $
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs versionator
 
-myPV=${PV:0:5}-${PV:6}
+myPV="$(replace_version_separator 3 -)"
 
-MAINTAINER="solar@gentoo.org"
 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"
@@ -20,39 +19,27 @@ RDEPEND=""
 DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
-	sys-apps/chpax"
+	|| (
+		sys-apps/paxctl
+		sys-apps/chpax
+	)"
 
 S="${WORKDIR}/${PN}2"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#epatch ${FILESDIR}/gradm-2.1.2-non-interactive.patch
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-}
-
 src_compile() {
-	cd ${S}
-	emake CC="$(tc-getCC)" || die "compile problem"
-	return 0
+	emake OPT_FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "compile problem"
 }
 
 src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
+	einstall DESTDIR="${D}" || die "einstall failed"
 	fperms 711 /sbin/gradm
-	return 0
 }
 
 pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
+	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"
+		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"
 }
diff --git a/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild b/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild
index a8ab5aea23ff..d385f3dd31f8 100644
--- a/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild
+++ b/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild
@@ -1,12 +1,11 @@
 # 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.6.200506131347.ebuild,v 1.4 2005/09/16 10:49:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild,v 1.5 2005/09/17 15:05:20 swegener Exp $
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs eutils versionator
 
-myPV=${PV:0:5}-${PV:6}
+myPV="$(replace_version_separator 3 -)"
 
-MAINTAINER="solar@gentoo.org"
 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"
@@ -15,44 +14,43 @@ SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~arm ia64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE=""
+IUSE="pam"
 RDEPEND=""
 DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
-	sys-apps/chpax"
+	pam? ( virtual/pam )
+	|| (
+		sys-apps/paxctl
+		sys-apps/chpax
+	)"
 
 S="${WORKDIR}/${PN}2"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	#epatch ${FILESDIR}/gradm-2.1.2-non-interactive.patch
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
+	epatch "${FILESDIR}"/${PV}-non-lazy-bindings.patch
 }
 
 src_compile() {
-	cd ${S}
-	emake CC="$(tc-getCC)" || die "compile problem"
-	return 0
+	local target=""
+	use pam || target="nopam"
+
+	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "compile problem"
 }
 
 src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
+	einstall DESTDIR="${D}" || die "einstall failed"
 	fperms 711 /sbin/gradm
-	return 0
 }
 
 pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
+	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"
+		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"
 }