Bug #405887: fix for newer system headers; bug #405897: bump to 1.7.18.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

6 files changed, 194 insertions, 5 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index be46edc6ce11..d427bd360bf2 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.81 2012/12/18 19:27:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.82 2012/12/18 21:57:17 robbat2 Exp $
+
+*audit-1.7.18 (18 Dec 2012)
+
+  18 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> +audit-1.7.18.ebuild,
+  +files/audit-1.7.18-as-needed.patch,
+  +files/audit-1.7.18-missing_headers.patch, audit-1.7.17.ebuild:
+  Bug #405887: fix for newer system headers; bug #405897: bump to 1.7.18.
 
   18 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> audit-2.0.5.ebuild,
   audit-2.1.3-r1.ebuild, audit-2.1.3.ebuild:
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index bb33485cd984..9e2bf39cf674 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -2,6 +2,8 @@ AUX audit-1.5.4-build.patch 292 SHA256 ef286820b8d34efa8aa04a8cd0344a78eeb0fa50a
 AUX audit-1.5.4-swig-gcc-attribute.patch 434 SHA256 0da2225a8bd1f3f83a2e8c54d1c2fe97f9917be6b0a4ed116baa8f06f1800818 SHA512 d39078024e85f0cd9a88bb33bae6053316acee47e8cbfcb391a37a8da40866719903009340a52d650af7a6ae3c2e957189434fa4095f9aa3131e23ab61111c5a WHIRLPOOL 8688a6467e2c1809e89c6ca37b97f50e1e0e624ad751949b46fd14a5c1a6c48321633207910e70d799479743819db5ac6ae4c638b4631aef6205a80f9a386588
 AUX audit-1.6.8-subdirs-fix.patch 548 SHA256 26b3ce2f56ce792924be534a43e4c455b9067898642419a1411c4048f1da6c47 SHA512 d74377fa3b8a2c2036b2fe107922848a653fd76673b424d2f0fee3427e36451632642cd2b45090156a5b2a663df21dfb0933efec0b2f39faf5c07ff80370f5b6 WHIRLPOOL 7f1b855be168657b781fa802082b72a652dd5e03e4a1f4d1d7dc1c3fa08a6f17cf18f37f9405ed6ac82b92060649832d1dfd9bfd1f11ec5e0716e8f3c6fb6357
 AUX audit-1.7.17-python.patch 448 SHA256 9d29b2c67484c64cbf2e940a084d5f4c2bcbaca85a78f5c697ea20cc7ed2cb87 SHA512 ed816ca60294109ff3ef825081a4042d592a1841a597ec5514ed6f6696331a3aeafc9147ca1f5648df65c2fedc32a966825d9444a1634388aa06cc320ab2542f WHIRLPOOL 685f661e79b2f6facd7d3a6c603a8c8c5ef5de7d37f4dcab310c23cddf239ca3a2fb3c0622cb308e32678c6f16ed34e81bf6b5a8e4b391e01bf69790bee97512
