6 files changed, 7 insertions, 373 deletions
diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index 1abca6aa561b..e24a4a18a845 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/audit
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.52 2008/12/06 15:03:22 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.53 2009/07/29 16:01:22 darkside Exp $
+
+  29 Jul 2009; Jeremy Olexa <darkside@gentoo.org> -audit-1.5.4.ebuild,
+  -audit-1.6.1.ebuild, -audit-1.6.2.ebuild, -audit-1.7.ebuild:
+  Remove vulnerable version(s), bug 271746
 
 *audit-1.7.9 (06 Dec 2008)
 
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 2bc58ea6446d..5109e523bd08 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -6,21 +6,13 @@ AUX audit.rules.stop.post 573 RMD160 2e6503fc7ee07c4c1e58fb9ddf4b13eec6d95044 SH
 AUX audit.rules.stop.pre 500 RMD160 6b56a9522e140b48b7f7e67570596ba298a51dc7 SHA1 032921fc3ee730139b39f019b0268a2f1b1962ad SHA256 044cf06cea49f9d38ea114eb16b0a1428465fa2158aea713ef92e67e07e13c48
 AUX auditd-conf.d-1.2.3 686 RMD160 7963d2ac1ec7878db5fc29b6512742ceb0bc2ef5 SHA1 95f171317014f6e2435186953ad21d68a7f3f471 SHA256 5e0ffdc1c446bb906d25c977b0e9adb813610a15dc4d60b52d25026816adb602
 AUX auditd-init.d-1.2.3 1136 RMD160 ceddd2ce12be248183722b59240d662f507a16eb SHA1 f6fa0da5640bfa234219ebd3304d9f343c97371c SHA256 fd5e01b4aa83d848a2e97832b0ff0610610b7857ec7f0201f0f7cbeff8eec725
-DIST audit-1.5.4.tar.gz 325636 RMD160 433fb71f6d24f23fa8835646e457dc5267b02735 SHA1 478cbf6a08cdd0afc7f5d2cff6e2bd100dbc9a94 SHA256 192fcbd0cc45aa26d44607081acdbb60a002067a750d505822e99c8ab9929931
-DIST audit-1.6.1.tar.gz 791114 RMD160 6734fffc26abd8233e7bc2668d80a3341f40ff89 SHA1 97eb2ffe77f00306f00a9cec5083a6925b76f6e9 SHA256 457656ab19f81823ab477a37b27c644d9d5382ca810b411819ef5930dceeca5b
-DIST audit-1.6.2.tar.gz 776148 RMD160 e22d294e797f1903bfc10a7ef116f0b8123d2488 SHA1 ae9f65497bb35b0db72d97dc5d808fb4729a7aab SHA256 c8168604d14ccbd0db3f8972035fe7e4363925a4aa6b2998d973af659796de5c
 DIST audit-1.6.8.tar.gz 799726 RMD160 8dfd6671f61a932ece208d650e042e31cc128b00 SHA1 d6b1d0aae3c8260bca70a9b6564bac40f0911a5d SHA256 88f32ed843f68a16506e3818d074ba5667040567c105f439ca0bfba97f1a2cf7
 DIST audit-1.7.3.tar.gz 837045 RMD160 64a60dd52316ce55b9f2220453ab88b62aa3b950 SHA1 3c35f1cc22e25dcbffbf97d108e6ae540fa515e2 SHA256 70347c79d267f6fd53700e981e6fa2640ad5def12180c1a46a2de43b863d6b30
 DIST audit-1.7.4.tar.gz 840298 RMD160 08d57fc039021f05763920603c435747fe51c954 SHA1 5348fc1f310fd8eb068480c6b6d61e3c24c58207 SHA256 db5412852aa36ee25eb174e4f4a4676cc2d0b93cbe41a740eebf903b49b4d593
 DIST audit-1.7.9.tar.gz 1245155 RMD160 248ca395c6d58dccf8437750e6cf5a7040a28c9f SHA1 aa7de4546f4774338946987fe1a8231222475e64 SHA256 95ce67d9aee4339a5aa11214f21dfa5f37c5820e2511c7bddf998d26b1aaefc9
