bump 1.3.7+unquoted variable fixes, cleanup old ebuilds

1.3.5-r1 stable
Package-Manager: portage-2.1.4.4

6 files changed, 33 insertions, 168 deletions

diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index f299d66f477a..4a4bb4077008 100644
--- a/sys-apps/rsbac-admin/ChangeLog
+++ b/sys-apps/rsbac-admin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/rsbac-admin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.35 2008/02/02 13:51:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.36 2008/02/15 17:46:42 kang Exp $
+
+*rsbac-admin-1.3.7 (15 Feb 2008)
+
+  15 Feb 2008; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-admin-1.3.0.ebuild, -rsbac-admin-1.3.1.ebuild,
+  -rsbac-admin-1.3.4.ebuild, rsbac-admin-1.3.5-r1.ebuild,
+  +rsbac-admin-1.3.7.ebuild:
+  Bump to 1.3.7, removed old versions.
+  fix unquoted variables in 1.3.7
+  1.3.5-r1 stable
 
   02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   rsbac-admin-1.3.4-r1.ebuild, rsbac-admin-1.3.5-r1.ebuild:
diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index c772231afe0a..9eec207954d9 100644
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -1,16 +1,13 @@
 AUX nsswitch.conf 487 RMD160 b45ed6660f60c6b3fbee2218d250e27f7746a2d1 SHA1 ff7f331e26b5008b1665c8a1857eef924d511e76 SHA256 a92f145853fab10e1110b2ff3607a411a6fb4b4b97927d391e788e0bff019954
 AUX rklogd.init 1014 RMD160 f469f6cfe6e8015b9a0325a26dcfa2c55d6cb453 SHA1 f329f00bfc6f0e6bbb489ffff172237bf6f06493 SHA256 6c9bb160e637207dbac04019577fe442a97c26acdf77becbc9a557ce42a396b1
 AUX rsbac.conf 209 RMD160 fb3ae78191f308ef488832eb844c6f3c7c3ccedf SHA1 82fc8195e237d749cd86650699d0ee172f7ddc18 SHA256 7ce39c310463001cffb2f8db01c8ff5154abdbede48a7e5c7b7a0252c8a80c19
-DIST rsbac-admin-1.3.0.tar.bz2 277266 RMD160 51eb8a40e432c73c1a6491760208e87afaa82956 SHA1 0c5b581ea4764c69fb03f17cb282d14b7b3c4298 SHA256 4415cc458a88afa3598b63ee7dbba7d0fcda72d9ac7fe046ac3693fcda77f99e
-DIST rsbac-admin-1.3.1.tar.bz2 277714 RMD160 64ab7fd728caa689bb60326f40ecc3b6b3d9457f SHA1 f485028fe0f95a500fa860d1fd17f7fc711e6205 SHA256 1e33afd5c540902e22a29039061ba833325c60aad6fc4e0c77feea916623cbaa
 DIST rsbac-admin-1.3.4.tar.bz2 279557 RMD160 8ac22d3d16340fbc8882bdcf7f93ece419e37406 SHA1 0d6dac513d5ad3db9e311f0f9f641be4b2386616 SHA256 b2c378461c580e201f0184a64db87d479471b25cd6a8541cd706c9e48dce24e5
 DIST rsbac-admin-1.3.5.tar.bz2 279824 RMD160 b5bb373290082cf9df580592fe8008c182c6ffc4 SHA1 e4893fb241300a6cb88454364cd6268c73884a61 SHA256 da85c0353c5752171b3a9ac5946319528519b3d1dd49c9dc3cd2024cb08c383d
+DIST rsbac-admin-1.3.7.tar.bz2 281011 RMD160 df573524b67f7a3718264d63bab18dfaa6a3f54f SHA1 1756bec022b619ecec39008be03205b7566826b8 SHA256 84fdc06a93a3c7efff58fef2553d6c8afac929c50034a350323485a7efb19e17
 EBUILD rsbac-admin-1.2.99.ebuild 2162 RMD160 a11c80a643504307f7509a3eaad69425ecde362a SHA1 266afee824e35bbd60da341ae6830ef299d00d3e SHA256 845e71cfc97dce7c49cb11ce4bd6322f4b4d71948b37b29a184d304d16ca2fa9
