commit:     dcf4262cdd1e64450de4f825edc61f310894401c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 22:52:33 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 22:57:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf4262c

sys-process/audit: Revert "Remove old (py3.6)"

Removed too many files/ due to a misgrep.

Reverts: 7494ff77d198e87226f368af01769e2ebb38cb61
Closes: https://bugs.gentoo.org/762919
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-process/audit/Manifest                         |   4 +
 sys-process/audit/audit-2.6.4.ebuild               | 230 +++++++++++++++++++++
 sys-process/audit/audit-2.7.1.ebuild               | 230 +++++++++++++++++++++
 sys-process/audit/audit-2.8.2.ebuild               | 228 ++++++++++++++++++++
 sys-process/audit/audit-2.8.3.ebuild               | 228 ++++++++++++++++++++
 .../audit/files/audit-2.1.3-ia64-compile-fix.patch | 212 +++++++++++++++++++
 sys-process/audit/files/audit.rules                |  24 +++
 sys-process/audit/files/audit.rules.stop.post      |  12 ++
 sys-process/audit/files/audit.rules.stop.pre       |  15 ++
 9 files changed, 1183 insertions(+)

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index d5276de092b..2890c29de36 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,4 +1,8 @@
 DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 
60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f
 SHA512 
78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101
+DIST audit-2.6.4.tar.gz 1078677 BLAKE2B 
056d9f269926d9b0d74f7187f833f1e94d4e03a5137750fe4ff87b71fa0ce0e0a8569b97ecbd671f951061cfb088dff17b46e37cc14122864c37615356646fc5
 SHA512 
69b5d3987d2b8b189d1242fde639af3d7d366e901733133e47ee71223caf73aa7da40b7811298f0af861969b0ab482c5ef9830b711bdd15bd5f4d0ebc88a1224
+DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 
10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96
 SHA512 
37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
+DIST audit-2.8.2.tar.gz 1121970 BLAKE2B 
bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549
 SHA512 
888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
+DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 
21c2b8543a31c0ca4319af40b844f4400615108a59195a95ea79499ff2923d7dbbc840716d60dfba311bfc451983cd4cd0f7cb27c2444825df2c0dfb50f9614f
 SHA512 
aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
 DIST audit-2.8.4.tar.gz 1123889 BLAKE2B 
b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42
 SHA512 
5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a
 DIST audit-2.8.5.tar.gz 1140694 BLAKE2B 
64fd0cd93f934e3dd11faf21fcd765894a9c4336d8322179980bb7df1ef5a06d301a665860aeb84fefa0cf278940668023675b99ba7f33cdcfb542d869034358
 SHA512 
7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B 
adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4
 SHA512 
7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a

