Bug #142460, combined with version bumping. Audit finally builds again against headers and kernels found in the tree!.

Package-Manager: portage-2.1.2_rc1-r6

13 files changed, 978 insertions, 28 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index 74f354d21215..9be38c17e1fa 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,16 @@
 # 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.12 2006/06/22 07:41:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.13 2006/11/13 11:41:07 robbat2 Exp $
+
+*audit-1.2.9 (13 Nov 2006)
+*audit-1.2.5 (13 Nov 2006)
+
+  13 Nov 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/audit-0.9.14-header.patch, +files/audit.h-2.6.18-rc4,
+  +files/elf-em.h-2.6.18-rc4, audit-1.1.6.ebuild, audit-1.2.3.ebuild,
+  +audit-1.2.5.ebuild, +audit-1.2.9.ebuild:
+  Bug #142460, combined with version bumping. Audit finally builds again
+  against headers and kernels found in the tree!.
 
 *audit-1.2.3 (22 Jun 2006)
 
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 0f488bf0246c..6c740522f752 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,3 +1,7 @@
+AUX audit-0.9.14-header.patch 8276 RMD160 c5d0b446003cc828255a85ffad5b99bb0d57a884 SHA1 7b67435b4044649784c8cd5c16edb751f1595a89 SHA256 2bcb6fa6d7f65fac77d169859da4ad7cfbb8a69be8347ec40e606931c868f6a2
+MD5 3060e7e99fc090bc2cc13597db2a8d29 files/audit-0.9.14-header.patch 8276
+RMD160 c5d0b446003cc828255a85ffad5b99bb0d57a884 files/audit-0.9.14-header.patch 8276
+SHA256 2bcb6fa6d7f65fac77d169859da4ad7cfbb8a69be8347ec40e606931c868f6a2 files/audit-0.9.14-header.patch 8276
 AUX audit-1.1.3-compilefix.patch 3742 RMD160 dd0a5338aaac12850e771d6baa9d0bfb5d3a4925 SHA1 ae6175e2ea2d2f1bbffdb6a9a7a2f332511d4b3d SHA256 8ffe02eb9ee988996c9cb4ccdcc3ee39903131173260b13b72b94298fb3afff4
 MD5 fe4a6c96f2df7f9126c1f043610399f2 files/audit-1.1.3-compilefix.patch 3742
 RMD160 dd0a5338aaac12850e771d6baa9d0bfb5d3a4925 files/audit-1.1.3-compilefix.patch 3742
@@ -6,6 +10,10 @@ AUX audit-1.2.3-syscall-partial.patch 401 RMD160 470099c106338cfbfc1555bfd98e0b2
 MD5 18673b7580bce6ca3409f8debdb8e999 files/audit-1.2.3-syscall-partial.patch 401
 RMD160 470099c106338cfbfc1555bfd98e0b222424fbc4 files/audit-1.2.3-syscall-partial.patch 401
 SHA256 b1aa50a65dd94c34c4c77484571a8878d94c555d8d1714339b20a2c5b101e4ad files/audit-1.2.3-syscall-partial.patch 401
+AUX audit.h-2.6.18-rc4 19390 RMD160 3f7bc0e9b1f393d5f286e24f5253e5bcc1123137 SHA1 14f86c26b41262f2f551b0c2c76b1085211903e0 SHA256 21ce510f2245af00aa251946fd2109738009d0a072c7c7fcc8f6fd45c5b326e7
+MD5 ea765c5ab187d21da7d54a66598b6b93 files/audit.h-2.6.18-rc4 19390
+RMD160 3f7bc0e9b1f393d5f286e24f5253e5bcc1123137 files/audit.h-2.6.18-rc4 19390
+SHA256 21ce510f2245af00aa251946fd2109738009d0a072c7c7fcc8f6fd45c5b326e7 files/audit.h-2.6.18-rc4 19390
 AUX audit.rules 997 RMD160 bfa56758dd5f2caa8835f8d01a465124f4591c69 SHA1 f487461c83c6a732ebbe2c9811911550c92468ec SHA256 adc4779fd55919ca32b2de0d955779b7950a159c449a46ea7c0c6654a9049ee9
 MD5 12797f12e8515c367eb8805a001d07ea files/audit.rules 997
 RMD160 bfa56758dd5f2caa8835f8d01a465124f4591c69 files/audit.rules 997
@@ -42,15 +50,21 @@ AUX auditd.initd-0.7.2-r1 709 RMD160 b13f83a40faa483b060e9f888a81138c573618e2 SH
 MD5 d50e111e375e27af12b1c200175cd7b6 files/auditd.initd-0.7.2-r1 709
 RMD160 b13f83a40faa483b060e9f888a81138c573618e2 files/auditd.initd-0.7.2-r1 709
 SHA256 4c00b21e22add54e3c5f9a3b95fda9f5c2f03e51b0e6555cb941a8a4d76d6f8e files/auditd.initd-0.7.2-r1 709
+AUX elf-em.h-2.6.18-rc4 1571 RMD160 9c397b86fb3c604b42e704fcb7d335e2b504325d SHA1 e2162ff6012b74168570be5d8e74df9484e63c28 SHA256 039326066a1e0a6ecbfd0a9023a140a3041c138efcf165aac0dded5444beb31c
+MD5 ba15d4db52d12f7214ae4a35e3320790 files/elf-em.h-2.6.18-rc4 1571
+RMD160 9c397b86fb3c604b42e704fcb7d335e2b504325d files/elf-em.h-2.6.18-rc4 1571
+SHA256 039326066a1e0a6ecbfd0a9023a140a3041c138efcf165aac0dded5444beb31c files/elf-em.h-2.6.18-rc4 1571
 DIST audit-0.7.2.tar.gz 70184
 DIST audit-0.7.3.tar.gz 72496
 DIST audit-0.7.4.tar.gz 72751
-DIST audit-0.8.1.tar.gz 75487
+DIST audit-0.8.1.tar.gz 75487 RMD160 e5b9ed8cca8d4d3c4b379144633f9cba70fefd76 SHA1 aeade27682cbc7d6fb9ad17dd6f1ed3e5cc5f055 SHA256 bf33acf43bc8ce64a25d5b624814a84022df131f2062327cdc311788aadc51dc
 DIST audit-0.8.tar.gz 74782
-DIST audit-0.9.1.tar.gz 82578
-DIST audit-1.1.6.tar.gz 274815 RMD160 8f420b47347d1c00b4b4c114dc4f913704a9205e SHA256 44c152fc652567c64c5937335122b37250694152bd47d44628b11f1f65c16e04
-DIST audit-1.2.1.tar.gz 274432 RMD160 14f70c58239f6ed2eba3d902630f4bd4112c4fba SHA256 bba5d255d81ca36245464b83e977ba6bd05b1528cad07559fcc0367d39b2d26f
+DIST audit-0.9.1.tar.gz 82578 RMD160 beab2380723213bba3ad8dca21ebee1155a49900 SHA1 d23d3593b55ddd9689250d1e34dfc441805a8377 SHA256 88fdb0883f552dccb968bb953f6467f14bddb33cba22bad807649e4c039f1fab
+DIST audit-1.1.6.tar.gz 274815 RMD160 8f420b47347d1c00b4b4c114dc4f913704a9205e SHA1 f8cc0340cfe570d96d4de973a1927e4aaff567f3 SHA256 44c152fc652567c64c5937335122b37250694152bd47d44628b11f1f65c16e04
+DIST audit-1.2.1.tar.gz 274432 RMD160 14f70c58239f6ed2eba3d902630f4bd4112c4fba SHA1 22c3b6a5c4e237cb91381abeb5e3074aae9cdbf9 SHA256 bba5d255d81ca36245464b83e977ba6bd05b1528cad07559fcc0367d39b2d26f
 DIST audit-1.2.3.tar.gz 276977 RMD160 2fbc483dbff0ad5cd4022b4ccb5d3c082cccc0ef SHA1 9f40b82744915ab3df4255de7de69500e924fe18 SHA256 3bb70258c9e5ae2a0ebc43dc96542cd5494e169dc0d03d91bd9a7cd2a9f37b25