-EBUILD rsbac-admin-1.3.0.ebuild 2151 RMD160 205bb66ab81e56c89277fa257e098605dc7ebae4 SHA1 de3de875eaacb873a9a3042bd2005a3303ed0b24 SHA256 663a8f646400207d70464ec137073d499b47a4ada2318abe01bfa9dff0a97234
-EBUILD rsbac-admin-1.3.1.ebuild 2149 RMD160 af89853dc2518e1b56950dec06f4f0f1784b5d0d SHA1 57ff5b3c2de215e0233eb807ed8beb5db975bea2 SHA256 4d6c5a440a3b7f6bbe54f0c7554cbf55270324b4a12926eede9669d81ff2b067
 EBUILD rsbac-admin-1.3.4-r1.ebuild 2418 RMD160 3c5881ac82a29736445728b9bb716a52cf9f8ab4 SHA1 afad41a07614f82af570e51690a25263882b6f76 SHA256 b906b56e8f5aefb8485cbf08c057bef6cef9aa28cf0d615e62eba1688f5b1ab7
-EBUILD rsbac-admin-1.3.4.ebuild 2151 RMD160 0e6bad49597f3a7726b5a94b61c7d09dd7ced861 SHA1 b3e7ba6b52b3c5fb9874500c43936439a2914ca4 SHA256 35ddc79cc13c2e576ced69cfc79f3a4ca506b7c11fce66facb5c863a32b8f519
-EBUILD rsbac-admin-1.3.5-r1.ebuild 2464 RMD160 21411e70a4b0c6e1b8fdf6af658f0becaa9166e8 SHA1 dc8e5e2c1e9275bbb7ebd0eba230c59075dfa12f SHA256 0a4a609f47ecc30f82dcbcefe8308b75f5f7ca10a7bbaacd8ab2f7ebafbb952c
+EBUILD rsbac-admin-1.3.5-r1.ebuild 2458 RMD160 9d720f98d031c62a33f0f2632528866e8e4273c0 SHA1 bee962d9852d74e6f2e23b2d9c3da9e7d7a024c0 SHA256 edda388802778f9d1525afa2f123d11cc04a7a9b304fc22dd061c9299aa43388
 EBUILD rsbac-admin-1.3.5.ebuild 2394 RMD160 3bc1bd6437cfac4b53a08a15b81a49c61fe190fa SHA1 0944bb03f4327253f991eb5240d2654d0fdfed79 SHA256 d41f6b6b1db7e31dcee601df77554e48cad24fc9514e4403f3bcbeab8dd6847f
