Fixed DEPEND and added bugfix for PaX (rsbac bugfix-5)

4 files changed, 28 insertions, 6 deletions

diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index b6dbe0698143..32ac13ed55b4 100644
--- a/sys-apps/rsbac-admin/ChangeLog
+++ b/sys-apps/rsbac-admin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/rsbac-admin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.11 2005/01/19 13:58:00 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.12 2005/01/24 10:29:36 kang Exp $
+
+  24 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
+  +files/rsbac-bugfix-v1.2.3-5.diff, rsbac-admin-1.2.3.ebuild:
+  Fixed DEPEND and added bugfix for PaX (rsbac bugfix-5)
 
   19 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
   -rsbac-admin-1.2.1.ebuild, rsbac-admin-1.2.3.ebuild,
diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index f3570f071b60..01061b110ebe 100644
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -1,6 +1,7 @@
 MD5 035ff78da2388cc0585f93ef2247332d metadata.xml 161
-MD5 6dc7b36f9cc887e6b06999717ff8b97d rsbac-admin-1.2.3.ebuild 2173
-MD5 5179c41357cb25bd008e44fcd38934dc ChangeLog 2048
+MD5 1083d5c8d3f5c15dc3b03a3ff2893d5a ChangeLog 2223
+MD5 6b79594e93eecd76a98fd248d9eb3ad8 rsbac-admin-1.2.3.ebuild 2229
 MD5 5089c0e6bbae98d91f7e78a9450465e5 files/digest-rsbac-admin-1.2.3 71
 MD5 5bba238d756a6695447f1bb0264a01a3 files/rklogd.init 1014
 MD5 3b63c2f46e9c0531be23e630133fe6a7 files/rsbac.conf 209
+MD5 ffea7c6daada6d0033ed3996d45fd7ca files/rsbac-bugfix-v1.2.3-5.diff 625
diff --git a/sys-apps/rsbac-admin/files/rsbac-bugfix-v1.2.3-5.diff b/sys-apps/rsbac-admin/files/rsbac-bugfix-v1.2.3-5.diff
new file mode 100644
index 000000000000..fea819e62dfb
--- /dev/null
+++ b/sys-apps/rsbac-admin/files/rsbac-bugfix-v1.2.3-5.diff
@@ -0,0 +1,15 @@
+Index: rsbac-admin-v1.2.3/src/attr_set_fd.c
+===================================================================
+--- rsbac-admin-v1.2.3/src/attr_set_fd.c	(revision 19)
++++ rsbac-admin-v1.2.3/src/attr_set_fd.c	(working copy)
+@@ -202,6 +202,10 @@
+           case A_res_max:
+             fprintf(stderr, gettext("%s: Attribute %s not supported\n"), progname, argv[3]);
+             exit(1);
++          case A_pax_flags:
++            value.pax_flags = pax_strtoflags(argv[3], RSBAC_PAX_DEF_FLAGS);
++            break;
++
+           case A_log_array_low:
+           case A_log_array_high:
+             if(strlen(argv[3]) != R_NONE)
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.3.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.3.ebuild
index 4afcac6cd215..e786fc2f6c79 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.3.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.2.3.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/rsbac-admin/rsbac-admin-1.2.3.ebuild,v 1.5 2005/01/19 13:58:00 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.3.ebuild,v 1.6 2005/01/24 10:29:36 kang Exp $
 
 inherit eutils
 
@@ -18,8 +18,8 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc"
 
 DEPEND="dev-util/dialog
-	|| ( >=sys-kernel/rsbac-sources-2.4.26
-	>=sys-kernel/rsbac-dev-sources-2.6.7 )"
+	|| ( sys-kernel/rsbac-sources
+	sys-kernel/rsbac-dev-sources )"
 
 
 RDEPEND=">=sys-libs/ncurses-5.2"
@@ -27,6 +27,8 @@ RDEPEND=">=sys-libs/ncurses-5.2"
 src_unpack() {
 	cd ${WORKDIR}
 	unpack ${ADMIN}.tar.bz2 || die "cannot unpack rsbac-admin tool"
+	cd ${WORKDIR}/${ADMIN}
+	epatch "${FILESDIR}/rsbac-bugfix-v1.2.3-5.diff"
 }
 
 src_compile() {