+AUX audit-1.7.18-as-needed.patch 2346 SHA256 d83311d4b1e109712a32771943c7da72be939633d0fe0ba33c99a405fc6a0f14 SHA512 e30bb39c97d4fb92594b0dcc0b8160bbf5af7096ef261c1f5e2786d2ebe6f764806c9cf18dc2ab2156057cf8a12c259faa804c98d58a4a90ac3d1a081979567a WHIRLPOOL 508e582f9feaca11d5b74b12601961959d40f4dcd0dfe002a5af47f5e3b3cb4d79037ab67d715687cc946feb859e4a2453712f34055cf7a8cca75d47935d4baf
+AUX audit-1.7.18-missing_headers.patch 381 SHA256 9bcd61e976bfb422f199b6553a1dfa745f99979fa2295b53fd8163b171d1e487 SHA512 c115ecd19f15b2b20fb233f6304ff112b85b96bbca32a8274e5215d8622be71e8ed997ca630e4a3dda3436475a0af565d51163348c09c0721d6c9ce7324e0288 WHIRLPOOL 7b138cf18929ddfaacd0e7cc256f565865076d7d68724292e6769bb7ac32a836ae315454c71f701049c300e06c582a4aa5deb4815be4c5dd2a07c053c1fd4c3d
 AUX audit-1.7.4-glibc212.patch 316 SHA256 248eaa9e69ab50d766a05bf4ba26efbee84396fb34e321d562dc47a7a95f4e28 SHA512 d3cc26592be19fc4780d21098f7e904fb0ee9cede6ed6c280ee422f75ed597a17f87ed8e350ad89d44fe0351a271469b0a94aa0d991f46ac655d64077f2b22d4 WHIRLPOOL a6f3d44c77bfa2b1c1e13de694f9218fc237d3d950d6068a6fe03e74ef0e02bb677e6de14d8c27000a419089df9ff4706631a104e0ddf551f18c37d6b56285ab
 AUX audit-1.7.4-python.patch 456 SHA256 c457c9f35956ebdb960bbf9288bf2c0acfaf224a87a0ec7d243d1566e783f018 SHA512 0aab718c9bae642b8ef6ed49438065787104f9938b7fb17b631184c46f384546c663f727caceac89718695c7dec3f6f0086a70d599335bdbe6ceaabb0dac3cce WHIRLPOOL 3ba3ac94daee63e0c67bc2a4178fb5c0ec1d3e8be719693e5082c33de40f8645ba19d45d43498a7d16f498e2faa1abc4a751a2cb71a02f33fbfc40ee3c838ace
 AUX audit-2.0.5-python.patch 891 SHA256 b5d82e670f9ac8c6640ba1155a77e0f6b6f93acd90efb89747aca636d7b68022 SHA512 1fc4013f0e1b00c2cf75e02fffad611a93f37a8f0cf4a258326a4705649e73a039c0af7540cec1beee2a32f28af7850b7cfd6c3827d1195fd1163468c4dc31c0 WHIRLPOOL 707ec56175859e9d2065a9cb04257a8355eeb3d6c129cd7fcfa38ba79b983b878c722ca2f7ae17e85f7288f90f144efb407bd85793b3731e0f9899d79970a0bf
@@ -16,13 +18,15 @@ AUX auditd-init.d-1.2.3 1136 SHA256 fd5e01b4aa83d848a2e97832b0ff0610610b7857ec7f
 AUX auditd-init.d-1.7.17 1229 SHA256 1976ffb5182d54bb441ba7e6d1b0db263bc244a7f0b8ba6802dfe29be1984b56 SHA512 33e874541dbf2f6febde203420810c0b542ae1cb0b68eaf6c319f467186ccf1b57745c3df9629a99b59cc681747713f3202ecb7fad374ec7baaea566f1b67bb9 WHIRLPOOL bfcec7cb1ef31a8d766c3cccf88b6e702dde5db9a0ed1136d752ce2e02ed9439f01465509d1eec89ed4868d71d27af8d495c4e48a1b5ed08cdaa7f10c9657c8a
 AUX auditd-init.d-2.1.3 2341 SHA256 5a280585adb9b2d4fa2742b5e94c4eb1517fe4c5d8d79c7ec349fe11d19af6a5 SHA512 9d4c98a34ff2039b84e648ae7bb4811ee237a29b11f811fb81d4223fdf2e56041e713f2f05793b34503478d17f17fd4390515f26921e998db1033deddd8e35c1 WHIRLPOOL 928f543daf45631c8747d75593a4a2029dd59d634386406e16c9c989192f09c811119e4cfaa59c2d9e11cae21ee5cff50465146fe55db98b35a667d9e0e92c04
 DIST audit-1.7.17.tar.gz 1565919 SHA256 da0f2135ca6fe221adfd7a6e2372038a52e5ee1d001f8e2752d2cf016a9f24af SHA512 aabae92788d4386ebe8891b58d0d0a75768b1b8a4f2ca545b8f685ee4223a3c87e4e356b54eb98bd71318e985eabdb2c23de33695c34d20d4b2689afd29204de WHIRLPOOL be1451c417652061bd67539031ae42db82f08c30216347f748228b72b6b10c7afd9986c91f4f699c47cc22c0304079e85e15c174d0477ad46213d70f891bbdc2