+DIST audit-1.2.5.tar.gz 232383 RMD160 8dd8bca46c918f0805756dfdfd898eb19b09f7e9 SHA1 9e34202e4304ac03e574af6b90b437fcaf2c7462 SHA256 6b9fd472ca97c07e319338a73b3f0adbe5f53506a15adba2ac2ad3c7db7b0eef
+DIST audit-1.2.9.tar.gz 240266 RMD160 329692787d24469b86107377e0004bfae380e0ea SHA1 a654638c49effc2514bc4b4c711fedf3af82a352 SHA256 3660d1220246e81df1e140867acefc82a61418009c740d92e56af2ae0baa4aff
 EBUILD audit-0.7.2-r1.ebuild 1571 RMD160 f6fa25c23fbd547be702bd294d49fb2463840422 SHA1 f3ab3fe38d34872b26653709bf249c289331a9dc SHA256 487c009299e82b28b743e2d1892b76051d13a5159d3b9fd4525af0a4c7e5f0c2
 MD5 b7ae6b273342ab1c9a026a88c13cafa1 audit-0.7.2-r1.ebuild 1571
 RMD160 f6fa25c23fbd547be702bd294d49fb2463840422 audit-0.7.2-r1.ebuild 1571
@@ -75,22 +89,30 @@ EBUILD audit-0.9.1.ebuild 1564 RMD160 02e47ad08ae4f58d9f82b2773cf854d9a3aced53 S
 MD5 ccaf6e8614e3b817335570e1085e2a9a audit-0.9.1.ebuild 1564
 RMD160 02e47ad08ae4f58d9f82b2773cf854d9a3aced53 audit-0.9.1.ebuild 1564
 SHA256 a01bf8e0f27c70b7d40183f587bf59c1734ea60bb11733353900632fe9131389 audit-0.9.1.ebuild 1564
-EBUILD audit-1.1.6.ebuild 1668 RMD160 f07250a5c723ae912ec0f01aed6af6becc4f7db7 SHA1 ff32124a6d428bbb42f13495a9733a1bd51a2e11 SHA256 7acd5084d2e339a1c4f66ca67c65e65fcab0eae0c34bd119a36e1b31b22c8886
-MD5 f97e86edbeea2d25ea84a5d4a364aca5 audit-1.1.6.ebuild 1668
-RMD160 f07250a5c723ae912ec0f01aed6af6becc4f7db7 audit-1.1.6.ebuild 1668
-SHA256 7acd5084d2e339a1c4f66ca67c65e65fcab0eae0c34bd119a36e1b31b22c8886 audit-1.1.6.ebuild 1668
+EBUILD audit-1.1.6.ebuild 1912 RMD160 e5d15902c85f22103f500ae69e0a4cfdece7f26c SHA1 508e26c518ff7cb71347880a2398b8620cfe9b18 SHA256 29f53cbef435af1596618803bd6d4519d53edf691bef483320d7db7ca6815f1c
+MD5 3a1f2c34a499b8a9dd5e43928f3eef9d audit-1.1.6.ebuild 1912
+RMD160 e5d15902c85f22103f500ae69e0a4cfdece7f26c audit-1.1.6.ebuild 1912
+SHA256 29f53cbef435af1596618803bd6d4519d53edf691bef483320d7db7ca6815f1c audit-1.1.6.ebuild 1912
 EBUILD audit-1.2.1.ebuild 1668 RMD160 b5516041db7911acc6847b86735bb76d15194f6b SHA1 b6fd2609ef2868a8c15688a3cc035e21c0756cb4 SHA256 331bd0e375083d2af0a70ee4fb628ddf247a9d3e5f708d874812a0f6dc6561f2
 MD5 5cac2cd08a185d624afc17083adea76e audit-1.2.1.ebuild 1668
 RMD160 b5516041db7911acc6847b86735bb76d15194f6b audit-1.2.1.ebuild 1668
 SHA256 331bd0e375083d2af0a70ee4fb628ddf247a9d3e5f708d874812a0f6dc6561f2 audit-1.2.1.ebuild 1668
-EBUILD audit-1.2.3.ebuild 1972 RMD160 7c554ef71b955eae88c8b7d1cb118915240edefa SHA1 37042969e0ae001865e8dbf56cc96d9d887c093f SHA256 d1b535de38517bd912486e4e0ed46756e1dec970c7efc9c2ff93cc4ad4aa6653
-MD5 8127a0b4617bd215b86aa4e17aaf6035 audit-1.2.3.ebuild 1972
-RMD160 7c554ef71b955eae88c8b7d1cb118915240edefa audit-1.2.3.ebuild 1972
-SHA256 d1b535de38517bd912486e4e0ed46756e1dec970c7efc9c2ff93cc4ad4aa6653 audit-1.2.3.ebuild 1972
-MISC ChangeLog 2476 RMD160 0fa6047d8fe955aa53af15e0ec8e78f6c07d7717 SHA1 77cccd80a16ffc72432f0f67cbe735f96d38be87 SHA256 fa2d28ff8848032445ef3eae626c30a2ff2f77f6868cf039cbf926835a7e201e
-MD5 acc209ddd8db3b083cdefde80338916a ChangeLog 2476
-RMD160 0fa6047d8fe955aa53af15e0ec8e78f6c07d7717 ChangeLog 2476
-SHA256 fa2d28ff8848032445ef3eae626c30a2ff2f77f6868cf039cbf926835a7e201e ChangeLog 2476
+EBUILD audit-1.2.3.ebuild 1988 RMD160 5c1510293de62d2c70aa4021790af21cb476172f SHA1 2f5941b14a0ac253568556fefc481b72549a073b SHA256 690349c3f66045833e72e4a5b09143a60a451ea698df8c8bd2844a4e006d4a4a
+MD5 1a1cec11bb2e687d498dbccb4f91367a audit-1.2.3.ebuild 1988
+RMD160 5c1510293de62d2c70aa4021790af21cb476172f audit-1.2.3.ebuild 1988
+SHA256 690349c3f66045833e72e4a5b09143a60a451ea698df8c8bd2844a4e006d4a4a audit-1.2.3.ebuild 1988
+EBUILD audit-1.2.5.ebuild 2186 RMD160 8f0393ca14113c5462dc618487fdcc5cec8e8736 SHA1 3810d4b933a6a828276940985bb2965de01c2aa6 SHA256 6a2a2cffa597104bbaf6c293c968d65958dac0ed9ca3f535ff8063b898d7af4a
+MD5 527821e5b7740443b0386d62f4849e4e audit-1.2.5.ebuild 2186
+RMD160 8f0393ca14113c5462dc618487fdcc5cec8e8736 audit-1.2.5.ebuild 2186
+SHA256 6a2a2cffa597104bbaf6c293c968d65958dac0ed9ca3f535ff8063b898d7af4a audit-1.2.5.ebuild 2186
+EBUILD audit-1.2.9.ebuild 2105 RMD160 97de566a99d9b20dc82af1205457e02a9943780c SHA1 8b57e8cb76a06142cfc4083365a4c876b22f700f SHA256 b1831bd74bcf219f062b7a572b7e21c6a3383c44b360650803d764f8ccb92fe1
+MD5 855d7b9a8025d3a984a8c8fd4275ad1b audit-1.2.9.ebuild 2105
+RMD160 97de566a99d9b20dc82af1205457e02a9943780c audit-1.2.9.ebuild 2105
+SHA256 b1831bd74bcf219f062b7a572b7e21c6a3383c44b360650803d764f8ccb92fe1 audit-1.2.9.ebuild 2105
+MISC ChangeLog 2885 RMD160 555dd45228fa79905e6f851085d0436e5c065735 SHA1 b1363dee83d4a2266937f011bf7b85873f6da274 SHA256 6ced46de9890a3333be59382b50422852fb5a6b39ffd435a209e012854c4bd5f
+MD5 71f61fe3f46e6dc56bc99d1594d16cbf ChangeLog 2885
+RMD160 555dd45228fa79905e6f851085d0436e5c065735 ChangeLog 2885
+SHA256 6ced46de9890a3333be59382b50422852fb5a6b39ffd435a209e012854c4bd5f ChangeLog 2885
 MISC metadata.xml 231 RMD160 e78f0580e975fa82702433055e1498b0d9228104 SHA1 de14a9907da991c933aed57aeba714d7b7ce28c6 SHA256 f62f6487425736b6d2f27bb84ee09ccee245c1abf74462b6fbcb90f2c368ad2e
 MD5 426b16b0f03a2c3b0fa6864a71876999 metadata.xml 231
 RMD160 e78f0580e975fa82702433055e1498b0d9228104 metadata.xml 231
