1.3.5 changed the way FHS, libtool and /lib was handled. fixed to reflect this change (or libs wouldn't work anyway.) Pruned old 1.2 ebuilds.

(Portage version: 2.1.3_rc8)

8 files changed, 25 insertions, 159 deletions

diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index fb937eb2cb74..4b38424c2d18 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.33 2007/07/24 09:41:34 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.34 2007/07/27 15:03:02 kang Exp $
+
+*rsbac-admin-1.3.5-r1 (27 Jul 2007)
+
+  27 Jul 2007; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-admin-1.2.5.ebuild, -rsbac-admin-1.2.6.ebuild,
+  -rsbac-admin-1.2.7.ebuild, +rsbac-admin-1.3.5-r1.ebuild:
+  Fixed 1.3.5 ebuild to create FHS-standard library install into /lib
+  correctly (due to changes in 1.3.5 makefiles), pruned old 1.2 releases.
 
   24 Jul 2007; Guillaume Destuynder <kang@gentoo.org>
   rsbac-admin-1.3.4-r1.ebuild:
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.5 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.5
deleted file mode 100644
index d16b2b5aed1d..000000000000
--- a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12560426f1724b5b140e661547356260 rsbac-admin-1.2.5.tar.bz2 279064
-RMD160 5eb079e711028e26533f53805ae914f5191d6822 rsbac-admin-1.2.5.tar.bz2 279064
-SHA256 f1cd5fa854a23d707cd1968dbef85340dba8171509727e6a7cb2568efaccdf91 rsbac-admin-1.2.5.tar.bz2 279064
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.6 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.6
deleted file mode 100644
index 48736cd1763e..000000000000
--- a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 167ca4c00e2a17b59c5194707be95a26 rsbac-admin-1.2.6.tar.bz2 273778
-RMD160 3fd1e203e770eba2fab1d04334b6a50eb29c24bb rsbac-admin-1.2.6.tar.bz2 273778
-SHA256 dbd650dd64c39d2dc218f92e7a1492a17254d38e40a26bb7eac7c198d439dfb7 rsbac-admin-1.2.6.tar.bz2 273778
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.7 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.7
deleted file mode 100644
index c42c7a65e320..000000000000
--- a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db0ae77cbeeb2380e3dbb7d7e2abeae2 rsbac-admin-1.2.7.tar.bz2 273610
-RMD160 e2939ec79cc45eaaf22218f04530d772b0bef956 rsbac-admin-1.2.7.tar.bz2 273610
-SHA256 1d49aaaf18e518681798a31a1e04c56947b24c5c0f206fca348b9624f56b133b rsbac-admin-1.2.7.tar.bz2 273610
diff --git a/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.3.5-r1 b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.3.5-r1
new file mode 100644
index 000000000000..df9766ea42d8
--- /dev/null
+++ b/sys-apps/rsbac-admin/files/digest-rsbac-admin-1.3.5-r1
@@ -0,0 +1,3 @@
+MD5 5bd46bcd85c7b10c3830b4120d330266 rsbac-admin-1.3.5.tar.bz2 279824
+RMD160 b5bb373290082cf9df580592fe8008c182c6ffc4 rsbac-admin-1.3.5.tar.bz2 279824
+SHA256 da85c0353c5752171b3a9ac5946319528519b3d1dd49c9dc3cd2024cb08c383d rsbac-admin-1.3.5.tar.bz2 279824
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
deleted file mode 100644
index 761b0c305cac..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 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.6 2006/02/16 10:24:00 kang Exp $
-
-inherit eutils
-
-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.2.5"
-
-DEPEND="dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-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=${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 /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.2.7.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.7.ebuild
deleted file mode 100644
index 2f1664eae826..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 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.7.ebuild,v 1.1 2006/06/07 10:15:35 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.2.7"
-
-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.2.6.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
index e96cd56ae0a9..fb05342bbc37 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.6.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.2.6.ebuild,v 1.1 2006/05/19 11:19:07 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.3.5-r1.ebuild,v 1.1 2007/07/27 15:03:02 kang Exp $
 
-inherit eutils libtool
+inherit eutils libtool toolchain-funcs
 
 IUSE="pam"
 
@@ -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.2.6"
+NSS="1.3.5"
 
 DEPEND="dev-util/dialog
 	pam? ( sys-libs/pam )
@@ -36,7 +36,7 @@ src_compile() {
 	use pam && {
 		rsbacmakeargs="${makeargs} pam nss"
 	}
-	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
+	emake PREFIX=/usr LIBDIR=/lib ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
@@ -45,7 +45,7 @@ src_install() {
 	use pam && {
 		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
-	make PREFIX=/usr DESTDIR=${D} ${rsbacinstallargs} || \
+	make PREFIX=/usr LIBDIR=/lib DESTDIR=${D} ${rsbacinstallargs} || \
 	die "cannot install (${rsbacinstallargs})"
 	insinto /etc
 	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
@@ -53,6 +53,12 @@ src_install() {
 	keepdir /secoff
 	dodir /var/log/rsbac
 	keepdir /var/log/rsbac
+	#FHS compliance
+	dodir /usr/lib
+	mv ${D}/lib/librsbac.la ${D}/lib/librsbac.a ${D}/usr/lib
+	mv ${D}/lib/libnss_rsbac.la ${D}/lib/libnss_rsbac.a ${D}/usr/lib
+	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."
 }