-DIST audit-1.7.tar.gz 827447 RMD160 1eed3ddeb2e16255afe7082feb12afc44cf32b27 SHA1 8b7eafeaa0c609f3640ee5c7f4ed7730ef2532de SHA256 b439f85e90c5ad2d9b9e0f9148f1374756dc0a5d7fb6a925415cf7b442941837
-EBUILD audit-1.5.4.ebuild 1998 RMD160 142bb63507770fbbe1df9802ced6de2f70302337 SHA1 68aeeee6be3b0d16f8de65ad70a3e43840381f9f SHA256 c82761edac5ae13067ba07cc9ebc9b6150cc8153e7427060e842cda3eaf1720b
-EBUILD audit-1.6.1.ebuild 2377 RMD160 38a790e3c70f6214c4188c8036280a14cd63bd4c SHA1 92b1e3cd01fde97e992f84313f424d26829d5d1a SHA256 7cf9fe270225a9d75ac2ad2f7d6dd7baed76919db05d3612e56aaca8198bc103
-EBUILD audit-1.6.2.ebuild 2375 RMD160 3cc4ecf0bee9b63e16195ae5bc441b05e206e107 SHA1 210883b3de3d136653a19db68ab89aa435154538 SHA256 69cec25370267a580f4a97d9e5a4a456313c15789809910935f2241cab3d8e8e
 EBUILD audit-1.6.8.ebuild 2953 RMD160 b532827cf705b16f286cc94cd8ce35a80b22d6b7 SHA1 cbb82e3bfed112303e8d59782bf27b6cf6b6722f SHA256 a1bed2475397ca728ca5a0116bf9959a49a2c18792409b9ea92fae7e3391c5dd
 EBUILD audit-1.7.3.ebuild 2940 RMD160 ed7db4c3f0fa6953a4d5ad0531d572c00a044efa SHA1 815a85f6d79f42aa1b413062db8fa2f0103f8efc SHA256 beeb40301a7b6fd33215b6371f08a4be5aaa3f8622ac1ddc90b8ff135f1f7062
 EBUILD audit-1.7.4.ebuild 2943 RMD160 8263395c00870c9a3876a48929c5af53348ca2a0 SHA1 d11766fa79f14858b83a720fc18607db8f3f7f45 SHA256 4ceacabe7e1c3d07789bded66b4811b30ae35808c1f1948812b8082229c1b7b6
 EBUILD audit-1.7.9.ebuild 2940 RMD160 fd41390b04c0f4008f5546014b03701cf8245164 SHA1 28c742a7d1e74eba36b498e1a967e6ba886d2763 SHA256 291213ca7c13e5019fcfff33415cd06aeed1863b9e991104f1692f185397dd89
-EBUILD audit-1.7.ebuild 2941 RMD160 d9f9682c5a25c562409d384dbdb1d1c8540e41dd SHA1 81fe7adc7ec1687bdeedad62f5ce67bc8154bc0a SHA256 608e54cd279e432927b06099ce64525cf1f7ba55edef9d223dafcf42e6cf28bb
-MISC ChangeLog 8094 RMD160 0f9eb31ab96c540ac69c4e3ac0af69ff64bc62e0 SHA1 ff89bb8571d991ec17c98c315b554cd1ccb4f2cc SHA256 cb99107b921f41474188bd2f7e6c9c9f3c51b565f126a06ba26b7b5185518c9f
+MISC ChangeLog 8277 RMD160 8ca5438388a5561386bf07e01b03da1f09e90509 SHA1 dc8cfa3358cfd672935ba8cc1a6402ca4a94e515 SHA256 7411a3f7291e72de555e8ebb03b93424ded611aa4a238c6efcf99ba001aba403
 MISC metadata.xml 231 RMD160 e78f0580e975fa82702433055e1498b0d9228104 SHA1 de14a9907da991c933aed57aeba714d7b7ce28c6 SHA256 f62f6487425736b6d2f27bb84ee09ccee245c1abf74462b6fbcb90f2c368ad2e