@@ -107,12 +129,12 @@ SHA256 400112be75f1a578ce0b6074a3081d67a1549127e19ac6708b3627557242e235 files/di
 MD5 b6cd1cd6edc78bf88c12015eae5fda21 files/digest-audit-0.8 60
 RMD160 854ba2397c68b56e5a7f0a9b50d6947433e9a7ab files/digest-audit-0.8 60
 SHA256 2888d50e7100daa1b6ddf5b6f2bf8d15d2030615b84f239b6cea6d4443e62d81 files/digest-audit-0.8 60
-MD5 4d90073ff2ad766b0878e6b160e318bd files/digest-audit-0.8.1 62
-RMD160 21eab176797ea2a064d28c7f44052dfd576d8705 files/digest-audit-0.8.1 62
-SHA256 b067bb153d2a93e2b31817bc7d6f749e6a6aa73e5aec66281c995b5fa8d48943 files/digest-audit-0.8.1 62
-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 0ba4cccaba7e5a512d8e805ccf385c31 files/digest-audit-0.8.1 232
+RMD160 515e22e7d2acb9e2634cd69b9ef0c037c31554ae files/digest-audit-0.8.1 232
+SHA256 9fe5f5e69f07a596b5be612a0351d889421681a102f324dc01381845dbbdf027 files/digest-audit-0.8.1 232
+MD5 34abf88bb06b37ecb3afd5cdeadfc23f files/digest-audit-0.9.1 232
+RMD160 bf925294f921d82a35e61d7fd3e50535a3f847be files/digest-audit-0.9.1 232
+SHA256 1b1be2379dcb585eb3708ee7010530af15aef1602ea060457907a0cc4f5b3b00 files/digest-audit-0.9.1 232
 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
@@ -122,3 +144,9 @@ SHA256 76c086afac2d22489c3f0e77d4b499adeb0e8e388dabd59d4bc45d050e05bf20 files/di
 MD5 2422b3460ec6face2b31b0469617075e files/digest-audit-1.2.3 235
 RMD160 fa6eadcc99cfc0497998a595515f2f804edbd207 files/digest-audit-1.2.3 235
 SHA256 d26e65bffa752bc78c9352d26e41fe0a25d201b6c4d135dc86c4c3d0de917956 files/digest-audit-1.2.3 235
+MD5 d851cba34d82b43ae3090ac44d0e302f files/digest-audit-1.2.5 235
+RMD160 e2c725a5626023f210634d16a3334f615ccd7100 files/digest-audit-1.2.5 235
+SHA256 9e98699429a16d24851405209afdb55f9e91e99cdf29486adf5b864b2ce0f289 files/digest-audit-1.2.5 235
+MD5 6680465051b7c6f77446364536f6d36f files/digest-audit-1.2.9 235
+RMD160 6151f479783510a59a0974d3133d50a648cfd363 files/digest-audit-1.2.9 235
+SHA256 45a8955de9c405232ff0c416b2bbe7025b986788532130d1a4c35a91402c3f24 files/digest-audit-1.2.9 235
diff --git a/sys-process/audit/audit-1.1.6.ebuild b/sys-process/audit/audit-1.1.6.ebuild
index 213f421c567d..43dcb9e163d4 100644
--- a/sys-process/audit/audit-1.1.6.ebuild
+++ b/sys-process/audit/audit-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2006/04/19 23:17:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.1.6.ebuild,v 1.2 2006/11/13 11:41:07 robbat2 Exp $
 
 inherit eutils autotools
 
@@ -8,6 +8,8 @@ DESCRIPTION="Userspace utilities for storing and processing auditing records."
 HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
 SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
+HEADER_KV="2.6.18-rc4"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-*"
@@ -15,14 +17,19 @@ IUSE=""
 
 RDEPEND=">=dev-lang/python-2.4"
 DEPEND="${RDEPEND}
-		dev-lang/swig
-		>=sys-kernel/linux-headers-2.6.17_rc1"
+		dev-lang/swig"
 # 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"
+	for i in audit.h elf-em.h; do
+		cp -f ${FILESDIR}/${i}-${HEADER_KV} ${S}/lib/${i}
+	done
+	sed -i -e 's,<linux/elf-em.h>,"elf-em.h",g' ${S}/lib/audit.h
+	sed -i -e 's,<linux/audit.h>,"audit.h",g' ${S}/lib/libaudit.h
+	cp -f ${S}/lib/{audit,elf-em}.h ${S}/src/mt/
 	eautoreconf || die "eautoreconf failed"
 }
 
diff --git a/sys-process/audit/audit-1.2.3.ebuild b/sys-process/audit/audit-1.2.3.ebuild
index 7c8099708a4c..79451df045cd 100644
--- a/sys-process/audit/audit-1.2.3.ebuild
+++ b/sys-process/audit/audit-1.2.3.ebuild
@@ -1,8 +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.2.3.ebuild,v 1.1 2006/06/22 07:41:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-1.2.3.ebuild,v 1.2 2006/11/13 11:41:07 robbat2 Exp $
 
-inherit eutils autotools
+inherit eutils autotools toolchain-funcs
 
 DESCRIPTION="Userspace utilities for storing and processing auditing records."
 HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