diff --git a/sys-process/audit/audit-2.6.4.ebuild 
b/sys-process/audit/audit-2.6.4.ebuild
new file mode 100644
index 00000000000..fe6c17834e6
--- /dev/null
+++ b/sys-process/audit/audit-2.6.4.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools ltprune multilib multilib-minimal toolchain-funcs 
preserve-libs python-r1 linux-info systemd usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and 
kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+       ldap? ( net-nds/openldap )
+       sys-libs/libcap-ng
+       python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+       >=sys-kernel/linux-headers-2.6.34
+       python? ( dev-lang/swig:0 )"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+       linux-info_pkg_setup
+}
+
+src_prepare() {
+       eapply_user
+
+       # Do not build GUI tools
+       sed -i \
+               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+               "${S}"/configure.ac || die
+       sed -i \
+               -e 's,system-config-audit,,g' \
+               "${S}"/Makefile.am || die
+       rm -rf "${S}"/system-config-audit
+
+       if ! use ldap; then
+               sed -i \
+                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+                       "${S}"/configure.ac || die
+               sed -i \
+                       -e '/^SUBDIRS/s,zos-remote,,g' \
+                       "${S}"/audisp/plugins/Makefile.am || die
+       fi
+
+       # Don't build static version of Python module.
+       eapply "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+       # glibc/kernel upstreams suck with both defining ia64_fpreg
+       # This patch is a horribly workaround that is only valid as long as you
+       # don't need the OTHER definitions in fpu.h.
+       eapply "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+       # there is no --without-golang conf option
+       sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+       # Regenerate autotooling
+       eautoreconf
+}
+
+multilib_src_configure() {
+       local ECONF_SOURCE=${S}
+       econf \
+               --sbindir="${EPREFIX}/sbin" \
+               $(use_enable gssapi gssapi-krb5) \
+               $(use_enable static-libs static) \
+               --enable-systemd \
+               --without-python \
+               --without-python3
+
+       if multilib_is_native_abi; then
+               python_configure() {
+                       mkdir -p "${BUILD_DIR}" || die
+                       cd "${BUILD_DIR}" || die
+
+                       if python_is_python3; then
+                               econf --without-python --with-python3
+                       else
+                               econf --with-python --without-python3
+                       fi
+               }
+
+               use python && python_foreach_impl python_configure
+       fi
+}
+
+src_configure() {
+       tc-export_build_env BUILD_{CC,CPP}
+       export CC_FOR_BUILD="${BUILD_CC}"
+       export CPP_FOR_BUILD="${BUILD_CPP}"
+
+       multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+       if multilib_is_native_abi; then
+               default
+
+               python_compile() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+               }
+
+               local native_build="${BUILD_DIR}"
+               use python && python_foreach_impl python_compile
+       else
+               emake -C lib
+               emake -C auparse
+       fi
+}
+
+multilib_src_install() {
+       if multilib_is_native_abi; then
+               emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" 
install
+
+               python_install() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+               }
+
+               local native_build=${BUILD_DIR}
+               use python && python_foreach_impl python_install
+
+               # things like shadow use this so we need to be in /
+               gen_usr_ldscript -a audit auparse
+       else
+               emake -C lib DESTDIR="${D}" install
+               emake -C auparse DESTDIR="${D}" install
+       fi
+}
+
+multilib_src_install_all() {
+       dodoc AUTHORS ChangeLog README* THANKS TODO
+       docinto contrib
+       dodoc contrib/{avc_snap,skeleton.c}
+       docinto contrib/plugin
+       dodoc contrib/plugin/*
+       docinto rules
+       dodoc rules/*
+
+       newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+       chmod 644 "${D}$(systemd_get_systemunitdir)"/auditd.service || die # 
556436
+
+       [ -f "${ED}"/sbin/audisp-remote ] && \
+       dodir /usr/sbin && \
+       mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+       # Gentoo rules
+       insinto /etc/audit/
+       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+       doins "${FILESDIR}"/audit.rules.stop*
+
+       # audit logs go here
+       keepdir /var/log/audit/
+
+       # Security
+       lockdown_perms "${ED}"
+
+       prune_libtool_files --modules
+}
+
+pkg_preinst() {
+       # Preserve from the audit-1 series
+       preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+       lockdown_perms "${EROOT}"
+       # Preserve from the audit-1 series
+       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+       # Upstream wants these to have restrictive perms.
+       # Should not || die as not all paths may exist.
+       local 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-2.7.1.ebuild 
b/sys-process/audit/audit-2.7.1.ebuild
new file mode 100644
index 00000000000..b3448548a50
--- /dev/null
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools ltprune multilib multilib-minimal toolchain-funcs 
preserve-libs python-r1 linux-info systemd usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and 
kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+       ldap? ( net-nds/openldap )
+       sys-libs/libcap-ng
+       python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+       >=sys-kernel/linux-headers-2.6.34
+       python? ( dev-lang/swig:0 )"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+       linux-info_pkg_setup
+}
+
+src_prepare() {
+       eapply_user
+
+       # Do not build GUI tools
+       sed -i \
+               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+               "${S}"/configure.ac || die
+       sed -i \
+               -e 's,system-config-audit,,g' \
+               "${S}"/Makefile.am || die
+       rm -rf "${S}"/system-config-audit
+
+       if ! use ldap; then
+               sed -i \
+                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+                       "${S}"/configure.ac || die
+               sed -i \
+                       -e '/^SUBDIRS/s,zos-remote,,g' \
+                       "${S}"/audisp/plugins/Makefile.am || die
+       fi
+
+       # Don't build static version of Python module.
+       eapply "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+       # glibc/kernel upstreams suck with both defining ia64_fpreg
+       # This patch is a horribly workaround that is only valid as long as you
+       # don't need the OTHER definitions in fpu.h.
+       eapply "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+       # there is no --without-golang conf option
+       sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+       # Regenerate autotooling
+       eautoreconf
+}
+
+multilib_src_configure() {
+       local ECONF_SOURCE=${S}
+       econf \
+               --sbindir="${EPREFIX}/sbin" \
+               $(use_enable gssapi gssapi-krb5) \
+               $(use_enable static-libs static) \
+               --enable-systemd \
+               --without-python \
+               --without-python3
+
+       if multilib_is_native_abi; then
+               python_configure() {
+                       mkdir -p "${BUILD_DIR}" || die
+                       cd "${BUILD_DIR}" || die
+
+                       if python_is_python3; then
+                               econf --without-python --with-python3
+                       else
+                               econf --with-python --without-python3
+                       fi
+               }
+
+               use python && python_foreach_impl python_configure
+       fi
+}
+
+src_configure() {
+       tc-export_build_env BUILD_{CC,CPP}
+       export CC_FOR_BUILD="${BUILD_CC}"
+       export CPP_FOR_BUILD="${BUILD_CPP}"
+
+       multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+       if multilib_is_native_abi; then
+               default
+
+               python_compile() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+               }
+
+               local native_build="${BUILD_DIR}"
+               use python && python_foreach_impl python_compile
+       else
+               emake -C lib
+               emake -C auparse
+       fi
+}
+
+multilib_src_install() {
+       if multilib_is_native_abi; then
+               emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" 
install
+
+               python_install() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+               }
+
+               local native_build=${BUILD_DIR}
+               use python && python_foreach_impl python_install
+
+               # things like shadow use this so we need to be in /
+               gen_usr_ldscript -a audit auparse
+       else
+               emake -C lib DESTDIR="${D}" install
+               emake -C auparse DESTDIR="${D}" install
+       fi
+}
+
+multilib_src_install_all() {
+       dodoc AUTHORS ChangeLog README* THANKS TODO
+       docinto contrib
+       dodoc contrib/{avc_snap,skeleton.c}
+       docinto contrib/plugin
+       dodoc contrib/plugin/*
+       docinto rules
+       dodoc rules/*
+
+       newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+       chmod 644 "${D}$(systemd_get_systemunitdir)"/auditd.service || die # 
556436
+
+       [ -f "${ED}"/sbin/audisp-remote ] && \
+       dodir /usr/sbin && \
+       mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+       # Gentoo rules
+       insinto /etc/audit/
+       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+       doins "${FILESDIR}"/audit.rules.stop*
+
+       # audit logs go here
+       keepdir /var/log/audit/
+
+       # Security
+       lockdown_perms "${ED}"
+
+       prune_libtool_files --modules
+}
+
+pkg_preinst() {
+       # Preserve from the audit-1 series
+       preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+       lockdown_perms "${EROOT}"
+       # Preserve from the audit-1 series
+       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+       # Upstream wants these to have restrictive perms.
+       # Should not || die as not all paths may exist.
+       local 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-2.8.2.ebuild 
b/sys-process/audit/audit-2.8.2.ebuild
new file mode 100644
index 00000000000..6bcdd339ea4
--- /dev/null
+++ b/sys-process/audit/audit-2.8.2.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs 
python-r1 linux-info systemd usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and 
kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+       ldap? ( net-nds/openldap )
+       sys-libs/libcap-ng
+       python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+       >=sys-kernel/linux-headers-2.6.34
+       python? ( dev-lang/swig:0 )"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+       linux-info_pkg_setup
+}
+
+src_prepare() {
+       eapply_user
+
+       # Do not build GUI tools
+       sed -i \
+               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+               "${S}"/configure.ac || die
+       sed -i \
+               -e 's,system-config-audit,,g' \
+               "${S}"/Makefile.am || die
+       rm -rf "${S}"/system-config-audit
+
+       if ! use ldap; then
+               sed -i \
+                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+                       "${S}"/configure.ac || die
+               sed -i \
+                       -e '/^SUBDIRS/s,zos-remote,,g' \
+                       "${S}"/audisp/plugins/Makefile.am || die
+       fi
+
+       # Don't build static version of Python module.
+       eapply "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+       # glibc/kernel upstreams suck with both defining ia64_fpreg
+       # This patch is a horribly workaround that is only valid as long as you
+       # don't need the OTHER definitions in fpu.h.
+       eapply "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+       # there is no --without-golang conf option
+       sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+       # Regenerate autotooling
+       eautoreconf
+}
+
+multilib_src_configure() {
+       local ECONF_SOURCE=${S}
+       econf \
+               --sbindir="${EPREFIX}/sbin" \
+               $(use_enable gssapi gssapi-krb5) \
+               $(use_enable static-libs static) \
+               --enable-systemd \
+               --without-python \
+               --without-python3
+
+       if multilib_is_native_abi; then
+               python_configure() {
+                       mkdir -p "${BUILD_DIR}" || die
+                       cd "${BUILD_DIR}" || die
+
+                       if python_is_python3; then
+                               econf --without-python --with-python3
+                       else
+                               econf --with-python --without-python3
+                       fi
+               }
+
+               use python && python_foreach_impl python_configure
+       fi
+}
+
+src_configure() {
+       tc-export_build_env BUILD_{CC,CPP}
+       export CC_FOR_BUILD="${BUILD_CC}"
+       export CPP_FOR_BUILD="${BUILD_CPP}"
+
+       multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+       if multilib_is_native_abi; then
+               default
+
+               python_compile() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+               }
+
+               local native_build="${BUILD_DIR}"
+               use python && python_foreach_impl python_compile
+       else
+               emake -C lib
+               emake -C auparse
+       fi
+}
+
+multilib_src_install() {
+       if multilib_is_native_abi; then
+               emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" 
install
+
+               python_install() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+               }
+
+               local native_build=${BUILD_DIR}
+               use python && python_foreach_impl python_install
+
+               # things like shadow use this so we need to be in /
+               gen_usr_ldscript -a audit auparse
+       else
+               emake -C lib DESTDIR="${D}" install
+               emake -C auparse DESTDIR="${D}" install
+       fi
+}
+
+multilib_src_install_all() {
+       dodoc AUTHORS ChangeLog README* THANKS TODO
+       docinto contrib
+       dodoc contrib/{avc_snap,skeleton.c}
+       docinto contrib/plugin
+       dodoc contrib/plugin/*
+       docinto rules
+       dodoc rules/*
+
+       newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+       [ -f "${ED}"/sbin/audisp-remote ] && \
+       dodir /usr/sbin && \
+       mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+       # Gentoo rules
+       insinto /etc/audit/
+       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+       doins "${FILESDIR}"/audit.rules.stop*
+
+       # audit logs go here
+       keepdir /var/log/audit/
+
+       find "${D}" -name '*.la' -delete || die
+
+       # Security
+       lockdown_perms "${ED}"
+}
+
+pkg_preinst() {
+       # Preserve from the audit-1 series
+       preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+       lockdown_perms "${EROOT}"
+       # Preserve from the audit-1 series
+       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+       # Upstream wants these to have restrictive perms.
+       # Should not || die as not all paths may exist.
+       local 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-2.8.3.ebuild 
b/sys-process/audit/audit-2.8.3.ebuild
new file mode 100644
index 00000000000..64b55ec39e2
--- /dev/null
+++ b/sys-process/audit/audit-2.8.3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs 
python-r1 linux-info systemd usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+IUSE="gssapi ldap python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and 
kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+       ldap? ( net-nds/openldap )
+       sys-libs/libcap-ng
+       python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+       >=sys-kernel/linux-headers-2.6.34
+       python? ( dev-lang/swig:0 )"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+       linux-info_pkg_setup
+}
+
+src_prepare() {
+       eapply_user
+
+       # Do not build GUI tools
+       sed -i \
+               -e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+               "${S}"/configure.ac || die
+       sed -i \
+               -e 's,system-config-audit,,g' \
+               "${S}"/Makefile.am || die
+       rm -rf "${S}"/system-config-audit
+
+       if ! use ldap; then
+               sed -i \
+                       -e 
'/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+                       "${S}"/configure.ac || die
+               sed -i \
+                       -e '/^SUBDIRS/s,zos-remote,,g' \
+                       "${S}"/audisp/plugins/Makefile.am || die
+       fi
+
+       # Don't build static version of Python module.
+       eapply "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+       # glibc/kernel upstreams suck with both defining ia64_fpreg
+       # This patch is a horribly workaround that is only valid as long as you
+       # don't need the OTHER definitions in fpu.h.
+       eapply "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+       # there is no --without-golang conf option
+       sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+       # Regenerate autotooling
+       eautoreconf
+}
+
+multilib_src_configure() {
+       local ECONF_SOURCE=${S}
+       econf \
+               --sbindir="${EPREFIX}/sbin" \
+               $(use_enable gssapi gssapi-krb5) \
+               $(use_enable static-libs static) \
+               --enable-systemd \
+               --without-python \
+               --without-python3
+
+       if multilib_is_native_abi; then
+               python_configure() {
+                       mkdir -p "${BUILD_DIR}" || die
+                       cd "${BUILD_DIR}" || die
+
+                       if python_is_python3; then
+                               econf --without-python --with-python3
+                       else
+                               econf --with-python --without-python3
+                       fi
+               }
+
+               use python && python_foreach_impl python_configure
+       fi
+}
+
+src_configure() {
+       tc-export_build_env BUILD_{CC,CPP}
+       export CC_FOR_BUILD="${BUILD_CC}"
+       export CPP_FOR_BUILD="${BUILD_CPP}"
+
+       multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+       if multilib_is_native_abi; then
+               default
+
+               python_compile() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef}
+               }
+
+               local native_build="${BUILD_DIR}"
+               use python && python_foreach_impl python_compile
+       else
+               emake -C lib
+               emake -C auparse
+       fi
+}
+
+multilib_src_install() {
+       if multilib_is_native_abi; then
+               emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" 
install
+
+               python_install() {
+                       local pysuffix pydef
+                       if python_is_python3; then
+                               pysuffix=3
+                               pydef='USE_PYTHON3=true'
+                       else
+                               pysuffix=2
+                               pydef='HAVE_PYTHON=true'
+                       fi
+
+                       emake -C "${BUILD_DIR}"/bindings/swig \
+                               VPATH="${native_build}/lib" \
+                               LIBS="${native_build}/lib/libaudit.la" \
+                               
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+                               _audit_la_DEPENDENCIES="${S}/lib/libaudit.h 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+                       emake -C 
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
+                               
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
 \
+                               
auparse_la_LIBADD="${native_build}/auparse/libauparse.la 
${native_build}/lib/libaudit.la" \
+                               ${pydef} \
+                               DESTDIR="${D}" install
+               }
+
+               local native_build=${BUILD_DIR}
+               use python && python_foreach_impl python_install
+
+               # things like shadow use this so we need to be in /
+               gen_usr_ldscript -a audit auparse
+       else
+               emake -C lib DESTDIR="${D}" install
+               emake -C auparse DESTDIR="${D}" install
+       fi
+}
+
+multilib_src_install_all() {
+       dodoc AUTHORS ChangeLog README* THANKS TODO
+       docinto contrib
+       dodoc contrib/{avc_snap,skeleton.c}
+       docinto contrib/plugin
+       dodoc contrib/plugin/*
+       docinto rules
+       dodoc rules/*
+
+       newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
+       newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+       [ -f "${ED}"/sbin/audisp-remote ] && \
+       dodir /usr/sbin && \
+       mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die
+
+       # Gentoo rules
+       insinto /etc/audit/
+       newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+       doins "${FILESDIR}"/audit.rules.stop*
+
+       # audit logs go here
+       keepdir /var/log/audit/
+
+       find "${D}" -name '*.la' -delete || die
+
+       # Security
+       lockdown_perms "${ED}"
+}
+
+pkg_preinst() {
+       # Preserve from the audit-1 series
+       preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+       lockdown_perms "${EROOT}"
+       # Preserve from the audit-1 series
+       preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+       # Upstream wants these to have restrictive perms.
+       # Should not || die as not all paths may exist.
+       local 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-2.1.3-ia64-compile-fix.patch 
b/sys-process/audit/files/audit-2.1.3-ia64-compile-fix.patch
new file mode 100644
index 00000000000..3ec60fbc48e
--- /dev/null
+++ b/sys-process/audit/files/audit-2.1.3-ia64-compile-fix.patch
@@ -0,0 +1,212 @@
+diff -Nuar -X exclude audit-2.1.3.orig/configure.ac audit-2.1.3/configure.ac
+--- audit-2.1.3.orig/configure.ac      2011-08-15 17:30:58.000000000 +0000
++++ audit-2.1.3/configure.ac   2012-12-18 20:03:22.000000000 +0000
+@@ -79,6 +79,9 @@
+     esac
+ fi
+ 
++AC_CHECK_HEADER([asm/ptrace.h], [AC_DEFINE([HAVE_ASM_PTRACE_H],[],[Define to 
1 if you have asm/ptrace.h])], [])
++AC_CHECK_HEADER([linux/ptrace.h], [AC_DEFINE([HAVE_LINUX_PTRACE_H],[],[Define 
to 1 if you have linux/ptrace.h])], [])
++
+ #gssapi
+ AC_ARG_ENABLE(gssapi_krb5,
+       [AS_HELP_STRING([--enable-gssapi-krb5],[Enable GSSAPI Kerberos 5 
support @<:@default=no@:>@])],
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditctl.c 
audit-2.1.3/src/auditctl.c
+--- audit-2.1.3.orig/src/auditctl.c    2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditctl.c 2012-12-18 20:21:21.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>   /* strdup needs xopen define */
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-config.c 
audit-2.1.3/src/auditd-config.c
+--- audit-2.1.3.orig/src/auditd-config.c       2011-08-15 17:31:00.000000000 
+0000
++++ audit-2.1.3/src/auditd-config.c    2012-12-18 20:21:23.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-dispatch.c 
audit-2.1.3/src/auditd-dispatch.c
+--- audit-2.1.3.orig/src/auditd-dispatch.c     2011-08-15 17:31:00.000000000 
+0000
++++ audit-2.1.3/src/auditd-dispatch.c  2012-12-18 20:21:27.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <unistd.h>
+ #include <sys/uio.h>
+ #include <fcntl.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-event.c 
audit-2.1.3/src/auditd-event.c
+--- audit-2.1.3.orig/src/auditd-event.c        2011-08-15 17:31:00.000000000 
+0000
++++ audit-2.1.3/src/auditd-event.c     2012-12-18 20:21:29.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-listen.c 
audit-2.1.3/src/auditd-listen.c
+--- audit-2.1.3.orig/src/auditd-listen.c       2011-08-15 17:31:00.000000000 
+0000
++++ audit-2.1.3/src/auditd-listen.c    2012-12-18 20:21:31.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-reconfig.c 
audit-2.1.3/src/auditd-reconfig.c
+--- audit-2.1.3.orig/src/auditd-reconfig.c     2011-08-15 17:31:00.000000000 
+0000
++++ audit-2.1.3/src/auditd-reconfig.c  2012-12-18 20:21:33.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <pthread.h>
+ #include <signal.h>
+ #include <stdlib.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd-sendmail.c 
audit-2.1.3/src/auditd-sendmail.c
+--- audit-2.1.3.orig/src/auditd-sendmail.c     2011-08-15 17:31:00.000000000 
+0000
++++ audit-2.1.3/src/auditd-sendmail.c  2012-12-18 20:21:34.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>           // for access()
+ #include <string.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/auditd.c audit-2.1.3/src/auditd.c
+--- audit-2.1.3.orig/src/auditd.c      2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/auditd.c   2012-12-18 20:21:38.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/autrace.c audit-2.1.3/src/autrace.c
+--- audit-2.1.3.orig/src/autrace.c     2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/autrace.c  2012-12-18 20:21:43.000000000 +0000
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/wait.h>
+diff -Nuar -X exclude audit-2.1.3.orig/src/delete_all.c 
audit-2.1.3/src/delete_all.c
+--- audit-2.1.3.orig/src/delete_all.c  2011-08-15 17:31:00.000000000 +0000
++++ audit-2.1.3/src/delete_all.c       2012-12-18 20:21:48.000000000 +0000
+@@ -20,6 +20,7 @@
+  *      Steve Grubb <sgr...@redhat.com>
+  */
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+diff -Nuar -X exclude audit-2.1.3.orig/lib/fixup.h audit-2.1.3/lib/fixup.h
+--- audit-2.1.3.orig/lib/fixup.h       1970-01-01 00:00:00.000000000 +0000
++++ audit-2.1.3/lib/fixup.h    2012-12-18 20:21:02.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _AUDIT_IA64_FIXUP_H_
++#define _AUDIT_IA64_FIXUP_H_
++
++#ifdef __ia64__ /* what a pos */
++# include <linux/types.h>
++# define _ASM_IA64_FPU_H
++#endif
++#include <signal.h>
++/*
++#ifdef HAVE_ASM_PTRACE_H
++# include <asm/ptrace.h>
++#endif
++#ifdef HAVE_LINUX_PTRACE_H
++# include <linux/ptrace.h>
++#endif
++*/
++#endif
+--- audit-2.1.3/src/ausearch.c 2012-12-22 03:09:54.000000000 +0000
++++ audit-2.1.3/src/ausearch.c 2012-12-22 03:10:02.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdio_ext.h>
+ #include <string.h>
+diff -Nuar audit-2.1.3.orig/audisp/audispd.c audit-2.1.3/audisp/audispd.c
+--- audit-2.1.3.orig/audisp/audispd.c  2011-08-15 17:30:59.000000000 +0000
++++ audit-2.1.3/audisp/audispd.c       2012-12-22 03:25:15.000000000 +0000
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+diff -Nuar audit-2.1.3.orig/audisp/plugins/prelude/audisp-prelude.c 
audit-2.1.3/audisp/plugins/prelude/audisp-prelude.c
+--- audit-2.1.3.orig/audisp/plugins/prelude/audisp-prelude.c   2011-08-15 
17:30:59.000000000 +0000
++++ audit-2.1.3/audisp/plugins/prelude/audisp-prelude.c        2012-12-22 
03:25:20.000000000 +0000
+@@ -21,6 +21,8 @@
+  *
+  */
+ 
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+diff -Nuar audit-2.1.3.orig/audisp/plugins/remote/audisp-remote.c 
audit-2.1.3/audisp/plugins/remote/audisp-remote.c
+--- audit-2.1.3.orig/audisp/plugins/remote/audisp-remote.c     2011-08-15 
17:30:59.000000000 +0000
++++ audit-2.1.3/audisp/plugins/remote/audisp-remote.c  2012-12-22 
03:25:22.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <signal.h>
+ #include <syslog.h>
+diff -Nuar audit-2.1.3.orig/contrib/plugin/audisp-example.c 
audit-2.1.3/contrib/plugin/audisp-example.c
+--- audit-2.1.3.orig/contrib/plugin/audisp-example.c   2011-08-15 
17:31:02.000000000 +0000
++++ audit-2.1.3/contrib/plugin/audisp-example.c        2012-12-22 
03:25:27.000000000 +0000
+@@ -37,6 +37,8 @@
+  */
+ 
+ #define _GNU_SOURCE
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <signal.h>
+ #include <string.h>
+diff -Nuar audit-2.1.3.orig/contrib/skeleton.c audit-2.1.3/contrib/skeleton.c
+--- audit-2.1.3.orig/contrib/skeleton.c        2011-08-15 17:31:02.000000000 
+0000
++++ audit-2.1.3/contrib/skeleton.c     2012-12-22 03:25:40.000000000 +0000
+@@ -7,6 +7,8 @@
+  * gcc skeleton.c -o skeleton -laudit
+  */
+ 
++#include "config.h"
++#include "fixup.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>

diff --git a/sys-process/audit/files/audit.rules 
b/sys-process/audit/files/audit.rules
new file mode 100644
index 00000000000..ef0e6ee26f3
--- /dev/null
+++ b/sys-process/audit/files/audit.rules
@@ -0,0 +1,24 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# This file contains the auditctl rules that are loaded
+# whenever the audit daemon is started via the initscripts.
+# The rules are simply the parameters that would be passed
+# to auditctl.
+
+# First rule - delete all
+# This is to clear out old rules, so we don't append to them.
+-D
+
+# Feel free to add below this line. See auditctl man page
+
+# The following rule would cause all of the syscalls listed to be ignored in 
logging.
+# -a entry,never -S read -S write -S open -S fstat -S fstat64 -S mmap -S brk 
-S munmap -S _llseek -S nanosleep -S fcntl64 -S close -S dup2 -S rt_sigaction 
-S stat64 -S stat
+
+# The following rule would cause the capture of all systems not caught above.
+# -a entry,always -S all
+
+# Increase the buffers to survive stress events
+-b 256
+
+# vim:ft=conf:

diff --git a/sys-process/audit/files/audit.rules.stop.post 
b/sys-process/audit/files/audit.rules.stop.post
new file mode 100644
index 00000000000..29ae197f18b
--- /dev/null
+++ b/sys-process/audit/files/audit.rules.stop.post
@@ -0,0 +1,12 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# This file contains the auditctl rules that are loaded immediately after the
+# audit deamon is stopped via the initscripts.
+# The rules are simply the parameters that would be passed
+# to auditctl.
+
+# Not used for the default Gentoo configuration as of v1.2.3
+# Paranoid security types might wish to reconfigure kauditd here.
+
+# vim:ft=conf:

diff --git a/sys-process/audit/files/audit.rules.stop.pre 
b/sys-process/audit/files/audit.rules.stop.pre
new file mode 100644
index 00000000000..1f34173369e
--- /dev/null
+++ b/sys-process/audit/files/audit.rules.stop.pre
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# This file contains the auditctl rules that are loaded immediately before the
+# audit deamon is stopped via the initscripts.
+# The rules are simply the parameters that would be passed
+# to auditctl.
+
+# auditd is stopping, don't capture events anymore
+-D
+
+# Disable kernel generating audit events
+-e 0
+
+# vim:ft=conf:

Reply via email to