Put new 1.1.6 and 1.2.1 versions into tree. Still unusable until 2.6.17-rc1 headers get out.

(Portage version: 2.1_pre7-r5)

7 files changed, 109 insertions, 39 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index 587260cf22f5..0929aea3d567 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.10 2006/02/01 03:03:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.11 2006/04/19 23:17:16 robbat2 Exp $
+
+*audit-1.2.1 (19 Apr 2006)
+*audit-1.1.6 (19 Apr 2006)
+
+  19 Apr 2006; Robin H. Johnson <robbat2@gentoo.org> -audit-1.1.3.ebuild,
+  +audit-1.1.6.ebuild, +audit-1.2.1.ebuild:
+  Put new 1.1.6 and 1.2.1 versions into tree. Still unusable until 2.6.17-rc1
+  headers get out.
 
   01 Feb 2006; Robin H. Johnson <robbat2@gentoo.org> audit-1.1.3.ebuild:
   Fix typo.
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 4e51fb1a1346..3f8399a2dce7 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 66880c4f2d7b9dcf67670a8443aebbf8 ChangeLog 1783
 RMD160 6b83ed7ad612be20c1ba3f790e94fda198a8c60c ChangeLog 1783
 SHA256 31e944dca95a3b244c3d91d147caa65fd48d4bba04bf7d0cc3524be1c8dec240 ChangeLog 1783
@@ -22,9 +19,12 @@ SHA256 e61f879a74d4ad8597c836768a009029fd73eca50cc361248aabc2a00cdc0eb9 audit-0.
 MD5 ccaf6e8614e3b817335570e1085e2a9a audit-0.9.1.ebuild 1564
 RMD160 02e47ad08ae4f58d9f82b2773cf854d9a3aced53 audit-0.9.1.ebuild 1564
 SHA256 a01bf8e0f27c70b7d40183f587bf59c1734ea60bb11733353900632fe9131389 audit-0.9.1.ebuild 1564
-MD5 a4491bbbba20f3ba8dcb7b74354dffcb audit-1.1.3.ebuild 1688
-RMD160 a7b5758f6f5225a522a70d376edeafc61586b5d1 audit-1.1.3.ebuild 1688
-SHA256 7168a4b0bd5fb61465700d55ce768ed20bfcd61057b70f2dc2e1c98dfc415f5b audit-1.1.3.ebuild 1688
+MD5 062dbff526787e3050637d6eac51cadb audit-1.1.6.ebuild 1605
+RMD160 35498e1b65222641674a50a598369222435d95bb audit-1.1.6.ebuild 1605
+SHA256 e1de04cfe487136690089c9b0eb747f14b5c4bccde3ef111321aa88faaf1e6c6 audit-1.1.6.ebuild 1605
+MD5 ec4c16beae96f708f7a07212818cca90 audit-1.2.1.ebuild 1759
+RMD160 bf255404b656368e6618de67aa23b8c3b08147cf audit-1.2.1.ebuild 1759
+SHA256 ced8a165e1b39930d7e7ae3857797f7310c1ac61b5dda3163f24210f2e57fa77 audit-1.2.1.ebuild 1759
 MD5 fe4a6c96f2df7f9126c1f043610399f2 files/audit-1.1.3-compilefix.patch 3742
 RMD160 dd0a5338aaac12850e771d6baa9d0bfb5d3a4925 files/audit-1.1.3-compilefix.patch 3742
 SHA256 8ffe02eb9ee988996c9cb4ccdcc3ee39903131173260b13b72b94298fb3afff4 files/audit-1.1.3-compilefix.patch 3742
@@ -58,16 +58,12 @@ SHA256 b067bb153d2a93e2b31817bc7d6f749e6a6aa73e5aec66281c995b5fa8d48943 files/di
 MD5 218045283f07df1580cadf6ef3473da0 files/digest-audit-0.9.1 62
 RMD160 98c3dc5abee6f982dcb17111787ce4aae5669fcf files/digest-audit-0.9.1 62
 SHA256 d524f6988aea8cdce75e53b3b483da30b1ba64805eda5cb35e5b5ed630f27032 files/digest-audit-0.9.1 62