+DIST audit-1.7.18.tar.gz 1566698 SHA256 c3e9e7df9e0776c3f90acfde7432ed362ff3ae5c40488391789bc8262f97f17c SHA512 15d27602dcb8d5a0dac2eb299a96d4d34b36fd303c90bd1cee6d6151bc1c6b83f09e7437029bee54f4435afd1386be0a1351bde1fb705ac24749b9e31c75919f WHIRLPOOL fc38a5668fdd72c11269000f384abb1d783bbec36c20df9bd266a4dfccd0363d9616bff46c708882c3b66520d141f298346add3637ae1a5db5e646a7bd1db539
 DIST audit-1.7.4.tar.gz 840298 SHA256 db5412852aa36ee25eb174e4f4a4676cc2d0b93cbe41a740eebf903b49b4d593 SHA512 89c99d0f9caebd3285535b3237e23499216a80e571175e16169ee0154e1581e885c1b3ee0c11a97b16db6569d6b91b05edfb3371f03b199ec52a510074834060 WHIRLPOOL 7ad1a63ce5b21a983bb6c36ab845d2cca22935d5b62343e00fb91c43d6e4c7eb18333bacdda0bacc32e0e340c8b70db39ff117edb686878bf82787723fc4c6cf
 DIST audit-2.0.5.tar.gz 810519 SHA256 1ef85e606a0fda21596577f5c205c0df7eb56d7cffbb84aeeeb72ce44e61a83b SHA512 5e5e7f6af79792aa4f8577b6a5975440167b19e35d555c7c60c51d0af20f6bfeafb78a89f8b546efe9b9c79296ee5872fa0056f34a61650c66f34ceedc8b15c4 WHIRLPOOL d5ec4d00555858f8d8e5d42400ce0775b9db1d7fc1efc995dbfb45fc59c34d2b0268879d2fd35b60af3b07498e166b2afc6dbbc23f5943a50e1da9898d7aeb4b
 DIST audit-2.1.3.tar.gz 833647 SHA256 1c61858d8ed299128aa6bd8e85bac758bfe33e61358d259e52acb7d961fee90e SHA512 0f5c02ee3eb35687e85cfea0cae2bc11c35d2de5c44347f8f3cde4d268aeef215547cfb4b577afffc737ce5944219f46b4594ac122479d8b2e185efe3cdb069b WHIRLPOOL c83ac2bf929f524c4bc34ffcd503db9687a2c8affe3b5bb0a908e40ba8e98beced6fee6f3212db7267cf11cef3dbd13915a1ee09334f2cf58a686a1acfff0946
