commit: f27342f5258adbf167e35bd2a6678c0c9160c8d9 Author: xor <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Tue Sep 29 03:19:28 2020 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Tue Nov 3 22:57:59 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f27342f5
add audit 2.8.5 from Gentoo tree && add musl patches from Alpine Closes: https://github.com/gentoo/musl/pull/349 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> sys-process/audit/Manifest | 2 + sys-process/audit/audit-2.8.5-r1.ebuild | 219 +++++++++++++++++++++ .../audit-2.8.5-all-get-rid-of-strndupa.patch | 57 ++++++ ...dit-2.8.5-auparse-remove-use-of-rawmemchr.patch | 33 ++++ 4 files changed, 311 insertions(+) diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest index d75227e..2742086 100644 --- a/sys-process/audit/Manifest +++ b/sys-process/audit/Manifest @@ -1,3 +1,5 @@ +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.8.5-r1.ebuild b/sys-process/audit/audit-2.8.5-r1.ebuild new file mode 100644 index 0000000..71cc120 --- /dev/null +++ b/sys-process/audit/audit-2.8.5-r1.ebuild @@ -0,0 +1,219 @@ +# 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/"; +# 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}-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.8.5-all-get-rid-of-strndupa.patch b/sys-process/audit/files/audit-2.8.5-all-get-rid-of-strndupa.patch new file mode 100644 index 0000000..c53dec6 --- /dev/null +++ b/sys-process/audit/files/audit-2.8.5-all-get-rid-of-strndupa.patch @@ -0,0 +1,57 @@ +From 38d950e468c1e51937530f884b138076e4897da2 Mon Sep 17 00:00:00 2001 +From: Tycho Andersen <ty...@docker.com> +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 <ty...@docker.com> +--- + 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 new file mode 100644 index 0000000..ae2ce82 --- /dev/null +++ b/sys-process/audit/files/audit-2.8.5-auparse-remove-use-of-rawmemchr.patch @@ -0,0 +1,33 @@ +From 8f2a6788b78dd6b219545aacbd42e2f84df8c71a Mon Sep 17 00:00:00 2001 +From: Tycho Andersen <ty...@docker.com> +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 <ty...@docker.com> +--- + 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