-MISC ChangeLog 6453 RMD160 cf7d01d53134f8de5308573e0d1b07600bdcdc7a SHA1 6830b8edb66f0ea661410d376dcbb3208b052dc4 SHA256 a79bb5f327752522e26981d3d0b2fb39ad8ecb3bec013377968bd6c93b19305a
+EBUILD rsbac-admin-1.3.7.ebuild 2474 RMD160 8bb99349efaaf45ed59ca885ddf8b52aeb3e5923 SHA1 d0e0f2dcf31b2d27c5e5ff05421095347099b67f SHA256 0af0c8198b12bac533be7ba60a8ec469c90d5195edceda06102ff44e258f76a1
+MISC ChangeLog 6772 RMD160 6cce4837338531223edeacc1d4c1ad7cfed1dbbd SHA1 37dd3ef801691fe79fd2e4b4272dd6790132061c SHA256 18a6327505519eb0c1f424292543065d509b91fedebac38cd644b8ba02e0ac98
 MISC metadata.xml 260 RMD160 93d035e25e95aa3588892ef261f67e427ac41239 SHA1 d4e1e029e9fb96ae91cb1e4eba0a7902da9e2964 SHA256 aff8f9d24589bbd26b4783bb4cf52d9a1baf38872e67de6ee30427007c0e0efe
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.1.ebuild
deleted file mode 100644
index a4feaeb821e2..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 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.3.1.ebuild,v 1.3 2007/06/08 14:26:20 kang Exp $
-
-inherit eutils libtool
-
-IUSE="pam"
-
-# 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://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-NSS="1.3.1"
-
-DEPEND="dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-	elibtoolize
-}
-
-src_compile() {
-	local rsbacmakeargs
-	rsbacmakeargs="libs tools"
-	use pam && {
-		rsbacmakeargs="${makeargs} pam nss"
-	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
-}
-
-src_install() {
-	local rsabacinstallargs
-	rsbacinstallargs="headers-install libs-install tools-install"
-	use pam && {
-		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
-	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
-	die "cannot install (${rsbacinstallargs})"
-	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
-	dodir /secoff
-	keepdir /secoff
-	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"
-	enewgroup audit 404 || die "problem adding group audit"
-	enewuser audit 404 -1 /dev/null audit || \
-	die "problem adding user audit"
-
-	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."
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.4.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.4.ebuild
deleted file mode 100644
index 5607e726a100..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 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.3.4.ebuild,v 1.1 2007/06/08 14:26:20 kang Exp $
-
-inherit eutils libtool
-
-IUSE="pam"
-
-# 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://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-NSS="1.3.4"
-
-DEPEND="dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-	elibtoolize
-}
-
-src_compile() {
-	local rsbacmakeargs
-	rsbacmakeargs="libs tools"
-	use pam && {
-		rsbacmakeargs="${makeargs} pam nss"
-	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
-}
-
-src_install() {
-	local rsabacinstallargs
-	rsbacinstallargs="headers-install libs-install tools-install"
-	use pam && {
-		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
-	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
-	die "cannot install (${rsbacinstallargs})"
-	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
-	dodir /secoff
-	keepdir /secoff
-	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"
-	enewgroup audit 404 || die "problem adding group audit"
-	enewuser audit 404 -1 /dev/null audit || \
-	die "problem adding user audit"
-
-	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."
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
index b6d751b08abe..1cd351feb0b0 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.3.5-r1.ebuild,v 1.2 2008/02/02 13:51:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild,v 1.3 2008/02/15 17:46:42 kang Exp $
 
 inherit eutils libtool multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 NSS="1.3.5"
 
 DEPEND="dev-util/dialog
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.3.0.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.7.ebuild
index 52511495b36e..69e82186ea1f 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.3.0.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3.0.ebuild,v 1.2 2007/01/12 10:37:25 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.7.ebuild,v 1.1 2008/02/15 17:46:42 kang Exp $
 
-inherit eutils libtool
+inherit eutils libtool multilib toolchain-funcs
 
 IUSE="pam"
 
-# RSBAC Adming packet name
+# RSBAC Admin packet name
 #ADMIN=rsbac-admin-v${PV}
 
 DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
@@ -16,7 +16,7 @@ SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
-NSS="1.3.0"
+NSS="1.3.7"
 
 DEPEND="dev-util/dialog
 	pam? ( sys-libs/pam )
@@ -26,7 +26,7 @@ RDEPEND=">=sys-libs/ncurses-5.2"
 
 src_unpack() {
 	unpack $A
-	cd ${S}
+	cd "${S}"
 	elibtoolize
 }
 
@@ -36,7 +36,7 @@ src_compile() {
 	use pam && {
 		rsbacmakeargs="${makeargs} pam nss"
 	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
+	emake PREFIX=/usr LIBDIR=/$(get_libdir) ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
@@ -45,14 +45,20 @@ src_install() {
 	use pam && {
 		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
+	make PREFIX=/usr LIBDIR=/$(get_libdir) DESTDIR="${D}" "${rsbacinstallargs}" || \
 	die "cannot install (${rsbacinstallargs})"
 	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
+	newins "${FILESDIR}/rsbac.conf" rsbac.conf "${FILESDIR}/nsswitch.conf"
 	dodir /secoff
 	keepdir /secoff
 	dodir /var/log/rsbac
 	keepdir /var/log/rsbac
+	#FHS compliance
+	dodir /usr/$(get_libdir)
+	mv "${D}/$(get_libdir)/librsbac.{,l}a" "${D}/usr/$(get_libdir)"
+	mv "${D}/$(get_libdir)/libnss_rsbac.{,l}a" "${D}/usr/$(get_libdir)"
+	gen_usr_ldscript librsbac.so
+	gen_usr_ldscript libnss_rsbac.so
 }
 
 pkg_postinst() {
@@ -69,6 +75,6 @@ pkg_postinst() {
 	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 "rklogd. See http://www.rsbac.org/documentation/administration_examples/syslog-ng"
 	einfo "for more information."
 }