-EBUILD audit-1.7.17.ebuild 3359 SHA256 5c0dad6885450ced7b795ee2f7d7ba20eb7c7401f32a5911a823ac8a7ca2eaa8 SHA512 4c9ee21ce1d5a3b5da86d9462a6fc17f1b3c4e823da3a5ff036807aba348529cd4f6addbb0c6121564f7a8050bfb270fedda026292611d5381997c9f3e7ff1c7 WHIRLPOOL 71c3111432bbbfe2c0a159c32b2bad1bfe4e91fe96f83ac68e06b3b1e4fb1fa5461d21d5cc486aef051646c3a966d6d785aefb45e1fdcd424103bc889d4b6f2f
+EBUILD audit-1.7.17.ebuild 3491 SHA256 68b02ea9e54e67b4f06e10341ba267df69efd50a777605095a5ffb534eaa160b SHA512 482bf8e98a602aea3b4a1681ecc99f113e93539fd7533ce8581fcc0d72322b97bd443b1ca22af022d42ded2f3cfb5f95c2e6b7a277d46104fb36bf79bf499fe1 WHIRLPOOL 34f3d8a2fbf6e82738cbc64c18d57d4b3a9a8f741a4aa6c58bb9da883cf2793ac0f80500ba9425f89bfee895f4d51580408570421c3e50339a0b0b110900aabc
+EBUILD audit-1.7.18.ebuild 3491 SHA256 ef678f9bb88c2f1dd949cdf3bd92207b4d0f5bd295fde08baf425e66d550c0e6 SHA512 7da7d063fd9802567f3758b887d40d8ece6343845cb48b02d01b2231cdafe1fc770b2d2b8a6404a5cfa17518af30531ccb18648b57f2d93e758b06402d2f1a56 WHIRLPOOL 21f393e0c8c1b48d80528275a2c0b36ed1b3da261eb7cea09ea1fb4d6d9dabf335a9584c811929360acba7c784a0d265246f0bb3075daf1efd41c54cdbc73dd3
 EBUILD audit-1.7.4.ebuild 3394 SHA256 0cdf6975cefd382655936486a8c4b1bf7805e28e3aa45c9264bc92304afbd685 SHA512 153b3479b228675a950564f7f38f734692a4611059ef11b2e0c7a8b1c55acfb8f06fe58ec0e3d36757c91e7e33586336cf1907348a29ce0ddd647b44f681cb3a WHIRLPOOL 37a274d499950c9381d3f5de90f35b84aa2143350898bd214630b58f5f41aff19f3b74f2e7be537f325c542d3f226e77fffa711bf8568c5d16f1d4218784781c
 EBUILD audit-2.0.5.ebuild 4468 SHA256 af5a547f8a131e00050baf000232da2d742029199356d76db195a68e850c1152 SHA512 99837c530ca5a5f35e241f4c3b70e4bfe45a74e91d2181356f417b3f0fc72a1fdf8172c7d52c5b7322a1d59cb351d6ce3d69e623778ca77005cd01e0c86cb7a4 WHIRLPOOL e9554be479f1b11c6d466a4c11b54aa6d39df4c6617934d70ffc410d6006b4b4a6ea980a316dde91cbdb4b91ebb1190c17825df14b04e104a583b57e0a3cc1d9
 EBUILD audit-2.1.3-r1.ebuild 4632 SHA256 a2773304a7839219ede49567531e083b52de3331d58ffd212925cdc82353b665 SHA512 328e7ef9d0cc6f3a322bc01c13695796953a6910eee2712e97ddd4ccd8bbb2746677d80822f8d74b12c277552dddba36b0e03f5edb9820f3adbb9e8e7ff8e973 WHIRLPOOL 6ed921334ba1c8b21ac82fc0134c91cb919ae41a3d6f70ac4f47fda01f9211651450578493b0dc76d5e22395f79a5a987599f0c9dffe83139f82bbb6be744da8
 EBUILD audit-2.1.3.ebuild 4503 SHA256 a921ad2e649cc25d513c3e1d66411751e15c544979ffc44c9ee589cd98bf7df1 SHA512 0e0c4a43220a8f898f7a590c0e9469839cf2f422da755678db24d39aa82247100973a80437a169af7f16f8af716e0a162c5e9346736e2bb2bacb1548b9ae7b3c WHIRLPOOL b400d245780b7b0f5a75b46fbc8c83949133f8cfe991058ff158072290618ef14bd495edb7f7e427ebbd1c63f8ed49c14150db56d87cb9b99f0a1a4adbeb0102