-MD5 a80136feb5f0f97b25b59551791f215d files/digest-audit-1.1.3 235
-RMD160 3fe78764b06dac10476b2362486f9752b682b673 files/digest-audit-1.1.3 235
-SHA256 767ae51f40e78e9455aec4012e2dd1b28b42323e473b811d8d29586c057cd622 files/digest-audit-1.1.3 235
+MD5 edb393f2e6c69e99ffb30cffd84f91c6 files/digest-audit-1.1.6 235
+RMD160 9bd14ae6d5fa05e220d76edbe6141b738998f545 files/digest-audit-1.1.6 235
+SHA256 9771919111067a75162be5c8bcab827d83de60d3ee7d7b8b873372d17fa43320 files/digest-audit-1.1.6 235
+MD5 ded2fc0aedbcc841885edf0c30fbd5d5 files/digest-audit-1.2.1 235
+RMD160 ea0cbbfccc546049070cb9e5cba2e2935d26308d files/digest-audit-1.2.1 235
+SHA256 76c086afac2d22489c3f0e77d4b499adeb0e8e388dabd59d4bc45d050e05bf20 files/digest-audit-1.2.1 235
 MD5 426b16b0f03a2c3b0fa6864a71876999 metadata.xml 231
 RMD160 e78f0580e975fa82702433055e1498b0d9228104 metadata.xml 231
 SHA256 f62f6487425736b6d2f27bb84ee09ccee245c1abf74462b6fbcb90f2c368ad2e metadata.xml 231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHI+RV3J2n04EauwRAj1eAJ90aMtwfqdyTUGeM71BC4TEHXneuQCeKuE4
-ab8RqWSvDoVM5Fo4gUT7EGg=
-=ZkWJ
------END PGP SIGNATURE-----
diff --git a/sys-process/audit/audit-1.1.3.ebuild b/sys-process/audit/audit-1.1.6.ebuild
index c33d697e9094..213f421c567d 100644
--- a/sys-process/audit/audit-1.1.3.ebuild
+++ b/sys-process/audit/audit-1.1.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.1.3.ebuild,v 1.3 2006/02/16 21:40:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.1.6.ebuild,v 1.1 2006/04/19 23:17:16 robbat2 Exp $
+
+inherit eutils autotools
 
 DESCRIPTION="Userspace utilities for storing and processing auditing records."
 HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
@@ -11,20 +13,17 @@ SLOT="0"
 KEYWORDS="-*"
 IUSE=""
 
-DEPEND="sys-devel/libtool
-	virtual/os-headers
-	>=sys-devel/automake-1.9
-	>=sys-devel/autoconf-2.59
-	>=sys-kernel/linux-headers-2.6.15_rc6"
-RDEPEND=""
+RDEPEND=">=dev-lang/python-2.4"
+DEPEND="${RDEPEND}
+		dev-lang/swig
+		>=sys-kernel/linux-headers-2.6.17_rc1"
+# Do not use os-headers as this is linux specific
+# linux-headers 2.6.17_rc1 is NOT in the tree yet.
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
-	EPATCH_OPTS="-p1 -d ${S}" \
-		epatch  ${FILESDIR}/${P}-compilefix.patch
 	cd ${S} || die "cd '${S}' failed"