diff --git a/sys-process/audit/audit-1.5.4.ebuild b/sys-process/audit/audit-1.5.4.ebuild
deleted file mode 100644
index 0fa40ce648c7..000000000000
--- a/sys-process/audit/audit-1.5.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.5.4.ebuild,v 1.11 2008/03/31 05:37:06 ricmm Exp $
-
-inherit autotools multilib toolchain-funcs
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	>=sys-kernel/linux-headers-2.6.20-r2"
-# Do not use os-headers as this is linux specific
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-swig-gcc-attribute.patch
-	# stupid package does not include generated autotools
-	eautoreconf
-}
-
-src_compile() {
-	append-flags -D'__attribute__(x)='
-	econf --sbindir=/sbin || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README* THANKS TODO sample.rules contrib/*
-
-	newinitd "${FILESDIR}"/auditd-init.d-1.2.3 auditd
-	newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd
-
-	# things like shadow use this so we need to be in /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libaudit.so libauparse.so
-
-	# remove RedHat garbage
-	rm -r "${D}"/etc/{rc.d,sysconfig} || die
-
-	# Gentoo rules
-	insinto /etc/audit/
-	doins "${FILESDIR}"/audit.rules*
-
-	# audit logs go here
-	keepdir /var/log/audit/
-
-	# Security
-	lockdown_perms "${D}"
-}
-
-pkg_postinst() {
-	lockdown_perms "${ROOT}"
-}
-
-lockdown_perms() {
-	# upstream wants these to have restrictive perms
-	basedir="$1"
-	chmod 0750 ${basedir}/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
-	chmod 0750 ${basedir}/var/log/audit/ 2>/dev/null
-	chmod 0640 ${basedir}/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
-}
diff --git a/sys-process/audit/audit-1.6.1.ebuild b/sys-process/audit/audit-1.6.1.ebuild
deleted file mode 100644
index 935e82ae5e17..000000000000
--- a/sys-process/audit/audit-1.6.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.6.1.ebuild,v 1.2 2007/10/02 06:38:30 robbat2 Exp $
-
-inherit autotools multilib toolchain-funcs python
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	>=sys-kernel/linux-headers-2.6.22-r2"
-# Do not use os-headers as this is linux specific
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Old patch applies fine
-	EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-	# Do not build GUI tools
-	sed -i -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' "${S}"/configure.ac
-	sed -i -e 's,system-config-audit,,g' -e '/^SUBDIRS/s,\\$,,g' "${S}"/Makefile.am
-	rm -rf "${S}"/system-config-audit
-
-	# Regenerate autotooling
-	eautoreconf
-}
-
-src_compile() {
-	#append-flags -D'__attribute__(x)='
-	econf --sbindir=/sbin || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README* THANKS TODO sample.rules contrib/*
-
-	newinitd "${FILESDIR}"/auditd-init.d-1.2.3 auditd
-	newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd
-
-	# things like shadow use this so we need to be in /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libaudit.so libauparse.so
-
-	# remove RedHat garbage
-	rm -r "${D}"/etc/{rc.d,sysconfig} || die
-
-	# Gentoo rules
-	insinto /etc/audit/
-	doins "${FILESDIR}"/audit.rules*
-
-	# audit logs go here
-	keepdir /var/log/audit/
-
-	# Security
-	lockdown_perms "${D}"
-}
-
-pkg_postinst() {
-	lockdown_perms "${ROOT}"
-	python_mod_optimize
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
-
-lockdown_perms() {
-	# upstream wants these to have restrictive perms
-	basedir="$1"
-	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
-	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
-}
diff --git a/sys-process/audit/audit-1.6.2.ebuild b/sys-process/audit/audit-1.6.2.ebuild
deleted file mode 100644
index ab8a1b023db4..000000000000
--- a/sys-process/audit/audit-1.6.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.6.2.ebuild,v 1.4 2008/01/13 20:44:37 kumba Exp $
-
-inherit autotools multilib toolchain-funcs python
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.4"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	>=sys-kernel/linux-headers-2.6.22-r2"
-# Do not use os-headers as this is linux specific
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Old patch applies fine
-	EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-	# Do not build GUI tools
-	sed -i -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' "${S}"/configure.ac
-	sed -i -e 's,system-config-audit,,g' -e '/^SUBDIRS/s,\\$,,g' "${S}"/Makefile.am
-	rm -rf "${S}"/system-config-audit
-
-	# Regenerate autotooling
-	eautoreconf
-}
-
-src_compile() {
-	#append-flags -D'__attribute__(x)='
-	econf --sbindir=/sbin || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README* THANKS TODO contrib/*
-
-	newinitd "${FILESDIR}"/auditd-init.d-1.2.3 auditd
-	newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd
-
-	# things like shadow use this so we need to be in /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libaudit.so libauparse.so
-
-	# remove RedHat garbage
-	rm -r "${D}"/etc/{rc.d,sysconfig} || die
-
-	# Gentoo rules
-	insinto /etc/audit/
-	doins "${FILESDIR}"/audit.rules*
-
-	# audit logs go here
-	keepdir /var/log/audit/
-
-	# Security
-	lockdown_perms "${D}"
-}
-
-pkg_postinst() {
-	lockdown_perms "${ROOT}"
-	python_mod_optimize
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
-
-lockdown_perms() {
-	# upstream wants these to have restrictive perms
-	basedir="$1"
-	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
-	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
-}
diff --git a/sys-process/audit/audit-1.7.ebuild b/sys-process/audit/audit-1.7.ebuild
deleted file mode 100644
index 4055c6f28ac8..000000000000
--- a/sys-process/audit/audit-1.7.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.7.ebuild,v 1.1 2008/04/02 01:00:09 robbat2 Exp $
-
-inherit autotools multilib toolchain-funcs python
-
-DESCRIPTION="Userspace utilities for storing and processing auditing records"
-HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap"
-# Testcases are pretty useless as they are built for RedHat users/groups and
-# kernels.
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/python-2.4
-		ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	>=sys-kernel/linux-headers-2.6.23"
-# Do not use os-headers as this is linux specific
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Old patch applies fine
-	#EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch
-
-	# Do not build GUI tools
-	sed -i \
-		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
-		"${S}"/configure.ac
-	sed -i \
-		-e 's,system-config-audit,,g' \
-		-e '/^SUBDIRS/s,\\$,,g' \
-		"${S}"/Makefile.am
-	rm -rf "${S}"/system-config-audit
-
-	# Probably goes away in 1.6.9
-	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
-
-	if ! use ldap; then
-		sed -i \
-			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
-			"${S}"/configure.ac
-		sed -i \
-			-e '/^SUBDIRS/s,zos-remote,,g' \
-			"${S}"/audisp/plugins/Makefile.am
-	fi
-
-	# Regenerate autotooling
-	eautoreconf
-}
-
-src_compile() {
-	#append-flags -D'__attribute__(x)='
-	econf --sbindir=/sbin --without-prelude || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README* THANKS TODO
-	docinto contrib
-	dodoc contrib/*
-	docinto contrib/plugin
-	dodoc contrib/plugin/*
-
-	newinitd "${FILESDIR}"/auditd-init.d-1.2.3 auditd
-	newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd
-
-	# things like shadow use this so we need to be in /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libaudit.so libauparse.so
-
-	# remove RedHat garbage
-	rm -r "${D}"/etc/{rc.d,sysconfig} || die
-
-	# Gentoo rules
-	insinto /etc/audit/
-	doins "${FILESDIR}"/audit.rules*
-
-	# audit logs go here
-	keepdir /var/log/audit/
-
-	# Security
-	lockdown_perms "${D}"
-}
-
-pkg_postinst() {
-	lockdown_perms "${ROOT}"
-	python_mod_optimize
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
-
-lockdown_perms() {
-	# upstream wants these to have restrictive perms
-	basedir="$1"
-	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
-	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
-	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
-}