-MISC ChangeLog 12871 SHA256 bb011b70f44fd2f48d3ef82334a32a9af183baf1b06341bb1f174124a5f6295c SHA512 404bcaf49600754d4b7179d1b28d06af91010cec94d17ad1af62a0cff98cd7ca3a1cf6e889eb40f9a3981c9308ccf8a30090e392e95c5f5440d28f26961cae1e WHIRLPOOL 82b7156df5e9bc0f0140b348873567e3777b85b4ff2d902d7d11d574dbef771a9ddb74c462bbe497cf5072f1762dec6b504802a713be90af6d175c023614201a
+MISC ChangeLog 13155 SHA256 df6526d56af9245e8314778729830f206039d24c1dbdb4b66efa64aec11a37be SHA512 ebfe5787dd611fe15b3c594a210c3f00d8a803550f71cf391f402aeb8181b8d2cccc8972978a328bd8c2f3973d5630ec43c769fd784506fa0884f57bc675da88 WHIRLPOOL 8e3325efc68a5ca90b2b1fd6fb34ddf8e3a2eaacc8f10354a9bf8d632ce7549486a2ca6a401b76a40162e02bea9a0ce855fc824b5f31110685c30b0eccb001b9
 MISC metadata.xml 208 SHA256 474aad89b28273a47e9d612283399fab63cd9ada8b3c4fa65b16250128abf342 SHA512 761ae3cffc33d4832cd02525e53fa449295e779fac539a6c11d746001689e781939e059c8a444365b42b291e295d5d1620d67af401c2c80c568be8ef596d147d WHIRLPOOL 060c71b4ace40817c787afb38b4919804322e09983dba790fbdcf0c3021a7bfa94ed0f1f4fb5db8893d0c68aebdec378ed055f420501bd7df0f03eec50e220aa