diff --git a/sys-process/audit/audit-1.2.5.ebuild b/sys-process/audit/audit-1.2.5.ebuild
new file mode 100644
index 000000000000..bb8355368769
--- /dev/null
+++ b/sys-process/audit/audit-1.2.5.ebuild
@@ -0,0 +1,74 @@
+# 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.5.ebuild,v 1.1 2006/11/13 11:41:07 robbat2 Exp $
+
+inherit eutils autotools toolchain-funcs
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records."
+HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+HEADER_KV="2.6.18-rc4"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-*"
+IUSE=""
+
+RDEPEND=">=dev-lang/python-2.4"
+DEPEND="${RDEPEND}
+		dev-lang/swig"
+# Do not use os-headers as this is linux specific
+# linux-headers 2.6.17_p3 is NOT in the tree yet.
+# It is basically linux-headers-2.6.17 + patch-2.6.17-git3 - 2.6.16-appCompat.patch
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd '${S}' failed"
+	for i in audit.h elf-em.h; do
+		cp -f ${FILESDIR}/${i}-${HEADER_KV} ${S}/lib/${i}
+	done
+	sed -i -e 's,<linux/elf-em.h>,"elf-em.h",g' ${S}/lib/audit.h
+	sed -i -e 's,<linux/audit.h>,"audit.h",g' ${S}/lib/libaudit.h
+	cp -f ${S}/lib/{audit,elf-em}.h ${S}/src/mt/
+	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
+	gen_usr_ldscript libaudit.so libauparse.so
+	# 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-init.d-1.2.3 auditd
+	newconfd ${FILESDIR}/auditd-conf.d-1.2.3 auditd
+	# 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 /
+}
+
+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.2.9.ebuild b/sys-process/audit/audit-1.2.9.ebuild
new file mode 100644
index 000000000000..c3e1e6949341
--- /dev/null
+++ b/sys-process/audit/audit-1.2.9.ebuild
@@ -0,0 +1,73 @@
+# 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.9.ebuild,v 1.1 2006/11/13 11:41:07 robbat2 Exp $
+
+inherit eutils autotools toolchain-funcs
+
+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="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/python-2.4"
+DEPEND="${RDEPEND}
+		dev-lang/swig
+		>=sys-kernel/linux-headers-2.6.17-r1"
+# Do not use os-headers as this is linux specific
+
+HEADER_KV="2.6.18-rc4"
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd '${S}' failed"
+	for i in audit.h elf-em.h; do
+		cp -f ${FILESDIR}/${i}-${HEADER_KV} ${S}/lib/${i}
+	done
+	sed -i -e 's,<linux/elf-em.h>,"elf-em.h",g' ${S}/lib/audit.h
+	sed -i -e 's,<linux/audit.h>,"audit.h",g' ${S}/lib/libaudit.h
+	cp -f ${S}/lib/{audit,elf-em}.h ${S}/src/mt/
+	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
+	gen_usr_ldscript libaudit.so libauparse.so
+	# 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-init.d-1.2.3 auditd
+	newconfd ${FILESDIR}/auditd-conf.d-1.2.3 auditd
+	# 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 /
+}
+
+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-0.9.14-header.patch b/sys-process/audit/files/audit-0.9.14-header.patch
new file mode 100644
index 000000000000..1668d9ff5b9e
--- /dev/null
+++ b/sys-process/audit/files/audit-0.9.14-header.patch
@@ -0,0 +1,208 @@
+diff -ur audit-0.9.14/lib/libaudit.h /opt/audit-0.9.14/lib/libaudit.h
+--- audit-0.9.14/lib/libaudit.h	2005-06-21 17:50:54.000000000 -0400
++++ /opt/audit-0.9.14/lib/libaudit.h	2005-06-28 14:26:57.000000000 -0400
+@@ -1,3 +1,196 @@
++/* NOTE: This file is really 2 that are combined temporarily. */
++
++/* audit.h -- Auditing support
++ *
++ * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
++ * All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * Written by Rickard E. (Rik) Faith <faith@redhat.com>
++ *
++ */
++
++#ifndef _LINUX_AUDIT_H_
++#define _LINUX_AUDIT_H_
++
++#include <elf.h>
++
++/* The netlink messages for the audit system is divided into blocks:
++ * 1000 - 1099 are for commanding the audit system
++ * 1100 - 1199 user space trusted application messages
++ * 1200 - 1299 messages internal to the audit daemon
++ * 1300 - 1399 audit event messages
++ * 1400 - 1499 SE Linux use
++ * 1500 - 1999 future use
++ * 2000 is for otherwise unclassified kernel audit messages
++ *
++ * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user
++ * space. Anything over that is kernel --> user space communication.
++ */
++#define AUDIT_GET		1000	/* Get status */
++#define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
++#define AUDIT_LIST		1002	/* List syscall filtering rules */
++#define AUDIT_ADD		1003	/* Add syscall filtering rule */
++#define AUDIT_DEL		1004	/* Delete syscall filtering rule */
++#define AUDIT_USER		1005	/* Message from userspace -- deprecated */
++#define AUDIT_LOGIN		1006	/* Define the login id and information */
++#define AUDIT_WATCH_INS		1007	/* Insert file/dir watch entry */
++#define AUDIT_WATCH_REM		1008	/* Remove file/dir watch entry */
++#define AUDIT_WATCH_LIST	1009	/* List all file/dir watches */
++#define AUDIT_SIGNAL_INFO	1010	/* Get info about sender of signal to auditd */
++
++#define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages uninteresting to kernel */
++#define AUDIT_LAST_USER_MSG	1199
++ 
++#define AUDIT_DAEMON_START      1200    /* Daemon startup record */
++#define AUDIT_DAEMON_END        1201    /* Daemon normal stop record */
++#define AUDIT_DAEMON_ABORT      1202    /* Daemon error stop record */
++#define AUDIT_DAEMON_CONFIG     1203    /* Daemon config change */
++
++#define AUDIT_SYSCALL		1300	/* Syscall event */
++#define AUDIT_FS_WATCH		1301	/* Filesystem watch event */
++#define AUDIT_PATH		1302	/* Filname path information */
++#define AUDIT_IPC		1303	/* IPC record */
++#define AUDIT_SOCKETCALL	1304	/* sys_socketcall arguments */
++#define AUDIT_CONFIG_CHANGE	1305	/* Audit system configuration change */
++#define AUDIT_SOCKADDR		1306	/* sockaddr copied as syscall arg */
++
++#define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
++#define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */
++#define AUDIT_AVC_PATH		1402	/* dentry, vfsmount pair from avc */
++
++#define AUDIT_KERNEL		2000	/* Asynchronous audit record. NOT A REQUEST. */
++
++/* Rule flags */
++#define AUDIT_PER_TASK 0x01	/* Apply rule at task creation (not syscall) */
++#define AUDIT_AT_ENTRY 0x02	/* Apply rule at syscall entry */
++#define AUDIT_AT_EXIT  0x04	/* Apply rule at syscall exit */
++#define AUDIT_PREPEND  0x10	/* Prepend to front of list */
++
++/* Rule actions */
++#define AUDIT_NEVER    0	/* Do not build context if rule matches */
++#define AUDIT_POSSIBLE 1	/* Build context if rule matches  */
++#define AUDIT_ALWAYS   2	/* Generate audit record if rule matches */
++
++/* Rule structure sizes -- if these change, different AUDIT_ADD and
++ * AUDIT_LIST commands must be implemented. */
++#define AUDIT_MAX_FIELDS   64
++#define AUDIT_BITMASK_SIZE 64
++#define AUDIT_WORD(nr) ((uint32_t)((nr)/32))
++#define AUDIT_BIT(nr)  (1 << ((nr) - AUDIT_WORD(nr)*32))
++
++/* Rule fields */
++				/* These are useful when checking the
++				 * task structure at task creation time
++				 * (AUDIT_PER_TASK).  */
++#define AUDIT_PID	0
++#define AUDIT_UID	1
++#define AUDIT_EUID	2
++#define AUDIT_SUID	3
++#define AUDIT_FSUID	4
++#define AUDIT_GID	5
++#define AUDIT_EGID	6
++#define AUDIT_SGID	7
++#define AUDIT_FSGID	8
++#define AUDIT_LOGINUID	9
++#define AUDIT_PERS	10
++#define AUDIT_ARCH	11
++
++				/* These are ONLY useful when checking
++				 * at syscall exit time (AUDIT_AT_EXIT). */
++#define AUDIT_DEVMAJOR	100
++#define AUDIT_DEVMINOR	101
++#define AUDIT_INODE	102
++#define AUDIT_EXIT	103
++#define AUDIT_SUCCESS   104	/* exit >= 0; value ignored */
++
++#define AUDIT_ARG0      200
++#define AUDIT_ARG1      (AUDIT_ARG0+1)
++#define AUDIT_ARG2      (AUDIT_ARG0+2)
++#define AUDIT_ARG3      (AUDIT_ARG0+3)
++
++#define AUDIT_NEGATE    0x80000000
++
++
++/* Status symbols */
++				/* Mask values */
++#define AUDIT_STATUS_ENABLED		0x0001
++#define AUDIT_STATUS_FAILURE		0x0002
++#define AUDIT_STATUS_PID		0x0004
++#define AUDIT_STATUS_RATE_LIMIT		0x0008
++#define AUDIT_STATUS_BACKLOG_LIMIT	0x0010
++				/* Failure-to-log actions */
++#define AUDIT_FAIL_SILENT	0
++#define AUDIT_FAIL_PRINTK	1
++#define AUDIT_FAIL_PANIC	2
++
++/* distinguish syscall tables */
++#define __AUDIT_ARCH_64BIT 0x80000000
++#define __AUDIT_ARCH_LE	   0x40000000
++#define AUDIT_ARCH_ALPHA	(EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_ARM		(EM_ARM|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_ARMEB	(EM_ARM)
++#define AUDIT_ARCH_CRIS		(EM_CRIS|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_FRV		(EM_FRV)
++#define AUDIT_ARCH_H8300	(EM_H8_300)
++#define AUDIT_ARCH_I386		(EM_386|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_IA64		(EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_M32R		(EM_M32R)
++#define AUDIT_ARCH_M68K		(EM_68K)
++#define AUDIT_ARCH_MIPS		(EM_MIPS)
++#define AUDIT_ARCH_MIPSEL	(EM_MIPS|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_MIPS64	(EM_MIPS|__AUDIT_ARCH_64BIT)
++#define AUDIT_ARCH_MIPSEL64	(EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_PARISC	(EM_PARISC)
++#define AUDIT_ARCH_PARISC64	(EM_PARISC|__AUDIT_ARCH_64BIT)
++#define AUDIT_ARCH_PPC		(EM_PPC)
++#define AUDIT_ARCH_PPC64	(EM_PPC64|__AUDIT_ARCH_64BIT)
++#define AUDIT_ARCH_S390		(EM_S390)
++#define AUDIT_ARCH_S390X	(EM_S390|__AUDIT_ARCH_64BIT)
++#define AUDIT_ARCH_SH		(EM_SH)
++#define AUDIT_ARCH_SHEL		(EM_SH|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_SH64		(EM_SH|__AUDIT_ARCH_64BIT)
++#define AUDIT_ARCH_SHEL64	(EM_SH|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_SPARC	(EM_SPARC)
++#define AUDIT_ARCH_SPARC64	(EM_SPARC64|__AUDIT_ARCH_64BIT)
++#define AUDIT_ARCH_V850		(EM_V850|__AUDIT_ARCH_LE)
++#define AUDIT_ARCH_X86_64	(EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
++
++struct audit_status {
++	uint32_t		mask;		/* Bit mask for valid entries */
++	uint32_t		enabled;	/* 1 = enabled, 0 = disabled */
++	uint32_t		failure;	/* Failure-to-log action */
++	uint32_t		pid;		/* pid of auditd process */
++	uint32_t		rate_limit;	/* messages rate limit (per second) */
++	uint32_t		backlog_limit;	/* waiting messages limit */
++	uint32_t		lost;		/* messages lost */
++	uint32_t		backlog;	/* messages waiting in queue */
++};
++
++struct audit_rule {		/* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
++	uint32_t		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
++	uint32_t		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
++	uint32_t		field_count;
++	uint32_t		mask[AUDIT_BITMASK_SIZE];
++	uint32_t		fields[AUDIT_MAX_FIELDS];
++	uint32_t		values[AUDIT_MAX_FIELDS];
++};
++
++#endif /* _LINUX_AUDIT_H_ */
++
+ /* libaudit.h -- 
+  * Copyright 2004, 2005 Red Hat Inc., Durham, North Carolina.
+  * All Rights Reserved.
+@@ -27,7 +220,6 @@
+ #include <stdint.h>
+ #include <sys/socket.h>
+ #include <linux/netlink.h>
+-#include <linux/audit.h>
+ #include <stdarg.h>
+ #include <syslog.h>
+ #include <linux/fs.h>	/* For watch */
diff --git a/sys-process/audit/files/audit.h-2.6.18-rc4 b/sys-process/audit/files/audit.h-2.6.18-rc4
new file mode 100644
index 000000000000..64f9f9e56ac5
--- /dev/null
+++ b/sys-process/audit/files/audit.h-2.6.18-rc4
@@ -0,0 +1,491 @@
+/* audit.h -- Auditing support
+ *
+ * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Written by Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+#ifndef _LINUX_AUDIT_H_
+#define _LINUX_AUDIT_H_
+
+#include <linux/elf-em.h>
+
+/* The netlink messages for the audit system is divided into blocks:
+ * 1000 - 1099 are for commanding the audit system
+ * 1100 - 1199 user space trusted application messages
+ * 1200 - 1299 messages internal to the audit daemon
+ * 1300 - 1399 audit event messages
+ * 1400 - 1499 SE Linux use
+ * 1500 - 1599 kernel LSPP events
+ * 1600 - 1699 kernel crypto events
+ * 1700 - 1799 kernel anomaly records
+ * 1800 - 1999 future kernel use (maybe integrity labels and related events)
+ * 2000 is for otherwise unclassified kernel audit messages (legacy)
+ * 2001 - 2099 unused (kernel)
+ * 2100 - 2199 user space anomaly records
+ * 2200 - 2299 user space actions taken in response to anomalies
+ * 2300 - 2399 user space generated LSPP events
+ * 2400 - 2499 user space crypto events
+ * 2500 - 2999 future user space (maybe integrity labels and related events)
+ *
+ * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
+ * exclusively user space. 1300-2099 is kernel --> user space 
+ * communication.
+ */
+#define AUDIT_GET		1000	/* Get status */
+#define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
+#define AUDIT_LIST		1002	/* List syscall rules -- deprecated */
+#define AUDIT_ADD		1003	/* Add syscall rule -- deprecated */
+#define AUDIT_DEL		1004	/* Delete syscall rule -- deprecated */
+#define AUDIT_USER		1005	/* Message from userspace -- deprecated */
+#define AUDIT_LOGIN		1006	/* Define the login id and information */
+#define AUDIT_WATCH_INS		1007	/* Insert file/dir watch entry */
+#define AUDIT_WATCH_REM		1008	/* Remove file/dir watch entry */
+#define AUDIT_WATCH_LIST	1009	/* List all file/dir watches */
+#define AUDIT_SIGNAL_INFO	1010	/* Get info about sender of signal to auditd */
+#define AUDIT_ADD_RULE		1011	/* Add syscall filtering rule */
+#define AUDIT_DEL_RULE		1012	/* Delete syscall filtering rule */
+#define AUDIT_LIST_RULES	1013	/* List syscall filtering rules */
+
+#define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
+#define AUDIT_USER_AVC		1107	/* We filter this differently */
+#define AUDIT_LAST_USER_MSG	1199
+#define AUDIT_FIRST_USER_MSG2	2100	/* More user space messages */
+#define AUDIT_LAST_USER_MSG2	2999
+ 
+#define AUDIT_DAEMON_START      1200    /* Daemon startup record */
+#define AUDIT_DAEMON_END        1201    /* Daemon normal stop record */
+#define AUDIT_DAEMON_ABORT      1202    /* Daemon error stop record */
+#define AUDIT_DAEMON_CONFIG     1203    /* Daemon config change */
+
+#define AUDIT_SYSCALL		1300	/* Syscall event */
+#define AUDIT_FS_WATCH		1301	/* Filesystem watch event */
+#define AUDIT_PATH		1302	/* Filename path information */
+#define AUDIT_IPC		1303	/* IPC record */
+#define AUDIT_SOCKETCALL	1304	/* sys_socketcall arguments */
+#define AUDIT_CONFIG_CHANGE	1305	/* Audit system configuration change */
+#define AUDIT_SOCKADDR		1306	/* sockaddr copied as syscall arg */
+#define AUDIT_CWD		1307	/* Current working directory */
+#define AUDIT_EXECVE		1309	/* execve arguments */
+#define AUDIT_IPC_SET_PERM	1311	/* IPC new permissions record type */
+#define AUDIT_MQ_OPEN		1312	/* POSIX MQ open record type */
+#define AUDIT_MQ_SENDRECV	1313	/* POSIX MQ send/receive record type */
+#define AUDIT_MQ_NOTIFY		1314	/* POSIX MQ notify record type */
+#define AUDIT_MQ_GETSETATTR	1315	/* POSIX MQ get/set attribute record type */
+
+#define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
+#define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */
+#define AUDIT_AVC_PATH		1402	/* dentry, vfsmount pair from avc */
+#define AUDIT_MAC_POLICY_LOAD	1403	/* Policy file load */
+#define AUDIT_MAC_STATUS	1404	/* Changed enforcing,permissive,off */
+#define AUDIT_MAC_CONFIG_CHANGE	1405	/* Changes to booleans */
+
+#define AUDIT_FIRST_KERN_ANOM_MSG   1700
+#define AUDIT_LAST_KERN_ANOM_MSG    1799
+#define AUDIT_ANOM_PROMISCUOUS      1700 /* Device changed promiscuous mode */
+
+#define AUDIT_KERNEL		2000	/* Asynchronous audit record. NOT A REQUEST. */
+
+/* Rule flags */
+#define AUDIT_FILTER_USER	0x00	/* Apply rule to user-generated messages */
+#define AUDIT_FILTER_TASK	0x01	/* Apply rule at task creation (not syscall) */
+#define AUDIT_FILTER_ENTRY	0x02	/* Apply rule at syscall entry */
+#define AUDIT_FILTER_WATCH	0x03	/* Apply rule to file system watches */
+#define AUDIT_FILTER_EXIT	0x04	/* Apply rule at syscall exit */
+#define AUDIT_FILTER_TYPE	0x05	/* Apply rule at audit_log_start */
+
+#define AUDIT_NR_FILTERS	6
+
+#define AUDIT_FILTER_PREPEND	0x10	/* Prepend to front of list */
+
+/* Rule actions */
+#define AUDIT_NEVER    0	/* Do not build context if rule matches */
+#define AUDIT_POSSIBLE 1	/* Build context if rule matches  */
+#define AUDIT_ALWAYS   2	/* Generate audit record if rule matches */
+
+/* Rule structure sizes -- if these change, different AUDIT_ADD and
+ * AUDIT_LIST commands must be implemented. */
+#define AUDIT_MAX_FIELDS   64
+#define AUDIT_MAX_KEY_LEN  32
+#define AUDIT_BITMASK_SIZE 64
+#define AUDIT_WORD(nr) ((__u32)((nr)/32))
+#define AUDIT_BIT(nr)  (1 << ((nr) - AUDIT_WORD(nr)*32))
+
+#define AUDIT_SYSCALL_CLASSES 16
+#define AUDIT_CLASS_DIR_WRITE 0
+#define AUDIT_CLASS_DIR_WRITE_32 1
+#define AUDIT_CLASS_CHATTR 2
+#define AUDIT_CLASS_CHATTR_32 3
+
+/* This bitmask is used to validate user input.  It represents all bits that
+ * are currently used in an audit field constant understood by the kernel.
+ * If you are adding a new #define AUDIT_<whatever>, please ensure that
+ * AUDIT_UNUSED_BITS is updated if need be. */
+#define AUDIT_UNUSED_BITS	0x0FFFFC00
+
+
+/* Rule fields */
+				/* These are useful when checking the
+				 * task structure at task creation time
+				 * (AUDIT_PER_TASK).  */
+#define AUDIT_PID	0
+#define AUDIT_UID	1
+#define AUDIT_EUID	2
+#define AUDIT_SUID	3
+#define AUDIT_FSUID	4
+#define AUDIT_GID	5
+#define AUDIT_EGID	6
+#define AUDIT_SGID	7
+#define AUDIT_FSGID	8
+#define AUDIT_LOGINUID	9
+#define AUDIT_PERS	10
+#define AUDIT_ARCH	11
+#define AUDIT_MSGTYPE	12
+#define AUDIT_SUBJ_USER	13	/* security label user */
+#define AUDIT_SUBJ_ROLE	14	/* security label role */
+#define AUDIT_SUBJ_TYPE	15	/* security label type */
+#define AUDIT_SUBJ_SEN	16	/* security label sensitivity label */
+#define AUDIT_SUBJ_CLR	17	/* security label clearance label */
+#define AUDIT_PPID	18
+#define AUDIT_OBJ_USER	19
+#define AUDIT_OBJ_ROLE	20
+#define AUDIT_OBJ_TYPE	21
+#define AUDIT_OBJ_LEV_LOW	22
+#define AUDIT_OBJ_LEV_HIGH	23
+
+				/* These are ONLY useful when checking
+				 * at syscall exit time (AUDIT_AT_EXIT). */
+#define AUDIT_DEVMAJOR	100
+#define AUDIT_DEVMINOR	101
+#define AUDIT_INODE	102
+#define AUDIT_EXIT	103
+#define AUDIT_SUCCESS   104	/* exit >= 0; value ignored */
+#define AUDIT_WATCH	105
+
+#define AUDIT_ARG0      200
+#define AUDIT_ARG1      (AUDIT_ARG0+1)
+#define AUDIT_ARG2      (AUDIT_ARG0+2)
+#define AUDIT_ARG3      (AUDIT_ARG0+3)
+
+#define AUDIT_FILTERKEY	210
+
+#define AUDIT_NEGATE			0x80000000
+
+/* These are the supported operators.
+ *	4  2  1
+ *	=  >  <
+ *	-------
+ *	0  0  0		0	nonsense
+ *	0  0  1		1	<
+ *	0  1  0		2	>
+ *	0  1  1		3	!=
+ *	1  0  0		4	=
+ *	1  0  1		5	<=
+ *	1  1  0		6	>=
+ *	1  1  1		7	all operators
+ */
+#define AUDIT_LESS_THAN			0x10000000
+#define AUDIT_GREATER_THAN		0x20000000
+#define AUDIT_NOT_EQUAL			0x30000000
+#define AUDIT_EQUAL			0x40000000
+#define AUDIT_LESS_THAN_OR_EQUAL	(AUDIT_LESS_THAN|AUDIT_EQUAL)
+#define AUDIT_GREATER_THAN_OR_EQUAL	(AUDIT_GREATER_THAN|AUDIT_EQUAL)
+#define AUDIT_OPERATORS			(AUDIT_EQUAL|AUDIT_NOT_EQUAL)
+
+/* Status symbols */
+				/* Mask values */
+#define AUDIT_STATUS_ENABLED		0x0001
+#define AUDIT_STATUS_FAILURE		0x0002
+#define AUDIT_STATUS_PID		0x0004
+#define AUDIT_STATUS_RATE_LIMIT		0x0008
+#define AUDIT_STATUS_BACKLOG_LIMIT	0x0010
+				/* Failure-to-log actions */
+#define AUDIT_FAIL_SILENT	0
+#define AUDIT_FAIL_PRINTK	1
+#define AUDIT_FAIL_PANIC	2
+
+/* distinguish syscall tables */
+#define __AUDIT_ARCH_64BIT 0x80000000
+#define __AUDIT_ARCH_LE	   0x40000000
+#define AUDIT_ARCH_ALPHA	(EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_ARM		(EM_ARM|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_ARMEB	(EM_ARM)
+#define AUDIT_ARCH_CRIS		(EM_CRIS|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_FRV		(EM_FRV)
+#define AUDIT_ARCH_H8300	(EM_H8_300)
+#define AUDIT_ARCH_I386		(EM_386|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_IA64		(EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_M32R		(EM_M32R)
+#define AUDIT_ARCH_M68K		(EM_68K)
+#define AUDIT_ARCH_MIPS		(EM_MIPS)
+#define AUDIT_ARCH_MIPSEL	(EM_MIPS|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_MIPS64	(EM_MIPS|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_MIPSEL64	(EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_PARISC	(EM_PARISC)
+#define AUDIT_ARCH_PARISC64	(EM_PARISC|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_PPC		(EM_PPC)
+#define AUDIT_ARCH_PPC64	(EM_PPC64|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_S390		(EM_S390)
+#define AUDIT_ARCH_S390X	(EM_S390|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_SH		(EM_SH)
+#define AUDIT_ARCH_SHEL		(EM_SH|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_SH64		(EM_SH|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_SHEL64	(EM_SH|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_SPARC	(EM_SPARC)
+#define AUDIT_ARCH_SPARC64	(EM_SPARCV9|__AUDIT_ARCH_64BIT)
+#define AUDIT_ARCH_V850		(EM_V850|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_X86_64	(EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+
+struct audit_status {
+	__u32		mask;		/* Bit mask for valid entries */
+	__u32		enabled;	/* 1 = enabled, 0 = disabled */
+	__u32		failure;	/* Failure-to-log action */
+	__u32		pid;		/* pid of auditd process */
+	__u32		rate_limit;	/* messages rate limit (per second) */
+	__u32		backlog_limit;	/* waiting messages limit */
+	__u32		lost;		/* messages lost */
+	__u32		backlog;	/* messages waiting in queue */
+};
+
+/* audit_rule_data supports filter rules with both integer and string
+ * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
+ * AUDIT_LIST_RULES requests.
+ */
+struct audit_rule_data {
+	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
+	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
+	__u32		field_count;
+	__u32		mask[AUDIT_BITMASK_SIZE]; /* syscall(s) affected */
+	__u32		fields[AUDIT_MAX_FIELDS];
+	__u32		values[AUDIT_MAX_FIELDS];
+	__u32		fieldflags[AUDIT_MAX_FIELDS];
+	__u32		buflen;	/* total length of string fields */
+	char		buf[0];	/* string fields buffer */
+};
+
+/* audit_rule is supported to maintain backward compatibility with
+ * userspace.  It supports integer fields only and corresponds to
+ * AUDIT_ADD, AUDIT_DEL and AUDIT_LIST requests.
+ */
+struct audit_rule {		/* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
+	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
+	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
+	__u32		field_count;
+	__u32		mask[AUDIT_BITMASK_SIZE];
+	__u32		fields[AUDIT_MAX_FIELDS];
+	__u32		values[AUDIT_MAX_FIELDS];
+};
+
+#ifdef __KERNEL__
+#include <linux/sched.h>
+
+struct audit_sig_info {
+	uid_t		uid;
+	pid_t		pid;
+	char		ctx[0];
+};
+
+struct audit_buffer;
+struct audit_context;
+struct inode;
+struct netlink_skb_parms;
+struct linux_binprm;
+struct mq_attr;
+struct mqstat;
+
+#define AUDITSC_INVALID 0
+#define AUDITSC_SUCCESS 1
+#define AUDITSC_FAILURE 2
+#define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS )
+extern int __init audit_register_class(int class, unsigned *list);
+#ifdef CONFIG_AUDITSYSCALL
+/* These are defined in auditsc.c */
+				/* Public API */
+extern int  audit_alloc(struct task_struct *task);
+extern void audit_free(struct task_struct *task);
+extern void audit_syscall_entry(int arch,
+				int major, unsigned long a0, unsigned long a1,
+				unsigned long a2, unsigned long a3);
+extern void audit_syscall_exit(int failed, long return_code);
+extern void __audit_getname(const char *name);
+extern void audit_putname(const char *name);
+extern void __audit_inode(const char *name, const struct inode *inode);
+extern void __audit_inode_child(const char *dname, const struct inode *inode,
+				const struct inode *parent);
+extern void __audit_inode_update(const struct inode *inode);
+static inline int audit_dummy_context(void)
+{
+	void *p = current->audit_context;
+	return !p || *(int *)p;
+}
+static inline void audit_getname(const char *name)
+{
+	if (unlikely(!audit_dummy_context()))
+		__audit_getname(name);
+}
+static inline void audit_inode(const char *name, const struct inode *inode) {
+	if (unlikely(!audit_dummy_context()))
+		__audit_inode(name, inode);
+}
+static inline void audit_inode_child(const char *dname, 
+				     const struct inode *inode,
+				     const struct inode *parent) {
+	if (unlikely(!audit_dummy_context()))
+		__audit_inode_child(dname, inode, parent);
+}
+static inline void audit_inode_update(const struct inode *inode) {
+	if (unlikely(!audit_dummy_context()))
+		__audit_inode_update(inode);
+}
+
+				/* Private API (for audit.c only) */
+extern unsigned int audit_serial(void);
+extern void auditsc_get_stamp(struct audit_context *ctx,
+			      struct timespec *t, unsigned int *serial);
+extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
+extern uid_t audit_get_loginuid(struct audit_context *ctx);
+extern int __audit_ipc_obj(struct kern_ipc_perm *ipcp);
+extern int __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
+extern int audit_bprm(struct linux_binprm *bprm);
+extern int audit_socketcall(int nargs, unsigned long *args);
+extern int audit_sockaddr(int len, void *addr);
+extern int audit_avc_path(struct dentry *dentry, struct vfsmount *mnt);
+extern int audit_set_macxattr(const char *name);
+extern int __audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr);
+extern int __audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout);
+extern int __audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout);
+extern int __audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification);
+extern int __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);
+
+static inline int audit_ipc_obj(struct kern_ipc_perm *ipcp)
+{
+	if (unlikely(!audit_dummy_context()))
+		return __audit_ipc_obj(ipcp);
+	return 0;
+}
+static inline int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode)
+{
+	if (unlikely(!audit_dummy_context()))
+		return __audit_ipc_set_perm(qbytes, uid, gid, mode);
+	return 0;
+}
+static inline int audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr)
+{
+	if (unlikely(!audit_dummy_context()))
+		return __audit_mq_open(oflag, mode, u_attr);
+	return 0;
+}
+static inline int audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout)
+{
+	if (unlikely(!audit_dummy_context()))
+		return __audit_mq_timedsend(mqdes, msg_len, msg_prio, u_abs_timeout);
+	return 0;
+}
+static inline int audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout)
+{
+	if (unlikely(!audit_dummy_context()))
+		return __audit_mq_timedreceive(mqdes, msg_len, u_msg_prio, u_abs_timeout);
+	return 0;
+}
+static inline int audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification)
+{
+	if (unlikely(!audit_dummy_context()))
+		return __audit_mq_notify(mqdes, u_notification);
+	return 0;
+}
+static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
+{
+	if (unlikely(!audit_dummy_context()))
+		return __audit_mq_getsetattr(mqdes, mqstat);
+	return 0;
+}
+extern int audit_n_rules;
+#else
+#define audit_alloc(t) ({ 0; })
+#define audit_free(t) do { ; } while (0)
+#define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0)
+#define audit_syscall_exit(f,r) do { ; } while (0)
+#define audit_dummy_context() 1
+#define audit_getname(n) do { ; } while (0)
+#define audit_putname(n) do { ; } while (0)
+#define __audit_inode(n,i) do { ; } while (0)
+#define __audit_inode_child(d,i,p) do { ; } while (0)
+#define __audit_inode_update(i) do { ; } while (0)
+#define audit_inode(n,i) do { ; } while (0)
+#define audit_inode_child(d,i,p) do { ; } while (0)
+#define audit_inode_update(i) do { ; } while (0)
+#define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
+#define audit_get_loginuid(c) ({ -1; })
+#define audit_ipc_obj(i) ({ 0; })
+#define audit_ipc_set_perm(q,u,g,m) ({ 0; })
+#define audit_bprm(p) ({ 0; })
+#define audit_socketcall(n,a) ({ 0; })
+#define audit_sockaddr(len, addr) ({ 0; })
+#define audit_avc_path(dentry, mnt) ({ 0; })
+#define audit_set_macxattr(n) do { ; } while (0)
+#define audit_mq_open(o,m,a) ({ 0; })
+#define audit_mq_timedsend(d,l,p,t) ({ 0; })
+#define audit_mq_timedreceive(d,l,p,t) ({ 0; })
+#define audit_mq_notify(d,n) ({ 0; })
+#define audit_mq_getsetattr(d,s) ({ 0; })
+#define audit_n_rules 0
+#endif
+
+#ifdef CONFIG_AUDIT
+/* These are defined in audit.c */
+				/* Public API */
+extern void		    audit_log(struct audit_context *ctx, gfp_t gfp_mask,
+				      int type, const char *fmt, ...)
+				      __attribute__((format(printf,4,5)));
+
+extern struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type);
+extern void		    audit_log_format(struct audit_buffer *ab,
+					     const char *fmt, ...)
+			    __attribute__((format(printf,2,3)));
+extern void		    audit_log_end(struct audit_buffer *ab);
+extern void		    audit_log_hex(struct audit_buffer *ab,
+					  const unsigned char *buf,
+					  size_t len);
+extern const char *	    audit_log_untrustedstring(struct audit_buffer *ab,
+						      const char *string);
+extern const char *	    audit_log_n_untrustedstring(struct audit_buffer *ab,
+							size_t n,
+							const char *string);
+extern void		    audit_log_d_path(struct audit_buffer *ab,
+					     const char *prefix,
+					     struct dentry *dentry,
+					     struct vfsmount *vfsmnt);
+				/* Private API (for audit.c only) */
+extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
+extern int audit_filter_type(int type);
+extern int  audit_receive_filter(int type, int pid, int uid, int seq,
+			 void *data, size_t datasz, uid_t loginuid, u32 sid);
+#else
+#define audit_log(c,g,t,f,...) do { ; } while (0)
+#define audit_log_start(c,g,t) ({ NULL; })
+#define audit_log_vformat(b,f,a) do { ; } while (0)
+#define audit_log_format(b,f,...) do { ; } while (0)
+#define audit_log_end(b) do { ; } while (0)
+#define audit_log_hex(a,b,l) do { ; } while (0)
+#define audit_log_untrustedstring(a,s) do { ; } while (0)
+#define audit_log_n_untrustedstring(a,n,s) do { ; } while (0)
+#define audit_log_d_path(b,p,d,v) do { ; } while (0)
+#endif
+#endif
+#endif
diff --git a/sys-process/audit/files/digest-audit-0.8.1 b/sys-process/audit/files/digest-audit-0.8.1
index 88db3ef6c7b3..f0b66ce94631 100644
--- a/sys-process/audit/files/digest-audit-0.8.1
+++ b/sys-process/audit/files/digest-audit-0.8.1
@@ -1 +1,3 @@
 MD5 d02b1e35fdbfa5de94fd7daf8e94845a audit-0.8.1.tar.gz 75487
