From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C769813835A for ; Mon, 4 Jan 2021 11:11:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E10DE0857; Mon, 4 Jan 2021 11:11:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7D8AE0857 for ; Mon, 4 Jan 2021 11:11:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77770341174 for ; Mon, 4 Jan 2021 11:11:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D84CD332 for ; Mon, 4 Jan 2021 11:11:48 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1609758683.852e1a4913c6d3ea5fec171de65944bdf3cce059.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/audit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/audit/Manifest sys-process/audit/audit-2.8.4.ebuild sys-process/audit/audit-2.8.5.ebuild X-VCS-Directories: sys-process/audit/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 852e1a4913c6d3ea5fec171de65944bdf3cce059 X-VCS-Branch: master Date: Mon, 4 Jan 2021 11:11:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5fe50419-9645-4450-a0ee-c4beb20acc49 X-Archives-Hash: 98702dddae7e4c2af9b8ca4e8ae8a863 commit: 852e1a4913c6d3ea5fec171de65944bdf3cce059 Author: Andreas K. Huettel gentoo org> AuthorDate: Sun Jan 3 09:00:05 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Jan 4 11:11:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852e1a49 sys-process/audit: Remove old Bug: https://bugs.gentoo.org/706734 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas K. Huettel gentoo.org> sys-process/audit/Manifest | 2 - sys-process/audit/audit-2.8.4.ebuild | 206 ----------------------------------- sys-process/audit/audit-2.8.5.ebuild | 204 ---------------------------------- 3 files changed, 412 deletions(-) diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest index d20d93756cb..3b6989b4a53 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.4.tar.gz 1123889 BLAKE2B b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42 SHA512 5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a -DIST audit-2.8.5.tar.gz 1140694 BLAKE2B 64fd0cd93f934e3dd11faf21fcd765894a9c4336d8322179980bb7df1ef5a06d301a665860aeb84fefa0cf278940668023675b99ba7f33cdcfb542d869034358 SHA512 7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4 SHA512 7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a DIST audit-3.0.tar.gz 1109442 BLAKE2B f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617 SHA512 b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88 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 fb5ec3ac098..00000000000 --- a/sys-process/audit/audit-2.8.4.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# 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="~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 - - 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 - - econf --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/audit-2.8.5.ebuild b/sys-process/audit/audit-2.8.5.ebuild deleted file mode 100644 index d743db4f3f5..00000000000 --- a/sys-process/audit/audit-2.8.5.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# 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="~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 - - 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 -}