diff --git a/sys-process/audit/audit-1.7.17.ebuild b/sys-process/audit/audit-1.7.17.ebuild
index 3a6d788f1205..b423dff51248 100644
--- a/sys-process/audit/audit-1.7.17.ebuild
+++ b/sys-process/audit/audit-1.7.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.7.17.ebuild,v 1.6 2012/05/21 23:23:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.7.17.ebuild,v 1.7 2012/12/18 21:57:17 robbat2 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -60,7 +60,10 @@ src_prepare() {
 	fi
 
 	# Don't build static version of Python module.
-	epatch "${FILESDIR}"/${P}-python.patch
+	epatch "${FILESDIR}"/${PN}-1.7.17-python.patch
+	# bug #405887
+	epatch "${FILESDIR}"/audit-1.7.18-as-needed.patch
+	epatch "${FILESDIR}"/audit-1.7.18-missing_headers.patch
 
 	# Regenerate autotooling
 	eautoreconf
diff --git a/sys-process/audit/audit-1.7.18.ebuild b/sys-process/audit/audit-1.7.18.ebuild
new file mode 100644
index 000000000000..35f7639e9b09
--- /dev/null
+++ b/sys-process/audit/audit-1.7.18.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.7.18.ebuild,v 1.1 2012/12/18 21:57:17 robbat2 Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit autotools eutils multilib toolchain-funcs python eutils
+
+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="~alpha ~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="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
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# 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
+
+	# Don't build static version of Python module.
+	epatch "${FILESDIR}"/${PN}-1.7.17-python.patch
+	# bug #405887
+	epatch "${FILESDIR}"/audit-1.7.18-as-needed.patch
+	epatch "${FILESDIR}"/audit-1.7.18-missing_headers.patch
+
+	# Regenerate autotooling
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo "#!/bin/sh" > py-compile
+
+	# Bug 352198: Avoid parallel build fail
+	cd "${S}"/src/mt
+	[[ ! -s private.h ]] && ln -s ../../lib/private.h .
+}
+
+src_configure() {
+	#append-flags -D'__attribute__(x)='
+	econf --sbindir=/sbin --without-prelude
+}
+
+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.7.17 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}"
+
+	# Don't install .la files in Python directories.
+	python_clean_installation_image
+}
+
+pkg_postinst() {
+	lockdown_perms "${ROOT}"
+	python_mod_optimize audit.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup audit.py
+}
+
+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/files/audit-1.7.18-as-needed.patch b/sys-process/audit/files/audit-1.7.18-as-needed.patch
new file mode 100644
index 000000000000..2e951d07bb72
--- /dev/null
+++ b/sys-process/audit/files/audit-1.7.18-as-needed.patch
@@ -0,0 +1,30 @@
+--- audit-1.7.13.orig/src/Makefile.in
++++ audit-1.7.13/src/Makefile.in
+@@ -273,10 +273,10 @@
+ AM_CFLAGS = -D_REENTRANT -D_GNU_SOURCE
+ noinst_HEADERS = auditd-config.h auditd-event.h auditd-listen.h ausearch-llist.h ausearch-options.h auditctl-llist.h aureport-options.h ausearch-parse.h aureport-scan.h ausearch-lookup.h ausearch-int.h auditd-dispatch.h ausearch-string.h ausearch-nvpair.h ausearch-common.h ausearch-avc.h ausearch-time.h ausearch-lol.h
+ auditd_SOURCES = auditd.c auditd-event.c auditd-config.c auditd-reconfig.c auditd-sendmail.c auditd-dispatch.c auditd-listen.c
+-auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing 
+-auditd_LDFLAGS = -pie -Wl,-z,relro
++auditd_CFLAGS = -pthread -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing 
++auditd_LDFLAGS = -pthread -pie -Wl,-z,relro
+ auditd_DEPENDENCIES = mt/libauditmt.a libev/libev.a
+ auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs)
+ auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c
+ auditctl_DEPENDENCIES = mt/libauditmt.a 
+ aureport_SOURCES = aureport.c auditd-config.c ausearch-llist.c aureport-options.c ausearch-string.c ausearch-parse.c aureport-scan.c aureport-output.c ausearch-lookup.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-avc.c ausearch-lol.c
+--- audit-1.7.13.orig/src/Makefile.am
++++ audit-1.7.13/src/Makefile.am
+@@ -31,10 +31,10 @@
+ noinst_HEADERS = auditd-config.h auditd-event.h auditd-listen.h ausearch-llist.h ausearch-options.h auditctl-llist.h aureport-options.h ausearch-parse.h aureport-scan.h ausearch-lookup.h ausearch-int.h auditd-dispatch.h ausearch-string.h ausearch-nvpair.h ausearch-common.h ausearch-avc.h ausearch-time.h ausearch-lol.h
+ 
+ auditd_SOURCES = auditd.c auditd-event.c auditd-config.c auditd-reconfig.c auditd-sendmail.c auditd-dispatch.c auditd-listen.c
+-auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing 
+-auditd_LDFLAGS = -pie -Wl,-z,relro
++auditd_CFLAGS = -pthread -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing 
++auditd_LDFLAGS = -pthread -pie -Wl,-z,relro
+ auditd_DEPENDENCIES = mt/libauditmt.a libev/libev.a
+ auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs)
+ 
+ auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c
+ auditctl_DEPENDENCIES = mt/libauditmt.a
diff --git a/sys-process/audit/files/audit-1.7.18-missing_headers.patch b/sys-process/audit/files/audit-1.7.18-missing_headers.patch
new file mode 100644
index 000000000000..120b173a0d71
--- /dev/null
+++ b/sys-process/audit/files/audit-1.7.18-missing_headers.patch
@@ -0,0 +1,13 @@
+Index: audit-1.7.13/lib/libaudit.c
+===========================================
+--- audit-1.7.13.orig/lib/libaudit.c
++++ audit-1.7.13/lib/libaudit.c
+@@ -36,6 +36,8 @@
+ #include <sys/utsname.h>
+ #include <fcntl.h>	/* O_NOFOLLOW needs gnu defined */
+ #include <limits.h>	/* for PATH_MAX */
++#include <sys/stat.h>
++#include <sys/types.h>
+ 
+ #include "libaudit.h"
+ #include "private.h"