3 files changed, 122 insertions, 2 deletions
diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index 0a9201169237..867cff1f90e5 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2008/03/31 05:37:06 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.42 2008/04/02 01:00:09 robbat2 Exp $
+
+*audit-1.7 (02 Apr 2008)
+
+  02 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> +audit-1.7.ebuild:
+  Version bump for security bug #215705.
 
   31 Mar 2008; <ricmm@gentoo.org> audit-1.5.4.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index ae42b15b4709..2ce6c6d0887b 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -10,9 +10,11 @@ DIST audit-1.5.4.tar.gz 325636 RMD160 433fb71f6d24f23fa8835646e457dc5267b02735 S
 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.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 2946 RMD160 311e4a283221c4bf9575fa9d3890637a6b17aef1 SHA1 f05fa950a34cdd98396a8f9d19880dfe7f44fe20 SHA256 70df88760a04eae58f0d67bd7b3abaeb11de66841f8322df8fcbab8f2c0292fd
-MISC ChangeLog 6787 RMD160 35d3360c5fc17e50b765933a54b5e0b09156a007 SHA1 a95dc7676ba512d60546ac4509746b647a3ea3ef SHA256 dd14cf66b55c50ac8cbf1e4eb4a8aee7db665d845ccf8f0b857deaf8cb72bba3
+EBUILD audit-1.7.ebuild 2941 RMD160 d9f9682c5a25c562409d384dbdb1d1c8540e41dd SHA1 81fe7adc7ec1687bdeedad62f5ce67bc8154bc0a SHA256 608e54cd279e432927b06099ce64525cf1f7ba55edef9d223dafcf42e6cf28bb
+MISC ChangeLog 6929 RMD160 3cc953aca9cd73e379bc0e6e9a7abaf06349aa4a SHA1 b82fba2ead67470d6915f1442c0da24fe47aad81 SHA256 56cdf471d71db2dd350bc151d5348f5678308aafda88943d4aeb3b6a87a2ba10
 MISC metadata.xml 231 RMD160 e78f0580e975fa82702433055e1498b0d9228104 SHA1 de14a9907da991c933aed57aeba714d7b7ce28c6 SHA256 f62f6487425736b6d2f27bb84ee09ccee245c1abf74462b6fbcb90f2c368ad2e
diff --git a/sys-process/audit/audit-1.7.ebuild b/sys-process/audit/audit-1.7.ebuild
new file mode 100644
index 000000000000..4055c6f28ac8
--- /dev/null
+++ b/sys-process/audit/audit-1.7.ebuild
@@ -0,0 +1,113 @@
+# 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
+}