marked 1.2.5 ~amd64. Updated SVN ebuild to match the new, new server.

(Portage version: 2.0.53_rc7)

8 files changed, 52 insertions, 150 deletions

diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index 53aa73f565c1..65a760942d5a 100644
--- a/sys-apps/rsbac-admin/ChangeLog
+++ b/sys-apps/rsbac-admin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2005/10/30 22:27:24 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.21 2005/11/17 22:21:18 kang Exp $
+
+  17 Nov 2005; Guillaume Destuynder <kang@gentoo.org>
+  -files/rsbac-bugfix-v1.2.3-5.diff, files/nsswitch.conf,
+  -rsbac-admin-1.2.3.ebuild, rsbac-admin-1.2.5.ebuild,
+  rsbac-admin-1.2.99.ebuild:
+  marked 1.2.5 ~amd64. Updated SVN ebuild to match the new, new server.
+  updated nsswitch file to use rsbac or fallback on compat.
+  removed old 1.2.3 ebuilds.
 
   30 Oct 2005; Guillaume Destuynder <kang@gentoo.org>
   rsbac-admin-1.2.5.ebuild:
diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index baf7a114b35c..1db9e5cf8516 100644
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -1,14 +1,11 @@
-MD5 7673542754861538211953068fa7fe2c ChangeLog 3634
-MD5 5089c0e6bbae98d91f7e78a9450465e5 files/digest-rsbac-admin-1.2.3 71
+MD5 f71c2afc27f5bdc333b5d8e33883a455 ChangeLog 3992
 MD5 1b8e1b375f69babf1fd8b370c33aa4bf files/digest-rsbac-admin-1.2.4 71
 MD5 5b133f0238ddfd21834460d1b7ea1b99 files/digest-rsbac-admin-1.2.5 70
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rsbac-admin-1.2.99 0
-MD5 0ebfdd628334dbf801142d2a5cd832c1 files/nsswitch.conf 469
+MD5 3bb29214fbb05d3caca8e842adee3fd0 files/nsswitch.conf 487
 MD5 5bba238d756a6695447f1bb0264a01a3 files/rklogd.init 1014
-MD5 ffea7c6daada6d0033ed3996d45fd7ca files/rsbac-bugfix-v1.2.3-5.diff 625
 MD5 3b63c2f46e9c0531be23e630133fe6a7 files/rsbac.conf 209
 MD5 035ff78da2388cc0585f93ef2247332d metadata.xml 161
-MD5 6b79594e93eecd76a98fd248d9eb3ad8 rsbac-admin-1.2.3.ebuild 2229
 MD5 2af626ad2bd32bd1a95f45b88c18f545 rsbac-admin-1.2.4.ebuild 2771
-MD5 058fcac16632bcc45737e51789c00bc9 rsbac-admin-1.2.5.ebuild 2096
-MD5 9ba0cdc1f37fca8eee5d069870b6bb9c rsbac-admin-1.2.99.ebuild 2716
+MD5 f98319b65a28ce6cebdc8c0a21dab501 rsbac-admin-1.2.5.ebuild 2103
+MD5 e7b83546254998dc22953a28769ac2f7 rsbac-admin-1.2.99.ebuild 2170
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.3 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.3
deleted file mode 100644
index 5f65a2f57556..000000000000
--- a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c89346ddfe74d6faf9c991576c21b9b rsbac-admin-v1.2.3.tar.bz2 936731
diff --git a/sys-apps/rsbac-admin/files/nsswitch.conf b/sys-apps/rsbac-admin/files/nsswitch.conf
index 33344a664bff..43c5b172f0ab 100644
--- a/sys-apps/rsbac-admin/files/nsswitch.conf
+++ b/sys-apps/rsbac-admin/files/nsswitch.conf
@@ -1,8 +1,8 @@
 # /etc/nsswitch.conf:
 
