commit: 7b784626d7ea683cdf32f7f2cfd0eefdc3f58bcf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 07:25:14 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 7 07:25:18 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b784626
sys-process/audit: treeclean (::gentoo works)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/audit/Manifest | 5 -
sys-process/audit/audit-2.7.1.ebuild | 232 --------------------
sys-process/audit/audit-2.8.3.ebuild | 232 --------------------
sys-process/audit/audit-2.8.4.ebuild | 233 ---------------------
sys-process/audit/audit-2.8.5-r1.ebuild | 219 -------------------
.../audit/files/audit-2.1.3-ia64-compile-fix.patch | 212 -------------------
sys-process/audit/files/audit-2.4.3-python.patch | 46 ----
sys-process/audit/files/audit-2.7.1-musl.patch | 173 ---------------
sys-process/audit/files/audit-2.7.1-swig.patch | 11 -
sys-process/audit/files/audit-2.8.2-musl.patch | 149 -------------
.../audit/files/audit-2.8.4-ia64-compile-fix.patch | 195 -----------------
.../audit-2.8.5-all-get-rid-of-strndupa.patch | 57 -----
...dit-2.8.5-auparse-remove-use-of-rawmemchr.patch | 33 ---
sys-process/audit/files/audit.rules | 24 ---
sys-process/audit/files/audit.rules-2.1.3 | 25 ---
sys-process/audit/files/audit.rules.stop.post | 12 --
sys-process/audit/files/audit.rules.stop.pre | 15 --
sys-process/audit/files/auditd-conf.d-2.1.3 | 22 --
sys-process/audit/files/auditd-init.d-2.4.3 | 90 --------
sys-process/audit/metadata.xml | 10 -
20 files changed, 1995 deletions(-)
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
deleted file mode 100644
index 27420864..00000000
--- a/sys-process/audit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B
60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f
SHA512
78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101
-DIST audit-2.7.1.tar.gz 1099083 BLAKE2B
10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f861f519867399d95e14f4809897637969de45566d62a73a35e5674260155773daf8de00481fcbd1b9c3138f96
SHA512
37964d81deee8608fde5f90d5d096727d3eb009e084be34749adcb0662e607e35c49c80bd83ce38b17161f11363b691721c8a8aa5dea832d320c53ab0ebb7483
-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_p80866dc78b5d.tar.gz 552094 BLAKE2B
adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4
SHA512
7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a
diff --git a/sys-process/audit/audit-2.7.1.ebuild
b/sys-process/audit/audit-2.7.1.ebuild
deleted file mode 100644
index 4290aaea..00000000
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc 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 "${FILESDIR}/${P}-musl.patch"
- eapply "${FILESDIR}/${P}-swig.patch"
- 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
-
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 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.3.ebuild
b/sys-process/audit/audit-2.8.3.ebuild
deleted file mode 100644
index fb634714..00000000
--- a/sys-process/audit/audit-2.8.3.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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="amd64 arm arm64 ~mips ppc 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 "${FILESDIR}/${PN}-2.8.2-musl.patch"
- eapply "${FILESDIR}/${PN}-2.7.1-swig.patch"
- 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
-
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 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/
-
- 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.4.ebuild
b/sys-process/audit/audit-2.8.4.ebuild
deleted file mode 100644
index da2cc197..00000000
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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="amd64 arm ~arm64 ~mips ~ppc 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 "${FILESDIR}/${PN}-2.8.2-musl.patch"
- eapply "${FILESDIR}/${PN}-2.7.1-swig.patch"
-
- # 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.8.4-ia64-compile-fix.patch
-
- # there is no --without-golang conf option
- sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
-
- eapply_user
-
- # 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
- 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
-
- fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 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/
-
- 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.5-r1.ebuild
b/sys-process/audit/audit-2.8.5-r1.ebuild
deleted file mode 100644
index 70467a61..00000000
--- a/sys-process/audit/audit-2.8.5-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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/";
-# https://github.com/linux-audit/audit-userspace/tree/2.8_maintenance
-COMMIT='80866dc78b5db17010516e24344eaed8dcc6fb99' # contains many fixes not
yet released
-if [[ -n $COMMIT ]]; then
-
SRC_URI="https://github.com/linux-audit/audit-userspace/archive/${COMMIT}.tar.gz
-> ${P}_p${COMMIT:0:12}.tar.gz"
- S="${WORKDIR}/audit-userspace-${COMMIT}"
-else
- SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
-fi
-# -fno-common patch:
-SRC_URI+="
https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch
-> ${PN}-017e6c6ab95df55f34e339d2139def83e5dada1f.patch"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 "${FILESDIR}/${PN}-2.8.5-auparse-remove-use-of-rawmemchr.patch"
- eapply "${FILESDIR}/${PN}-2.8.5-all-get-rid-of-strndupa.patch"
-
- # 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
-
- # audisp-remote moved in multilib_src_install_all
- sed -i \
- -e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
- "${S}"/audisp/plugins/remote/au-remote.conf || die
-
- # 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.8.4-ia64-compile-fix.patch
-
- # there is no --without-golang conf option
- sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
-
- # -fno-common
- eapply "${DISTDIR}/${PN}-017e6c6ab95df55f34e339d2139def83e5dada1f.patch"
-
- eapply_user
-
- # Regenerate autotooling
- eautoreconf
-}
-
-multilib_src_configure() {
- local ECONF_SOURCE=${S}
- local my_conf="$(use_enable ldap zos-remote)"
- econf \
- ${my_conf} \
- --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
-
- econf ${my_conf} --without-python --with-python3
- }
-
- 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() {
- 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" \
- USE_PYTHON3=true
- emake -C "${BUILD_DIR}"/bindings/python/python3 \
-
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
-
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- USE_PYTHON3=true
- }
-
- 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() {
- 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" \
- USE_PYTHON3=true \
- DESTDIR="${D}" install
- emake -C "${BUILD_DIR}"/bindings/python/python3 \
-
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
-
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- USE_PYTHON3=true \
- 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
- 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
deleted file mode 100644
index 3ec60fbc..00000000
--- a/sys-process/audit/files/audit-2.1.3-ia64-compile-fix.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-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 <[email protected]>
- */
- #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-2.4.3-python.patch
b/sys-process/audit/files/audit-2.4.3-python.patch
deleted file mode 100644
index 7b9ea53e..00000000
--- a/sys-process/audit/files/audit-2.4.3-python.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur audit-2.4.3.orig/bindings/python/python2/Makefile.am
audit-2.4.3/bindings/python/python2/Makefile.am
---- audit-2.4.3.orig/bindings/python/python2/Makefile.am 2015-07-22
23:35:24.315424091 +0800
-+++ audit-2.4.3/bindings/python/python2/Makefile.am 2015-07-22
23:37:16.861510504 +0800
-@@ -29,5 +29,6 @@
-
- auparse_la_SOURCES = $(top_srcdir)/bindings/python/auparse_python.c
- auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS)
--auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+auparse_la_CFLAGS = -shared
-+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- auparse_la_LIBADD = ${top_builddir}/auparse/libauparse.la
${top_builddir}/lib/libaudit.la
-diff -ur audit-2.4.3.orig/bindings/python/python3/Makefile.am
audit-2.4.3/bindings/python/python3/Makefile.am
---- audit-2.4.3.orig/bindings/python/python3/Makefile.am 2015-07-22
23:35:24.315424091 +0800
-+++ audit-2.4.3/bindings/python/python3/Makefile.am 2015-07-22
23:37:30.395400641 +0800
-@@ -28,5 +28,6 @@
-
- auparse_la_SOURCES = $(top_srcdir)/bindings/python/auparse_python.c
- auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS)
--auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+auparse_la_CFLAGS = -shared
-+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- auparse_la_LIBADD = ${top_builddir}/auparse/libauparse.la
${top_builddir}/lib/libaudit.la
-diff -ur audit-2.4.3.orig/bindings/swig/python/Makefile.am
audit-2.4.3/bindings/swig/python/Makefile.am
---- audit-2.4.3.orig/bindings/swig/python/Makefile.am 2015-07-22
23:35:24.316424083 +0800
-+++ audit-2.4.3/bindings/swig/python/Makefile.am 2015-07-22
23:35:53.244189263 +0800
-@@ -28,7 +28,7 @@
- pyexec_LTLIBRARIES = _audit.la
- pyexec_SOLIBRARIES = _audit.so
- _audit_la_CFLAGS = -shared
--_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- _audit_la_HEADERS: $(top_builddir)/config.h
- _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h
${top_builddir}/lib/libaudit.la
- _audit_la_LIBADD = $(top_builddir)/lib/libaudit.la
-diff -ur audit-2.4.3.orig/bindings/swig/python3/Makefile.am
audit-2.4.3/bindings/swig/python3/Makefile.am
---- audit-2.4.3.orig/bindings/swig/python3/Makefile.am 2015-07-22
23:35:24.316424083 +0800
-+++ audit-2.4.3/bindings/swig/python3/Makefile.am 2015-07-22
23:36:27.833908482 +0800
-@@ -29,7 +29,7 @@
- py3exec_LTLIBRARIES = _audit.la
- py3exec_SOLIBRARIES = _audit.so
- _audit_la_CFLAGS = -shared
--_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
-+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
- _audit_la_HEADERS: $(top_builddir)/config.h
- _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h
${top_builddir}/lib/libaudit.la
- _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la
diff --git a/sys-process/audit/files/audit-2.7.1-musl.patch
b/sys-process/audit/files/audit-2.7.1-musl.patch
deleted file mode 100644
index 099f9855..00000000
--- a/sys-process/audit/files/audit-2.7.1-musl.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From db5c09f7995a27555a10418648d9dc7e1e8bb94b Mon Sep 17 00:00:00 2001
-From: Luis Ressel <[email protected]>
-Date: Mon, 13 Nov 2017 07:33:35 +0100
-Subject: [PATCH] Musl compability
-
-A couple of header fixes, one occurrence of rawmemchr() and three of
-strndupa().
----
- audisp/audispd.c | 4 +++-
- auparse/auparse.c | 13 +++++++++++--
- auparse/interpret.c | 2 +-
- lib/libaudit.c | 2 +-
- lib/netlink.c | 2 +-
- src/auditctl.c | 1 +
- src/auditd.c | 9 +++++++--
- src/ausearch-lol.c | 13 +++++++++++--
- 8 files changed, 36 insertions(+), 10 deletions(-)
-
-diff --git a/audisp/audispd.c b/audisp/audispd.c
-index 9831cf3..0720814 100644
---- a/audisp/audispd.c
-+++ b/audisp/audispd.c
-@@ -31,7 +31,9 @@
- #include <pthread.h>
- #include <dirent.h>
- #include <fcntl.h>
--#include <sys/poll.h>
-+#include <limits.h>
-+#include <poll.h>
-+#include <sys/uio.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-
-diff --git a/auparse/auparse.c b/auparse/auparse.c
-index 2812028..a5d8c9e 100644
---- a/auparse/auparse.c
-+++ b/auparse/auparse.c
-@@ -1090,10 +1090,19 @@ static int extract_timestamp(const char *b, au_event_t
*e)
- int rc = 1;
-
- e->host = NULL;
-+ char _tmp[341];
- if (*b == 'n')
-- tmp = strndupa(b, 340);
-+ {
-+ strncpy(_tmp, b, 340);
-+ _tmp[340] = '\0';
-+ tmp = _tmp;
-+ }
- else
-- tmp = strndupa(b, 80);
-+ {
-+ strncpy(_tmp, b, 80);
-+ _tmp[80] = '\0';
-+ tmp = _tmp;
-+ }
- ptr = audit_strsplit(tmp);
- if (ptr) {
- // Optionally grab the node - may or may not be included
-diff --git a/auparse/interpret.c b/auparse/interpret.c
-index 071c4ef..ba38199 100644
---- a/auparse/interpret.c
-+++ b/auparse/interpret.c
-@@ -803,7 +803,7 @@ static const char *print_proctitle(const char *val)
- size_t len = strlen(val) / 2;
- const char *end = out + len;
- char *ptr = out;
-- while ((ptr = rawmemchr(ptr, '\0'))) {
-+ while ((ptr = memchr(ptr, '\0', SIZE_MAX))) {
- if (ptr >= end)
- break;
- *ptr = ' ';
-diff --git a/lib/libaudit.c b/lib/libaudit.c
-index f434d4a..bd679a5 100644
---- a/lib/libaudit.c
-+++ b/lib/libaudit.c
-@@ -32,7 +32,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/utsname.h>
- #include <sys/stat.h>
- #include <fcntl.h> /* O_NOFOLLOW needs gnu defined */
-diff --git a/lib/netlink.c b/lib/netlink.c
-index 90c79b9..9486560 100644
---- a/lib/netlink.c
-+++ b/lib/netlink.c
-@@ -27,7 +27,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include "libaudit.h"
- #include "private.h"
-
-diff --git a/src/auditctl.c b/src/auditctl.c
-index 81000ee..6415264 100644
---- a/src/auditctl.c
-+++ b/src/auditctl.c
-@@ -34,6 +34,7 @@
- #include <sys/utsname.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <sys/select.h>
- #include <libgen.h> /* For basename */
- #include <limits.h> /* PATH_MAX */
- #include "libaudit.h"
-diff --git a/src/auditd.c b/src/auditd.c
-index 3f0162d..535207d 100644
---- a/src/auditd.c
-+++ b/src/auditd.c
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <time.h>
-+#include <alloca.h>
- #include <sys/resource.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-@@ -185,7 +186,9 @@ static void child_handler2( int sig )
-
- static int extract_type(const char *str)
- {
-- const char *tptr, *ptr2, *ptr = str;
-+ const char *ptr2, *ptr = str;
-+ char *tptr;
-+
- if (*str == 'n') {
- ptr = strchr(str+1, ' ');
- if (ptr == NULL)
-@@ -195,7 +198,9 @@ static int extract_type(const char *str)
- // ptr should be at 't'
- ptr2 = strchr(ptr, ' ');
- // get type=xxx in a buffer
-- tptr = strndupa(ptr, ptr2 - ptr);
-+ tptr = (char *) alloca(ptr2 - ptr + 1);
-+ strncpy(tptr, ptr, ptr2 - ptr);
-+ tptr[ptr2 - ptr] = '\0';
- // find =
- str = strchr(tptr, '=');
- if (str == NULL)
-diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c
-index b1aec06..bb9330d 100644
---- a/src/ausearch-lol.c
-+++ b/src/ausearch-lol.c
-@@ -135,10 +135,19 @@ static int extract_timestamp(const char *b, event *e)
- char *ptr, *tmp, *tnode, *ttype;
-
- e->node = NULL;
-+ char _tmp[341];
- if (*b == 'n')
-- tmp = strndupa(b, 340);
-+ {
-+ strncpy(_tmp, b, 340);
-+ _tmp[340] = '\0';
-+ tmp = _tmp;
-+ }
- else
-- tmp = strndupa(b, 80);
-+ {
-+ strncpy(_tmp, b, 80);
-+ _tmp[80] = '\0';
-+ tmp = _tmp;
-+ }
- ptr = audit_strsplit(tmp);
- if (ptr) {
- // Check to see if this is the node info
---
-2.15.0
-
diff --git a/sys-process/audit/files/audit-2.7.1-swig.patch
b/sys-process/audit/files/audit-2.7.1-swig.patch
deleted file mode 100644
index f76b9b0e..00000000
--- a/sys-process/audit/files/audit-2.7.1-swig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i
-index 356a5ab..41bdc6d 100644
---- a/bindings/swig/src/auditswig.i
-+++ b/bindings/swig/src/auditswig.i
-@@ -41,6 +41,5 @@ typedef unsigned __u32;
- typedef unsigned uid_t;
- %include "/usr/include/linux/audit.h"
- #define __extension__ /*nothing*/
--%include "/usr/include/stdint.h"
- %include "../lib/libaudit.h"
-
diff --git a/sys-process/audit/files/audit-2.8.2-musl.patch
b/sys-process/audit/files/audit-2.8.2-musl.patch
deleted file mode 100644
index e48b42ba..00000000
--- a/sys-process/audit/files/audit-2.8.2-musl.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Naur audit-2.8.2.orig/audisp/audispd.c audit-2.8.2/audisp/audispd.c
---- audit-2.8.2.orig/audisp/audispd.c 2018-03-11 17:16:39.363923401 -0700
-+++ audit-2.8.2/audisp/audispd.c 2018-03-11 17:17:35.163922402 -0700
-@@ -31,7 +31,9 @@
- #include <pthread.h>
- #include <dirent.h>
- #include <fcntl.h>
--#include <sys/poll.h>
-+#include <limits.h>
-+#include <poll.h>
-+#include <sys/uio.h>
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <limits.h>
-diff -Naur audit-2.8.2.orig/auparse/auparse.c audit-2.8.2/auparse/auparse.c
---- audit-2.8.2.orig/auparse/auparse.c 2018-03-11 17:16:39.356923401 -0700
-+++ audit-2.8.2/auparse/auparse.c 2018-03-11 17:19:15.311920608 -0700
-@@ -1104,13 +1104,22 @@
- static int extract_timestamp(const char *b, au_event_t *e)
- {
- char *ptr, *tmp;
-+ char _tmp[341];
- int rc = 1;
-
- e->host = NULL;
- if (*b == 'n')
-- tmp = strndupa(b, 340);
-+ {
-+ strncpy(_tmp, b, 340);
-+ _tmp[340] = '\0';
-+ tmp = _tmp;
-+ }
- else
-- tmp = strndupa(b, 80);
-+ {
-+ strncpy(_tmp, b, 80);
-+ _tmp[80] = '\0';
-+ tmp = _tmp;
-+ }
- ptr = audit_strsplit(tmp);
- if (ptr) {
- // Optionally grab the node - may or may not be included
-diff -Naur audit-2.8.2.orig/auparse/interpret.c audit-2.8.2/auparse/interpret.c
---- audit-2.8.2.orig/auparse/interpret.c 2018-03-11 17:16:39.359923401
-0700
-+++ audit-2.8.2/auparse/interpret.c 2018-03-11 17:19:51.658919957 -0700
-@@ -860,7 +860,7 @@
- // Proctitle has arguments separated by NUL bytes
- // We need to write over the NUL bytes with a space
- // so that we can see the arguments
-- while ((ptr = rawmemchr(ptr, '\0'))) {
-+ while ((ptr = memchr(ptr, '\0', SIZE_MAX))) {
- if (ptr >= end)
- break;
- *ptr = ' ';
-diff -Naur audit-2.8.2.orig/lib/libaudit.c audit-2.8.2/lib/libaudit.c
---- audit-2.8.2.orig/lib/libaudit.c 2018-03-11 17:16:39.336923401 -0700
-+++ audit-2.8.2/lib/libaudit.c 2018-03-11 17:20:03.037919753 -0700
-@@ -33,7 +33,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/utsname.h>
- #include <sys/stat.h>
- #include <fcntl.h> /* O_NOFOLLOW needs gnu defined */
-diff -Naur audit-2.8.2.orig/lib/netlink.c audit-2.8.2/lib/netlink.c
---- audit-2.8.2.orig/lib/netlink.c 2018-03-11 17:16:39.339923401 -0700
-+++ audit-2.8.2/lib/netlink.c 2018-03-11 17:20:13.132919573 -0700
-@@ -27,7 +27,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include "libaudit.h"
- #include "private.h"
-
-diff -Naur audit-2.8.2.orig/src/auditctl.c audit-2.8.2/src/auditctl.c
---- audit-2.8.2.orig/src/auditctl.c 2018-03-11 17:16:39.348923401 -0700
-+++ audit-2.8.2/src/auditctl.c 2018-03-11 17:20:31.154919250 -0700
-@@ -37,6 +37,7 @@
- #include <sys/time.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <sys/select.h>
- #include <libgen.h> /* For basename */
- #include <limits.h> /* PATH_MAX */
- #include "libaudit.h"
-diff -Naur audit-2.8.2.orig/src/auditd.c audit-2.8.2/src/auditd.c
---- audit-2.8.2.orig/src/auditd.c 2018-03-11 17:16:39.351923401 -0700
-+++ audit-2.8.2/src/auditd.c 2018-03-11 17:22:04.763917574 -0700
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <time.h>
-+#include <alloca.h>
- #include <sys/resource.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-@@ -187,7 +188,9 @@
-
- static int extract_type(const char *str)
- {
-- const char *tptr, *ptr2, *ptr = str;
-+ const char *ptr2, *ptr = str;
-+ char *tptr;
-+
- if (*str == 'n') {
- ptr = strchr(str+1, ' ');
- if (ptr == NULL)
-@@ -197,7 +200,9 @@
- // ptr should be at 't'
- ptr2 = strchr(ptr, ' ');
- // get type=xxx in a buffer
-- tptr = strndupa(ptr, ptr2 - ptr);
-+ tptr = (char *) alloca(ptr2 - ptr + 1);
-+ strncpy(tptr, ptr, ptr2 - ptr);
-+ tptr[ptr2 - ptr] = '\0';
- // find =
- str = strchr(tptr, '=');
- if (str == NULL)
-diff -Naur audit-2.8.2.orig/src/ausearch-lol.c audit-2.8.2/src/ausearch-lol.c
---- audit-2.8.2.orig/src/ausearch-lol.c 2018-03-11 17:16:39.351923401
-0700
-+++ audit-2.8.2/src/ausearch-lol.c 2018-03-11 17:23:30.575916037 -0700
-@@ -135,12 +135,21 @@
- static int extract_timestamp(const char *b, event *e)
- {
- char *ptr, *tmp, *tnode, *ttype;
-+ char _tmp[341];
-
- e->node = NULL;
- if (*b == 'n')
-- tmp = strndupa(b, 340);
-+ {
-+ strncpy(_tmp, b, 340);
-+ _tmp[340] = '\0';
-+ tmp = _tmp;
-+ }
- else
-- tmp = strndupa(b, 80);
-+ {
-+ strncpy(_tmp, b, 80);
-+ _tmp[80] = '\0';
-+ tmp = _tmp;
-+ }
- ptr = audit_strsplit(tmp);
- if (ptr) {
- // Check to see if this is the node info
diff --git a/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch
b/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch
deleted file mode 100644
index ef04f720..00000000
--- a/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch
+++ /dev/null
@@ -1,195 +0,0 @@
---- a/audisp/audispd.c
-+++ b/audisp/audispd.c
-@@ -21,6 +21,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <unistd.h>
- #include <stdlib.h>
---- a/audisp/plugins/prelude/audisp-prelude.c
-+++ b/audisp/plugins/prelude/audisp-prelude.c
-@@ -21,6 +21,8 @@
- *
- */
-
-+#include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <signal.h>
---- a/audisp/plugins/remote/audisp-remote.c
-+++ b/audisp/plugins/remote/audisp-remote.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <signal.h>
- #include <syslog.h>
---- a/configure.ac
-+++ b/configure.ac
-@@ -216,6 +216,9 @@ AC_ARG_ENABLE(zos-remote,
- AM_CONDITIONAL(ENABLE_ZOS_REMOTE, test "x$enable_zos_remote" != "xno")
- AC_MSG_RESULT($enable_zos_remote)
-
-+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@:>@])],
---- a/contrib/plugin/audisp-example.c
-+++ b/contrib/plugin/audisp-example.c
-@@ -37,6 +37,8 @@
- */
-
- #define _GNU_SOURCE
-+#include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <signal.h>
- #include <string.h>
---- a/contrib/skeleton.c
-+++ b/contrib/skeleton.c
-@@ -13,6 +13,8 @@
- * gcc skeleton.c -o skeleton -laudit
- */
-
-+#include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/uio.h>
---- /dev/null
-+++ b/lib/fixup.h
-@@ -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
---- a/src/auditctl.c
-+++ b/src/auditctl.c
-@@ -23,6 +23,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdbool.h>
---- a/src/auditd-config.c
-+++ b/src/auditd-config.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/stat.h>
---- a/src/auditd-dispatch.c
-+++ b/src/auditd-dispatch.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <unistd.h>
- #include <sys/uio.h>
- #include <fcntl.h>
---- a/src/auditd-event.c
-+++ b/src/auditd-event.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdlib.h>
- #include <unistd.h>
- #include <pthread.h>
---- a/src/auditd-listen.c
-+++ b/src/auditd-listen.c
-@@ -23,6 +23,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/stat.h>
---- a/src/auditd-reconfig.c
-+++ b/src/auditd-reconfig.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <pthread.h>
- #include <signal.h>
- #include <stdlib.h>
---- a/src/auditd-sendmail.c
-+++ b/src/auditd-sendmail.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <unistd.h> // for access()
- #include <string.h>
---- a/src/auditd.c
-+++ b/src/auditd.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <sys/types.h>
- #include <unistd.h>
---- a/src/ausearch.c
-+++ b/src/ausearch.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <stdio_ext.h>
- #include <string.h>
---- a/src/autrace.c
-+++ b/src/autrace.c
-@@ -21,6 +21,7 @@
- */
-
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <string.h>
- #include <sys/wait.h>
---- a/src/delete_all.c
-+++ b/src/delete_all.c
-@@ -20,6 +20,7 @@
- * Steve Grubb <[email protected]>
- */
- #include "config.h"
-+#include "fixup.h"
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
diff --git a/sys-process/audit/files/audit-2.8.5-all-get-rid-of-strndupa.patch
b/sys-process/audit/files/audit-2.8.5-all-get-rid-of-strndupa.patch
deleted file mode 100644
index c53dec66..00000000
--- a/sys-process/audit/files/audit-2.8.5-all-get-rid-of-strndupa.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 38d950e468c1e51937530f884b138076e4897da2 Mon Sep 17 00:00:00 2001
-From: Tycho Andersen <[email protected]>
-Date: Mon, 13 Mar 2017 16:40:08 -0700
-Subject: [PATCH 3/4] all: get rid of strndupa
-
-in one case (src/auditd.c) we don't even need to allocate a buffer, in the
-other two we do it in two steps to avoid using a non-standard function.
-
-Signed-off-by: Tycho Andersen <[email protected]>
----
- auparse/auparse.c | 6 ++++--
- src/auditd.c | 10 +++++-----
- src/ausearch-lol.c | 6 ++++--
- 3 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/auparse/auparse.c b/auparse/auparse.c
-index 058f544..f61d204 100644
---- a/auparse/auparse.c
-+++ b/auparse/auparse.c
-@@ -1102,10 +1102,12 @@ static int extract_timestamp(const char *b, au_event_t
*e)
- int rc = 1;
-
- e->host = NULL;
-+
-+ tmp = alloca(340);
- if (*b == 'n')
-- tmp = strndupa(b, 340);
-+ tmp = strncpy(tmp, b, 340);
- else
-- tmp = strndupa(b, 80);
-+ tmp = strncpy(tmp, b, 80);
- ptr = audit_strsplit(tmp);
- if (ptr) {
- // Optionally grab the node - may or may not be included
-diff --git a/src/ausearch-lol.c b/src/ausearch-lol.c
-index 29d0a32..3a2e5e8 100644
---- a/src/ausearch-lol.c
-+++ b/src/ausearch-lol.c
-@@ -135,10 +135,12 @@ static int extract_timestamp(const char *b, event *e)
- char *ptr, *tmp, *tnode, *ttype;
-
- e->node = NULL;
-+
-+ tmp = alloca(340);
- if (*b == 'n')
-- tmp = strndupa(b, 340);
-+ tmp = strncpy(tmp, b, 340);
- else
-- tmp = strndupa(b, 80);
-+ tmp = strncpy(tmp, b, 80);
- ptr = audit_strsplit(tmp);
- if (ptr) {
- // Check to see if this is the node info
---
-2.13.1
-
-
diff --git
a/sys-process/audit/files/audit-2.8.5-auparse-remove-use-of-rawmemchr.patch
b/sys-process/audit/files/audit-2.8.5-auparse-remove-use-of-rawmemchr.patch
deleted file mode 100644
index ae2ce829..00000000
--- a/sys-process/audit/files/audit-2.8.5-auparse-remove-use-of-rawmemchr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8f2a6788b78dd6b219545aacbd42e2f84df8c71a Mon Sep 17 00:00:00 2001
-From: Tycho Andersen <[email protected]>
-Date: Mon, 13 Mar 2017 16:17:10 -0700
-Subject: [PATCH 2/4] auparse: remove use of rawmemchr
-
-just iterate over the string instead, it's much simpler and doesn't use a
-glibc extension.
-
-Signed-off-by: Tycho Andersen <[email protected]>
----
- auparse/interpret.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/auparse/interpret.c b/auparse/interpret.c
-index ea17c41..75b7679 100644
---- a/auparse/interpret.c
-+++ b/auparse/interpret.c
-@@ -819,10 +819,9 @@ static const char *print_proctitle(const char *val)
- // Proctitle has arguments separated by NUL bytes
- // We need to write over the NUL bytes with a space
- // so that we can see the arguments
-- while ((ptr = rawmemchr(ptr, '\0'))) {
-- if (ptr >= end)
-- break;
-- *ptr = ' ';
-+ while (ptr < end) {
-+ if (*ptr == '\0')
-+ *ptr = ' ';
- ptr++;
- }
- }
---
-2.13.1
diff --git a/sys-process/audit/files/audit.rules
b/sys-process/audit/files/audit.rules
deleted file mode 100644
index ef0e6ee2..00000000
--- a/sys-process/audit/files/audit.rules
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-2.1.3
b/sys-process/audit/files/audit.rules-2.1.3
deleted file mode 100644
index 25dbedfd..00000000
--- a/sys-process/audit/files/audit.rules-2.1.3
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
-# 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 exit,never -F arch=b32 -S read -S write -S open -S fstat -S mmap -S brk -S
munmap -S nanosleep -S fcntl -S close -S dup2 -S rt_sigaction -S stat
--a exit,never -F arch=b64 -S read -S write -S open -S fstat -S mmap -S brk -S
munmap -S nanosleep -S fcntl -S close -S dup2 -S rt_sigaction -S stat
-
-# The following rule would cause the capture of all systems not caught above.
-# -a exit,always -S all
-
-# Increase the buffers to survive stress events
--b 8192
-
-# vim:ft=conf:
diff --git a/sys-process/audit/files/audit.rules.stop.post
b/sys-process/audit/files/audit.rules.stop.post
deleted file mode 100644
index 29ae197f..00000000
--- a/sys-process/audit/files/audit.rules.stop.post
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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
deleted file mode 100644
index 1f341733..00000000
--- a/sys-process/audit/files/audit.rules.stop.pre
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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:
diff --git a/sys-process/audit/files/auditd-conf.d-2.1.3
b/sys-process/audit/files/auditd-conf.d-2.1.3
deleted file mode 100644
index c66be166..00000000
--- a/sys-process/audit/files/auditd-conf.d-2.1.3
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Configuration options for auditd
-# -f for foreground mode
-# There are some other options as well, but you'll have to look in the source
-# code to find them as they aren't ready for use yet.
-EXTRAOPTIONS=''
-
-# Audit rules file to run after starting auditd
-RULEFILE_STARTUP=/etc/audit/audit.rules
-
-# Audit rules file to run before and after stopping auditd
-RULEFILE_STOP_PRE=/etc/audit/audit.rules.stop.pre
-RULEFILE_STOP_POST=/etc/audit/audit.rules.stop.post
-
-# If you want to enforce a certain locale for auditd,
-# uncomment one of the next lines:
-#AUDITD_LANG=none
-AUDITD_LANG=C
-#AUDITD_LANG=en_US
-#AUDITD_LANG=en_US.UTF-8
diff --git a/sys-process/audit/files/auditd-init.d-2.4.3
b/sys-process/audit/files/auditd-init.d-2.4.3
deleted file mode 100644
index c952554d..00000000
--- a/sys-process/audit/files/auditd-init.d-2.4.3
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands='reload reload_auditd reload_rules'
-description='Linux Auditing System'
-description_reload='Reload daemon configuration and rules'
-description_reload_rules='Reload daemon rules'
-description_reload_auditd='Reload daemon configuration'
-
-name='auditd'
-pidfile='/var/run/auditd.pid'
-command='/sbin/auditd'
-
-start_auditd() {
- # Env handling taken from the upstream init script
- if [ -z "$AUDITD_LANG" -o "$AUDITD_LANG" = "none" -o "$AUDITD_LANG" =
"NONE" ]; then
- unset LANG LC_TIME LC_ALL LC_MESSAGES LC_NUMERIC LC_MONETARY
LC_COLLATE
- else
- LANG="$AUDITD_LANG"
- LC_TIME="$AUDITD_LANG"
- LC_ALL="$AUDITD_LANG"
- LC_MESSAGES="$AUDITD_LANG"
- LC_NUMERIC="$AUDITD_LANG"
- LC_MONETARY="$AUDITD_LANG"
- LC_COLLATE="$AUDITD_LANG"
- export LANG LC_TIME LC_ALL LC_MESSAGES LC_NUMERIC LC_MONETARY
LC_COLLATE
- fi
- unset HOME MAIL USER USERNAME
-
- ebegin "Starting ${name}"
- start-stop-daemon \
- --start --quiet --pidfile ${pidfile} \
- --exec ${command} -- ${EXTRAOPTIONS}
- local ret=$?
- eend $ret
- return $ret
-}
-
-stop_auditd() {
- ebegin "Stopping ${name}"
- start-stop-daemon --stop --quiet --pidfile ${pidfile}
- local ret=$?
- eend $ret
- return $ret
-}
-
-loadfile() {
- local rules="$1"
- if [ -n "${rules}" -a -f "${rules}" ]; then
- einfo "Loading audit rules from ${rules}"
- /sbin/auditctl -R "${rules}" >/dev/null
- return $?
- else
- return 0
- fi
-}
-
-start() {
- start_auditd
- local ret=$?
- if [ $ret -eq 0 -a "${RC_CMD}" != "restart" ]; then
- loadfile "${RULEFILE_STARTUP}"
- fi
- return $ret
-}
-
-reload_rules() {
- loadfile "${RULEFILE_STARTUP}"
-}
-
-reload_auditd() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP \
- --exec "${command}" --pidfile "${pidfile}"
- eend $?
-}
-
-reload() {
- reload_auditd
- reload_rules
-}
-
-stop() {
- [ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_PRE}"
- stop_auditd
- local ret=$?
- [ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_POST}"
- return $ret
-}
diff --git a/sys-process/audit/metadata.xml b/sys-process/audit/metadata.xml
deleted file mode 100644
index 4d788155..00000000
--- a/sys-process/audit/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>[email protected]</email>
- </maintainer>
- <use>
- <flag name="gssapi">Enable GSSAPI support</flag>
- </use>
-</pkgmetadata>
