Fix building with recent glibc wrt #334147 by William Keaney.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 24 insertions, 4 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index 7ddb18d6c138..b46d2ca93756 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.57 2010/05/29 17:40:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.58 2010/08/24 13:56:22 ssuominen Exp $
+
+  24 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> audit-1.7.4.ebuild,
+  +files/audit-1.7.4-glibc212.patch:
+  Fix building with recent glibc wrt #334147 by William Keaney.
 
   29 May 2010; Raúl Porcel <armin76@gentoo.org> audit-1.7.4.ebuild,
   audit-1.7.9.ebuild, audit-1.7.17.ebuild:
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 9bb91992ea80..df596b290b0a 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,6 +1,7 @@
 AUX audit-1.5.4-build.patch 292 RMD160 6f97369e4d1b27b293f5b875790dee502927f7e0 SHA1 964fc33bf0c668ebd9bf0cf439538fc5b5101a22 SHA256 ef286820b8d34efa8aa04a8cd0344a78eeb0fa50a6ad12f94427bd01dea53534
 AUX audit-1.5.4-swig-gcc-attribute.patch 434 RMD160 dc8c3d070a75f05883784dce72273551513e6fad SHA1 eb8774038fb07434030c9dad839e7d5dc5c9d027 SHA256 0da2225a8bd1f3f83a2e8c54d1c2fe97f9917be6b0a4ed116baa8f06f1800818
 AUX audit-1.6.8-subdirs-fix.patch 548 RMD160 e17fef17c9f5d19a19ec912e9e693080436af938 SHA1 efe094b98380a34d840910f8a0375c21c8fb052b SHA256 26b3ce2f56ce792924be534a43e4c455b9067898642419a1411c4048f1da6c47
+AUX audit-1.7.4-glibc212.patch 316 RMD160 55963c994f336a04b975b019573721d809ab52a4 SHA1 6fbcf866ae273e7f5542cd68ddfd389f68068837 SHA256 248eaa9e69ab50d766a05bf4ba26efbee84396fb34e321d562dc47a7a95f4e28
 AUX audit.rules 997 RMD160 bfa56758dd5f2caa8835f8d01a465124f4591c69 SHA1 f487461c83c6a732ebbe2c9811911550c92468ec SHA256 adc4779fd55919ca32b2de0d955779b7950a159c449a46ea7c0c6654a9049ee9
 AUX audit.rules.stop.post 573 RMD160 2e6503fc7ee07c4c1e58fb9ddf4b13eec6d95044 SHA1 4ef80c15f2792f17c1764eb2e21654ede46e482d SHA256 4c2e0be1a63b6800396e31153a899d4e3f2db1cee41b4dd271064dc97521edfe
 AUX audit.rules.stop.pre 500 RMD160 6b56a9522e140b48b7f7e67570596ba298a51dc7 SHA1 032921fc3ee730139b39f019b0268a2f1b1962ad SHA256 044cf06cea49f9d38ea114eb16b0a1428465fa2158aea713ef92e67e07e13c48
@@ -13,7 +14,7 @@ DIST audit-1.7.4.tar.gz 840298 RMD160 08d57fc039021f05763920603c435747fe51c954 S
 DIST audit-1.7.9.tar.gz 1245155 RMD160 248ca395c6d58dccf8437750e6cf5a7040a28c9f SHA1 aa7de4546f4774338946987fe1a8231222475e64 SHA256 95ce67d9aee4339a5aa11214f21dfa5f37c5820e2511c7bddf998d26b1aaefc9
 EBUILD audit-1.7.17.ebuild 2953 RMD160 74d90df064380845bc893d21987d04c0f09f00de SHA1 4ca93838a9ee9f37f0de19fa457378606fdc89ee SHA256 7a7267a1d85484e81c59aeca608213486f34974bc962dc5ec64b8014db42d878
 EBUILD audit-1.7.3.ebuild 2945 RMD160 93f31c4b97ac6ed43a567c09e548d7ab66cdd129 SHA1 5d04e27f2cecb061ab83cf5fb0911f2e4dce1dce SHA256 8b594c2114b6ff70076aadbe69f2b8e3bcc3f2b1065fac6722340e380057d70f
-EBUILD audit-1.7.4.ebuild 2950 RMD160 6f60b20a8092482265a28813c606575329671dfc SHA1 88eaf45a6ca6af0d536cbe6eba6da55e49029c27 SHA256 ace311aba97e0c910b6097e0842d9a94080488e787316cc5a307dec731a3f488
+EBUILD audit-1.7.4.ebuild 2995 RMD160 2e34ec331deeb2f33930fc37e2cf7f2b0b6a21fb SHA1 7f104625111399c419194c4b175a41fd265882e5 SHA256 b4e52f6c8efce9e405cad8d3e39a286700feb71c813280683ff9f9e958d77c91
 EBUILD audit-1.7.9.ebuild 2951 RMD160 b9cac5517023cb9c405ae7d8827619c125e5d218 SHA1 6c583644bc8bb7838047d38bd0fc6c5e72a61798 SHA256 e2cd0b05682ae8ed0eb3d5a202d96a43b6e4b4d5acbec2c982e2599ec3c47f29
-MISC ChangeLog 8808 RMD160 a20aa3398506f227af91a983305452ddce1e400c SHA1 12df3d61e067bdf2d82597a79338465b4507ca7a SHA256 ead514b1b35b3633049dc48d839a167bfa2dec8ebd6b5d654881298440e14b98
+MISC ChangeLog 8986 RMD160 6f05c3701abda058194df9482bdc89560c6eab8f SHA1 93e2c4a8728304b1cb2448cdcf82eadf5a20f6b7 SHA256 2d67c52692c9f115ae9bbd7ba23be97397e705aba3b34a643d80b38d3ae4504b
 MISC metadata.xml 231 RMD160 e78f0580e975fa82702433055e1498b0d9228104 SHA1 de14a9907da991c933aed57aeba714d7b7ce28c6 SHA256 f62f6487425736b6d2f27bb84ee09ccee245c1abf74462b6fbcb90f2c368ad2e
diff --git a/sys-process/audit/audit-1.7.4.ebuild b/sys-process/audit/audit-1.7.4.ebuild
index 35f5f247142e..60133cc0a4ef 100644
--- a/sys-process/audit/audit-1.7.4.ebuild
+++ b/sys-process/audit/audit-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.7.4.ebuild,v 1.2 2010/05/29 17:40:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.7.4.ebuild,v 1.3 2010/08/24 13:56:22 ssuominen Exp $
 
 inherit autotools multilib toolchain-funcs python
 
@@ -55,6 +55,8 @@ src_unpack() {
 			"${S}"/audisp/plugins/Makefile.am
 	fi
 
+	epatch "${FILESDIR}"/${P}-glibc212.patch
+
 	# Regenerate autotooling
 	eautoreconf
 }
diff --git a/sys-process/audit/files/audit-1.7.4-glibc212.patch b/sys-process/audit/files/audit-1.7.4-glibc212.patch
new file mode 100644
index 000000000000..e167849e9e33
--- /dev/null
+++ b/sys-process/audit/files/audit-1.7.4-glibc212.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/334147
+
+--- lib/libaudit.c
++++ 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/types.h>
++#include <sys/stat.h>	/* S_ISREG */
+ 
+ #include "libaudit.h"
+ #include "private.h"