From 4d5ea0d6666f483fde1e95ac8790b53df1fd786f Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Mon, 6 Jul 2020 08:50:33 +0300 Subject: [PATCH] add sys-process/audit-2.8.4 with python 3.7 support --- sys-process/audit/Manifest | 15 ++ sys-process/audit/audit-2.8.4-r1.ebuild | 233 ++++++++++++++++++ .../files/audit-2.1.3-ia64-compile-fix.patch | 212 ++++++++++++++++ .../audit/files/audit-2.4.3-python.patch | 46 ++++ .../audit/files/audit-2.7.1-musl.patch | 173 +++++++++++++ .../audit/files/audit-2.7.1-swig.patch | 11 + .../audit/files/audit-2.8.2-musl.patch | 149 +++++++++++ .../files/audit-2.8.4-ia64-compile-fix.patch | 195 +++++++++++++++ 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 + 15 files changed, 1232 insertions(+) create mode 100644 sys-process/audit/Manifest create mode 100644 sys-process/audit/audit-2.8.4-r1.ebuild create mode 100644 sys-process/audit/files/audit-2.1.3-ia64-compile-fix.patch create mode 100644 sys-process/audit/files/audit-2.4.3-python.patch create mode 100644 sys-process/audit/files/audit-2.7.1-musl.patch create mode 100644 sys-process/audit/files/audit-2.7.1-swig.patch create mode 100644 sys-process/audit/files/audit-2.8.2-musl.patch create mode 100644 sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch create mode 100644 sys-process/audit/files/audit.rules create mode 100644 sys-process/audit/files/audit.rules-2.1.3 create mode 100644 sys-process/audit/files/audit.rules.stop.post create mode 100644 sys-process/audit/files/audit.rules.stop.pre create mode 100644 sys-process/audit/files/auditd-conf.d-2.1.3 create mode 100644 sys-process/audit/files/auditd-init.d-2.4.3 create mode 100644 sys-process/audit/metadata.xml diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest new file mode 100644 index 0000000..3cf4430 --- /dev/null +++ b/sys-process/audit/Manifest @@ -0,0 +1,15 @@ +AUX audit-2.1.3-ia64-compile-fix.patch 7173 BLAKE2B 0bd30fd04a6c65792d068d96134ba5ccb7f2af85ab060924a9443a9a74df8407cf87012353d8005cf767f24a76993aa9f89b416dd6a616caa300b091b0c88004 SHA512 be1f0fd8933e962b11818bace04a14f89afd40c20d9e3ecc839c210fc946e851bb8ba0ce0eae9267023397f77c5a1a3c8b574b9285c0351f534a24f5c9a2a512 +AUX audit-2.4.3-python.patch 2768 BLAKE2B 374fb16cf85d4ee8bb108f6af1b045e140855fbb35527531adbf51dd8392069c3a3c3393e0b9bde892a8f8492b2e1845b89d7d9f801e26934150d7c05973ea2a SHA512 97c1f2eda07f3d986bab161d299f2cf110c1fdc76b889013748812ee7e33ece0fd6d3f34296d5d875db8c966d7fe77c57e2214c0cf6592beb48e462a504c1d70 +AUX audit-2.7.1-musl.patch 4360 BLAKE2B 172f14ba137ee62707e26a94fc43784e854dcf7869f663801eadf62743897134a3c4bee82c1a23e9d520881e0565d04b3c6b5c96d3be7d835631f1f21b376203 SHA512 570986a15405f025fa1eb2b6aa409cf96376f2d4d408a0f6d3b8f33de0ad72ddc2a9c73bbecee17028ce63929064b5df1b867f0a8c6a267e40b046561e1563d5 +AUX audit-2.7.1-swig.patch 384 BLAKE2B c915741982cdd1934d42f7667034418912621b481741c8ea26be5a113036f4c9485c803ef1172dac97f877079498dd46e2e8464bcb7b195879cf05555055f093 SHA512 a206088b4006cf98d7a6c33c54f0db7d2c66d5effdb25e24b31bb02046e9706547080cf578533b106ebe888ed780560d2de8b4fe4bd4e81d29a007c4a64fbec8 +AUX audit-2.8.2-musl.patch 4478 BLAKE2B eb93c8c46ca7a72460bd52247f39451650165b69788d074e16eae4f373028579eaaa6ccce2360f4842f8ef00df9810ae28c3ca45bc122eeeac4999b62b7646b1 SHA512 9d07639f0fbc10a9b5a546b5673fd88de9cc38d2ee001667016a7e58b78c25ed96b43fca0ce3a18d0c99f6514ed1f8a4c8881889933c0bebeee78b9ea015bc14 +AUX audit-2.8.4-ia64-compile-fix.patch 4000 BLAKE2B df10ca3a5da69b70617c5914b336a83f04de74051109f31836b955ab6756dc9ee7122677efcad1fe88df08a7c009ec012a4d1f9100f96677df69ddf8d53d770e SHA512 6ccff74fbc1591bd3630140e06be66ec78dd3db129d50b65b4fa5e3ea9dc3adf3c4ac51f49fbc72ff1c3181702912b25528cf0c56e797ded9da349de0cc8d338 +AUX audit.rules 886 BLAKE2B ebb2fab57467eee38040d4dde68b9ab0cbbf08af9c3115d7cba74019035cf0fbffd9e21a77064206d13f737eadc58e8ba1da2bcb3605b5efec183e262b0e37eb SHA512 070e51d8182f84385bacb0801b8d0f390f560a650b9b94b74fd5f30fdf9fb2d2ae38bd29e70e2d38a26a6188a5bc3a74d732a84d0a46de926ada692ddd19cbe0 +AUX audit.rules-2.1.3 1009 BLAKE2B df40176208bd68cb9021d15ea5803bb0d1c768c9d6400036a69409e1aae3ad55b89983ed94f22a6399a9cec8fc3dc7b20a7b27e75cdea24edda92b95ee19af87 SHA512 bce3ee9aaa0ab48395e6e10ee9b3627d6b7a8083abefdc4009de26649c65a39e000078f799e8c3c9e3341dfa030c6dfbbcad2fb7756fbb3d01b27be078adecec +AUX audit.rules.stop.post 452 BLAKE2B b10d6d6c0fa475998856e674bd5c8dc0d7ca8f1d676a684223f48d1b22ce90441b2970c02b0eab882b3d3059f2b350d8a34109b03f5457f709624dccb3722e82 SHA512 a7bc52cbbea278a38e2837149524bb21b2c5367c96ed07fe576e08322595c5bee57ff07f8ebecd17391d9c3abe1ba187ac6e39400a153bf0ace4257303d036d3 +AUX audit.rules.stop.pre 427 BLAKE2B ddf4ac16c3e1fd401c266287e792865adf8f4dd0b4bbaea6f991bf8dcee69c8ecd69c93d0cbd8352e280c3c61d24de23ca89f700e383c79036526e59c311c004 SHA512 def5ef378ad554f38754839d1c00c598686645a59896e37a3c7ff07b00aaa05a2b92305e49a750358eaba63a7d48fb647472529b155301069771678eed272463 +AUX auditd-conf.d-2.1.3 734 BLAKE2B 018677362bc82c2052885cdd0e2185050cf5e97722ead4acdc51d428b52c265317c7dd03d1459be38b781e78f857cd967e5a60b68360c3381c31c62e1d61d843 SHA512 69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 +AUX auditd-init.d-2.4.3 2054 BLAKE2B 20e68ab676c925b8567a7e9a12d2ac055fd90477cbbd6444136b7198828798f7b6428948503c344639fab5fea54962682be7c986950c2cbae8b7c9dfeb321a4b SHA512 1b48c248db5d34f148f9c79f8b2a6acbf61c729230341b861f5e331bbfb0c8356305a09eb2cc5c82c14c4fd9a13c7c13957e1ed493834b8b3b9ee38978e4c31f +DIST audit-2.8.4.tar.gz 1123889 BLAKE2B b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42 SHA512 5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a +EBUILD audit-2.8.4-r1.ebuild 6258 BLAKE2B a94a8b463ce7b508cce8ab003920c877e7ad8877bcd3a342dda606a64b0f29ff86d672965c0dbd761702cbac91707b6df754cf59d403fd17a8a02ab211791041 SHA512 a85de8b32c92537bdc66283d0892853a858a35e3380cc658adf49ba9e032175f97ea072344e6a2ce0d645601962462dec1cc15161406aa7015464a19e3bb50c2 +MISC metadata.xml 284 BLAKE2B c99c67d5591687a10bb380f1264dd1cde6370ff3a96864093cb41c7c17617bed826652b7651490b6a4634a7429589bbd137402afd7cf8e79cfd5f636c86baa52 SHA512 84f04c94a976c0e2c7db9a7c8c392b6c714e37650efefe2db9807688c28a8cdb64722064be23b89d0263c82c5de7b7dc412ae13f95b42c97ae928c00bb584fac diff --git a/sys-process/audit/audit-2.8.4-r1.ebuild b/sys-process/audit/audit-2.8.4-r1.ebuild new file mode 100644 index 0000000..fabaa89 --- /dev/null +++ b/sys-process/audit/audit-2.8.4-r1.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=( python{3_6,3_7} ) + +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/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 0000000..3ec60fb --- /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 + #include + #include /* 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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include // for access() + #include +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 + #include + #include +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 + #include + #include +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 + */ + #include "config.h" ++#include "fixup.h" + #include + #include + #include +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 ++# define _ASM_IA64_FPU_H ++#endif ++#include ++/* ++#ifdef HAVE_ASM_PTRACE_H ++# include ++#endif ++#ifdef HAVE_LINUX_PTRACE_H ++# include ++#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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include + #include diff --git a/sys-process/audit/files/audit-2.4.3-python.patch b/sys-process/audit/files/audit-2.4.3-python.patch new file mode 100644 index 0000000..7b9ea53 --- /dev/null +++ b/sys-process/audit/files/audit-2.4.3-python.patch @@ -0,0 +1,46 @@ +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 new file mode 100644 index 0000000..099f985 --- /dev/null +++ b/sys-process/audit/files/audit-2.7.1-musl.patch @@ -0,0 +1,173 @@ +From db5c09f7995a27555a10418648d9dc7e1e8bb94b Mon Sep 17 00:00:00 2001 +From: Luis Ressel +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 + #include + #include +-#include ++#include ++#include ++#include + #include + #include + +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 + #include + #include +-#include ++#include + #include + #include + #include /* 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 + #include + #include +-#include ++#include + #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 + #include + #include ++#include + #include /* For basename */ + #include /* 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 + #include + #include ++#include + #include + #include + #include +@@ -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 new file mode 100644 index 0000000..f76b9b0 --- /dev/null +++ b/sys-process/audit/files/audit-2.7.1-swig.patch @@ -0,0 +1,11 @@ +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 new file mode 100644 index 0000000..e48b42b --- /dev/null +++ b/sys-process/audit/files/audit-2.8.2-musl.patch @@ -0,0 +1,149 @@ +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 + #include + #include +-#include ++#include ++#include ++#include + #include + #include + #include +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 + #include + #include +-#include ++#include + #include + #include + #include /* 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 + #include + #include +-#include ++#include + #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 + #include + #include ++#include + #include /* For basename */ + #include /* 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 + #include + #include ++#include + #include + #include + #include +@@ -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 new file mode 100644 index 0000000..ef04f72 --- /dev/null +++ b/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch @@ -0,0 +1,195 @@ +--- a/audisp/audispd.c ++++ b/audisp/audispd.c +@@ -21,6 +21,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- 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 + #include + #include +--- 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 + #include + #include +--- 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 + #include + #include +--- 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 + #include + #include +--- /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 ++# define _ASM_IA64_FPU_H ++#endif ++#include ++/* ++#ifdef HAVE_ASM_PTRACE_H ++# include ++#endif ++#ifdef HAVE_LINUX_PTRACE_H ++# include ++#endif ++*/ ++#endif +--- a/src/auditctl.c ++++ b/src/auditctl.c +@@ -23,6 +23,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/auditd-config.c ++++ b/src/auditd-config.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/auditd-dispatch.c ++++ b/src/auditd-dispatch.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/auditd-event.c ++++ b/src/auditd-event.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/auditd-listen.c ++++ b/src/auditd-listen.c +@@ -23,6 +23,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/auditd-reconfig.c ++++ b/src/auditd-reconfig.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/auditd-sendmail.c ++++ b/src/auditd-sendmail.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include // for access() + #include +--- a/src/auditd.c ++++ b/src/auditd.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/ausearch.c ++++ b/src/ausearch.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/autrace.c ++++ b/src/autrace.c +@@ -21,6 +21,7 @@ + */ + + #include "config.h" ++#include "fixup.h" + #include + #include + #include +--- a/src/delete_all.c ++++ b/src/delete_all.c +@@ -20,6 +20,7 @@ + * Steve Grubb + */ + #include "config.h" ++#include "fixup.h" + #include + #include + #include diff --git a/sys-process/audit/files/audit.rules b/sys-process/audit/files/audit.rules new file mode 100644 index 0000000..ef0e6ee --- /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-2.1.3 b/sys-process/audit/files/audit.rules-2.1.3 new file mode 100644 index 0000000..25dbedf --- /dev/null +++ b/sys-process/audit/files/audit.rules-2.1.3 @@ -0,0 +1,25 @@ +# 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 new file mode 100644 index 0000000..29ae197 --- /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 0000000..1f34173 --- /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: diff --git a/sys-process/audit/files/auditd-conf.d-2.1.3 b/sys-process/audit/files/auditd-conf.d-2.1.3 new file mode 100644 index 0000000..c66be16 --- /dev/null +++ b/sys-process/audit/files/auditd-conf.d-2.1.3 @@ -0,0 +1,22 @@ +# 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 new file mode 100644 index 0000000..c952554 --- /dev/null +++ b/sys-process/audit/files/auditd-init.d-2.4.3 @@ -0,0 +1,90 @@ +#!/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 new file mode 100644 index 0000000..4d78815 --- /dev/null +++ b/sys-process/audit/metadata.xml @@ -0,0 +1,10 @@ + + + + + robbat2@gentoo.org + + + Enable GSSAPI support + +