commit: 8442b964fea8e814264229a78be0da6ae1735919 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Aug 3 12:21:49 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 7 16:21:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8442b964
sys-process/audit: Drop 2.8.5-r2, EAPI6-- Closes: https://bugs.gentoo.org/763237 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sys-process/audit/Manifest | 2 - sys-process/audit/audit-2.8.5-r2.ebuild | 217 --------------------- sys-process/audit/files/audit-2.4.3-python.patch | 46 ----- .../audit/files/audit-2.8.4-ia64-compile-fix.patch | 195 ------------------ 4 files changed, 460 deletions(-) diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest index c44d95add0b..48cc8ee6601 100644 --- a/sys-process/audit/Manifest +++ b/sys-process/audit/Manifest @@ -1,5 +1,3 @@ -DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f SHA512 78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101 -DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a DIST audit-3.0.1.tar.gz 1180286 BLAKE2B f29687ebc76f4eb88184cce1a3da0b8ca4464b2f81f56d71048ac4a64a713f33d6964e46e78b73c72b6ac2495f80114866773b3b86753c1d0dead25df73f7c43 SHA512 ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c DIST audit-3.0.2.tar.gz 1184356 BLAKE2B 13f76e9c40bc8ffc53b5499076b5cb75c2690d95414a0e1942fa9725b9617f10327a2ee676dc10cc46ba76d223f77509d305bcd22344b678443b7707cc6d10cd SHA512 9e831ed6f30ac7d58f028cede97adba431bde18dfd9045c19f5e03eff52cd28db3a6792e5969f555ce51aa562662b59fa5cc5265586c6acf0b3aa1feae4d720f DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88 diff --git a/sys-process/audit/audit-2.8.5-r2.ebuild b/sys-process/audit/audit-2.8.5-r2.ebuild deleted file mode 100644 index e70218a14ef..00000000000 --- a/sys-process/audit/audit-2.8.5-r2.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{3_7,3_8} ) - -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() { - # 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 - python_optimize - } - - 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.4.3-python.patch b/sys-process/audit/files/audit-2.4.3-python.patch deleted file mode 100644 index 7b9ea53e09d..00000000000 --- 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.8.4-ia64-compile-fix.patch b/sys-process/audit/files/audit-2.8.4-ia64-compile-fix.patch deleted file mode 100644 index ef04f720495..00000000000 --- 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 <sgr...@redhat.com> - */ - #include "config.h" -+#include "fixup.h" - #include <stdio.h> - #include <string.h> - #include <errno.h>