+RMD160 e5b9ed8cca8d4d3c4b379144633f9cba70fefd76 audit-0.8.1.tar.gz 75487
+SHA256 bf33acf43bc8ce64a25d5b624814a84022df131f2062327cdc311788aadc51dc audit-0.8.1.tar.gz 75487
diff --git a/sys-process/audit/files/digest-audit-0.9.1 b/sys-process/audit/files/digest-audit-0.9.1
index 155a6f55897f..f22fc633e905 100644
--- a/sys-process/audit/files/digest-audit-0.9.1
+++ b/sys-process/audit/files/digest-audit-0.9.1
@@ -1 +1,3 @@
 MD5 052dd2563e90cd787994aebc69545891 audit-0.9.1.tar.gz 82578
+RMD160 beab2380723213bba3ad8dca21ebee1155a49900 audit-0.9.1.tar.gz 82578
+SHA256 88fdb0883f552dccb968bb953f6467f14bddb33cba22bad807649e4c039f1fab audit-0.9.1.tar.gz 82578
diff --git a/sys-process/audit/files/digest-audit-1.2.5 b/sys-process/audit/files/digest-audit-1.2.5
new file mode 100644
index 000000000000..c19a75b596a9
--- /dev/null
+++ b/sys-process/audit/files/digest-audit-1.2.5
@@ -0,0 +1,3 @@
+MD5 d5d56d5e3189215dcd37a5eded761d12 audit-1.2.5.tar.gz 232383
+RMD160 8dd8bca46c918f0805756dfdfd898eb19b09f7e9 audit-1.2.5.tar.gz 232383
+SHA256 6b9fd472ca97c07e319338a73b3f0adbe5f53506a15adba2ac2ad3c7db7b0eef audit-1.2.5.tar.gz 232383
diff --git a/sys-process/audit/files/digest-audit-1.2.9 b/sys-process/audit/files/digest-audit-1.2.9
new file mode 100644
index 000000000000..67e37cf742a9
--- /dev/null
+++ b/sys-process/audit/files/digest-audit-1.2.9
@@ -0,0 +1,3 @@
+MD5 2cb76a573b332ef4eb08351d9408b6cf audit-1.2.9.tar.gz 240266
+RMD160 329692787d24469b86107377e0004bfae380e0ea audit-1.2.9.tar.gz 240266
+SHA256 3660d1220246e81df1e140867acefc82a61418009c740d92e56af2ae0baa4aff audit-1.2.9.tar.gz 240266
diff --git a/sys-process/audit/files/elf-em.h-2.6.18-rc4 b/sys-process/audit/files/elf-em.h-2.6.18-rc4
new file mode 100644
index 000000000000..6a5796c81c90
--- /dev/null
+++ b/sys-process/audit/files/elf-em.h-2.6.18-rc4
@@ -0,0 +1,49 @@
+#ifndef _LINUX_ELF_EM_H
+#define _LINUX_ELF_EM_H
+
+/* These constants define the various ELF target machines */
+#define EM_NONE		0
+#define EM_M32		1
+#define EM_SPARC	2
+#define EM_386		3
+#define EM_68K		4
+#define EM_88K		5
+#define EM_486		6	/* Perhaps disused */
+#define EM_860		7
+#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
+				/* Next two are historical and binaries and
+				   modules of these types will be rejected by
+				   Linux.  */
+#define EM_MIPS_RS3_LE	10	/* MIPS R3000 little-endian */
+#define EM_MIPS_RS4_BE	10	/* MIPS R4000 big-endian */
+
+#define EM_PARISC	15	/* HPPA */
+#define EM_SPARC32PLUS	18	/* Sun's "v8plus" */
+#define EM_PPC		20	/* PowerPC */
+#define EM_PPC64	21       /* PowerPC64 */
+#define EM_SH		42	/* SuperH */
+#define EM_SPARCV9	43	/* SPARC v9 64-bit */
+#define EM_IA_64	50	/* HP/Intel IA-64 */
+#define EM_X86_64	62	/* AMD x86-64 */
+#define EM_S390		22	/* IBM S/390 */
+#define EM_CRIS		76	/* Axis Communications 32-bit embedded processor */
+#define EM_V850		87	/* NEC v850 */
+#define EM_M32R		88	/* Renesas M32R */
+#define EM_H8_300	46	/* Renesas H8/300,300H,H8S */
+#define EM_FRV		0x5441	/* Fujitsu FR-V */
+
+/*
+ * This is an interim value that we will use until the committee comes
+ * up with a final number.
+ */
+#define EM_ALPHA	0x9026
+
+/* Bogus old v850 magic number, used by old tools. */
+#define EM_CYGNUS_V850	0x9080
+/* Bogus old m32r magic number, used by old tools. */
+#define EM_CYGNUS_M32R	0x9041
+/* This is the old interim value for S/390 architecture */
+#define EM_S390_OLD	0xA390
+
+
+#endif /* _LINUX_ELF_EM_H */