-passwd:      compat [NOTFOUND=continue SUCCESS=continue]
-shadow:      compat
-group:       compat [NOTFOUND=continue SUCCESS=continue]
+passwd:      compat rsbac [NOTFOUND=continue SUCCESS=continue]
+shadow:      compat rsbac
+group:       compat rsbac [NOTFOUND=continue SUCCESS=continue]
 
 # passwd:    db files nis
 # shadow:    db files nis
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
deleted file mode 100644
index fea819e62dfb..000000000000
--- a/sys-apps/rsbac-admin/files/rsbac-bugfix-v1.2.3-5.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index e786fc2f6c79..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.6 2005/01/24 10:29:36 kang Exp $
-
-inherit eutils
-
-IUSE="debug"
-
-# RSBAC Adming packet name
-ADMIN=rsbac-admin-v${PV}
-
-DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
-HOMEPAGE="http://www.rsbac.org/ http://hardened.gentoo.org/rsbac"
-SRC_URI="http://rsbac.org/download/code/v${PV}/rsbac-admin-v${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="dev-util/dialog
-	|| ( sys-kernel/rsbac-sources
-	sys-kernel/rsbac-dev-sources )"
-
-
-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() {
-	cd ${WORKDIR}/${ADMIN}
-	econf || die "cannot ./configure RSBAC Admin Tools."
-	cd contrib/rsbac-klogd-2.0; econf || die "cannot ./configure rsbac-klogd"
-	cd ${WORKDIR}/${ADMIN}
-	emake || die "cannot make RSBAC Admin tools: Did you really already compiled a RSBAC-enabled kernel ? Please check the documentation at: http://hardened.gentoo.org/rsbac"
-	emake -C contrib/rsbac-klogd-2.0 || die "cannot make rsbac-klogd"
-	if use debug; then
-		emake -C contrib/regression || die "cannot make regression"
-	fi
-}
-
-src_install() {
-	cd ${WORKDIR}/${ADMIN}
-	einstall || die "cannot make install"
-	einstall -C contrib/rsbac-klogd-2.0 || die "cannot install rsbac-klogd"
-	if use debug; then
-		exeinto /usr/share/rsbac-admin-dev/regression
-		doexe contrib/regression/*_test
-	fi
-	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf
-	exeinto /etc/init.d
-	newinitd ${FILESDIR}/rklogd.init rklogd
-
-	dodir /secoff
-	keepdir /secoff
-	dodir /secoff/log
-	keepdir /secoff/log
-}
-
-pkg_postinst() {
-	if ! groupmod secoff; then
-		enewgroup secoff 400 || die "problem adding group secoff"
-	fi
-
-	if ! id secoff; then
-		enewuser secoff 400 /bin/bash /secoff secoff || die "problem adding user secoff"
-	fi
-
-	chmod 700 /secoff /secoff/log || die "problem changing permissions of /secoff and/or /secoff/log"
-	chown secoff:secoff -R /secoff || die "problem changing ownership of /secoff"
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
index 10e8598c13cc..c1be133de9ef 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.2.5.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.5.ebuild,v 1.3 2005/10/30 22:27:24 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild,v 1.4 2005/11/17 22:21:18 kang Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 NSS="1.2.5"
 
 DEPEND="dev-util/dialog
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild
index 6626b8e31dfa..d41478c99f2f 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild
@@ -1,13 +1,14 @@
 # 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.99.ebuild,v 1.1 2005/05/09 23:19:48 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild,v 1.2 2005/11/17 22:21:18 kang Exp $
 
+inherit eutils
 inherit subversion
 
-IUSE="debug pam"
+IUSE="pam"
 
 # RSBAC Adming packet name
-ADMIN=rsbac-admin-v${PV}
+#ADMIN=rsbac-admin-v${PV}
 
 DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
 HOMEPAGE="http://www.rsbac.org/ http://hardened.gentoo.org/rsbac"
@@ -19,69 +20,57 @@ NSS="1.2.5"
 
 DEPEND="dev-util/dialog
 	pam? ( sys-libs/pam )
-	sys-apps/baselayout
-	|| (
-		>=sys-kernel/rsbac-sources-2.4.99
-		>=sys-kernel/rsbac-dev-sources-2.6.99
-	)"
+	sys-apps/baselayout"
 
 RDEPEND=">=sys-libs/ncurses-5.2"
 
+
 src_unpack() {
-	ESVN_REPO_URI="svn://rsbac.mprivacy-update.de/rsbac/rsbac-admin-v1.2.5"
+	ESVN_REPO_URI="svn://rsbac.de/rsbac1/rsbac-admin/trunk"
 	subversion_src_unpack
 	cd ${WORKDIR}/${P}/${ADMIN}
 }
 
+
 src_compile() {
-	cd ${WORKDIR}/${P}/${ADMIN}
-	econf || die "cannot ./configure RSBAC Admin Tools."
-	cd ${WORKDIR}/${ADMIN}/contrib/rsbac-klogd-2.0; econf || die "cannot ./configure rsbac-klogd"
-	cd ${WORKDIR}/${ADMIN}/contrib/nss_rsbac; econf || die "cannot ./configure nss_rsbac"
-	cd ${WORKDIR}/${ADMIN}
-	emake || die "cannot make RSBAC Admin tools: Did you really already compiled
-	a RSBAC-enabled kernel ? Please check the documentation at:
-	http://hardened.gentoo.org/rsbac"
-	emake -C contrib/rsbac-klogd-2.0 || die "cannot make rsbac-klogd"
-	cd contrib/nss_rsbac
-	LD="../../src/librsbac.so.$NSS" econf  || die "cannot conf nss_rsbac"
-	cd ${WORKDIR}/${ADMIN}
-	emake -C contrib/nss_rsbac || die "cannot make nss_rsbac"
+	local rsbacmakeargs
+	rsbacmakeargs="libs tools"
 	use pam && {
-		emake -C contrib/pam_rsbac || die "cannot make pam_rsbac"
+		rsbacmakeargs="${makeargs} pam nss"
 	}
-	if use debug; then
-		emake -C contrib/regression || die "cannot make regression"
-	fi
+	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
-	cd ${WORKDIR}/${ADMIN}
-	einstall || die "cannot make install"
-	einstall -C contrib/rsbac-klogd-2.0 || die "cannot install rsbac-klogd"
-	einstall -C contrib/nss_rsbac || die "cannot install nss_rsbac"
-	if use debug; then
-		exeinto /usr/share/rsbac-admin-dev/regression
-		doexe contrib/regression/*_test
-	fi
-	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
-	exeinto /etc/init.d
-	newinitd ${FILESDIR}/rklogd.init rklogd
+	local rsabacinstallargs
+	rsbacinstallargs="headers-install libs-install tools-install"
 	use pam && {
-		insinto /lib/security
-		newins ${WORKDIR}/${ADMIN}/contrib/pam_rsbac/pam_rsbac.so pam_rsbac.so
+		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
+	make PREFIX=${D}/usr DESTDIR=${D} ${rsbacinstallargs} || \
+	die "cannot install (${rsbacinstallargs})"
+	insinto /etc
+	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
 	dodir /secoff
 	keepdir /secoff
-	dodir /secoff/log
-	keepdir /secoff/log
+	dodir /var/log/rsbac
+	keepdir /var/log/rsbac
 }
 
 pkg_postinst() {
 	enewgroup secoff 400 || die "problem adding group secoff"
-	enewuser secoff 400 /bin/bash /secoff secoff || die "problem adding user secoff"
+	enewuser secoff 400 /bin/bash /secoff secoff || \
+	die "problem adding user secoff"
+	enewgroup audit 404 || die "problem adding group audit"
+	enewuser audit 404 /bin/false /dev/null audit || \
+	die "problem adding user audit"
 
-	chmod 700 /secoff /secoff/log || die "problem changing permissions of /secoff and/or /secoff/log"
-	chown secoff:secoff -R /secoff || die "problem changing ownership of /secoff"
+	chmod 700 /secoff /var/log/rsbac ||  \
+	die "problem changing permissions of /secoff and/or /secoff/log"
+	chown secoff:secoff -R /secoff || \
+	die "problem changing ownership of /secoff"
+	einfo "It is suggested to run (for example) a separate copy of syslog-ng to"
+	einfo "log RSBAC messages, as user audit (uid 404) instead of using the deprecated"
+	einfo "rklogd. See http://rsbac.org/documentation/administration_examples/syslog-ng"
+	einfo "for more information."
 }