-	WANT_AUTOMAKE="1.9" \
-		autoreconf -fv --install || die "autoreconf failed"
+	eautoreconf || die "eautoreconf failed"
 }
 
 src_compile() {
@@ -33,25 +32,29 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodir /usr/lib
-	mv ${D}/lib/*.{a,la} ${D}/usr/lib
+	mv ${D}/lib/*.a ${D}/usr/lib
+	rm -rf ${D}/lib/*.la ${D}/usr/lib/*.la
 	# remove RedHat garbage
 	rm -rf ${D}/etc/rc.d ${D}/etc/sysconfig
 	# docs
-	dodoc AUTHORS ChangeLog README* THANKS TODO sample.rules
+	dodoc AUTHORS ChangeLog README* THANKS TODO sample.rules contrib/*
 	# scripts
 	newinitd ${FILESDIR}/auditd.initd-0.7.2-r1 auditd
 	newconfd ${FILESDIR}/auditd.confd-0.7.2-r1 auditd
 	# audit logs go here
 	keepdir /var/log/audit/
-	# restrictive perms for security
-	chmod 0750 ${D}/sbin/{auditctl,auditd,ausearch,autrace} ${D}/var/log/audit/
-	chmod 0640 ${D}/etc/{auditd.conf,audit.rules}
+	lockdown_perms ${D}
 }
 
 pkg_postinst() {
+	lockdown_perms /
+}
+
+lockdown_perms() {
 	# upstream wants these to have restrictive perms
-	chmod 0750 /sbin/{auditctl,auditd,ausearch,autrace} /var/log/audit/
-	chmod 0640 /etc/{auditd.conf,audit.rules}
+	basedir="$1"
+	chmod 0750 ${basedir}/sbin/{auditctl,aureport,audispd,auditd,ausearch,autrace} ${D}/var/log/audit/
+	chmod 0640 ${basedir}/etc/{auditd.conf,audit.rules}
 }
diff --git a/sys-process/audit/audit-1.2.1.ebuild b/sys-process/audit/audit-1.2.1.ebuild
new file mode 100644
index 000000000000..749a6341bc32
--- /dev/null
+++ b/sys-process/audit/audit-1.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.2.1.ebuild,v 1.1 2006/04/19 23:17:16 robbat2 Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records."
+HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-*"
+IUSE=""
+
+RDEPEND=">=dev-lang/python-2.4"
+DEPEND="${RDEPEND}
+		dev-lang/swig
+		>=sys-kernel/linux-headers-2.6.17_rc1"
+# Do not use os-headers as this is linux specific
+# linux-headers 2.6.17_rc1 is NOT in the tree yet.
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd '${S}' failed"
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_compile() {
+	econf --sbindir=/sbin --libdir=/lib || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodir /usr/lib
+	mv ${D}/lib/*.a ${D}/usr/lib
+	rm -rf ${D}/lib/*.la ${D}/usr/lib/*.la
+	# remove RedHat garbage
+	rm -rf ${D}/etc/rc.d ${D}/etc/sysconfig
+	# docs
+	dodoc AUTHORS ChangeLog README* THANKS TODO sample.rules contrib/*
+	# scripts
+	newinitd ${FILESDIR}/auditd.initd-0.7.2-r1 auditd
+	newconfd ${FILESDIR}/auditd.confd-0.7.2-r1 auditd
+	# audit logs go here
+	keepdir /var/log/audit/
+	lockdown_perms ${D}
+}
+
+pkg_postinst() {
+	lockdown_perms /
+}
+
+lockdown_perms() {
+	# upstream wants these to have restrictive perms
+	basedir="$1"
+	chmod 0750 ${basedir}/sbin/{auditctl,aureport,audispd,auditd,ausearch,autrace} ${D}/var/log/audit/
+	chmod 0640 ${basedir}/etc/{auditd.conf,audit.rules}
+}
diff --git a/sys-process/audit/files/digest-audit-1.1.3 b/sys-process/audit/files/digest-audit-1.1.3
deleted file mode 100644
index aa64bc08d123..000000000000
--- a/sys-process/audit/files/digest-audit-1.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff5be0c2fdc3a28ec4903f64a5587faf audit-1.1.3.tar.gz 264682
-RMD160 f231e05c4b1651528554b1512c36342c47c85ff5 audit-1.1.3.tar.gz 264682
-SHA256 7e2f838b054fec5121a80e4717e5807854a59a8f8daa06a7a9d55e5108a71b13 audit-1.1.3.tar.gz 264682
diff --git a/sys-process/audit/files/digest-audit-1.1.6 b/sys-process/audit/files/digest-audit-1.1.6
new file mode 100644
index 000000000000..60209d810a5e
--- /dev/null
+++ b/sys-process/audit/files/digest-audit-1.1.6
@@ -0,0 +1,3 @@
+MD5 19d208c284d6f6ae830f1943a74bbd7f audit-1.1.6.tar.gz 274815
+RMD160 8f420b47347d1c00b4b4c114dc4f913704a9205e audit-1.1.6.tar.gz 274815
+SHA256 44c152fc652567c64c5937335122b37250694152bd47d44628b11f1f65c16e04 audit-1.1.6.tar.gz 274815
diff --git a/sys-process/audit/files/digest-audit-1.2.1 b/sys-process/audit/files/digest-audit-1.2.1
new file mode 100644
index 000000000000..4a2e99d49a54
--- /dev/null
+++ b/sys-process/audit/files/digest-audit-1.2.1
@@ -0,0 +1,3 @@
+MD5 537d4ee68428e2ba2f01a8c07287fb6e audit-1.2.1.tar.gz 274432
+RMD160 14f70c58239f6ed2eba3d902630f4bd4112c4fba audit-1.2.1.tar.gz 274432
+SHA256 bba5d255d81ca36245464b83e977ba6bd05b1528cad07559fcc0367d39b2d26f audit-1.2.1.tar.gz 274432