gentoo resync : 15.01.2020

7 files changed, 243 insertions, 15 deletions

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index ccc9ffd7426d..af0da4c53e0a 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -12,9 +12,11 @@ DIST audit-2.7.1.tar.gz 1099083 BLAKE2B 10f72ac3273ce9e23e1fb8ad8d57dcae772ba1f8
 DIST audit-2.8.2.tar.gz 1121970 BLAKE2B bbec694ed1177a8590d035c2d6d197e49343fc370b101589e58736042c3b12cabb68fe796422f3133feb79068ab7d5931efa5414d22edead10c8871fefcd2549 SHA512 888ebf5e8e9d285b82d87377fc8836886d7a8b089c1be4091420a77a0250c9baf09aebb7a6330ff5043fb35f51eb6baf8d4491e26da7ad0811f0087e395b5012
 DIST audit-2.8.3.tar.gz 1107583 BLAKE2B 21c2b8543a31c0ca4319af40b844f4400615108a59195a95ea79499ff2923d7dbbc840716d60dfba311bfc451983cd4cd0f7cb27c2444825df2c0dfb50f9614f SHA512 aa939b81a66111f4e466208d7a38414bd186d00ccd374b420439764905b4707bbfcdc2331a6179a080fca981d19171696ecabd26674205b2f9339c44954db933
 DIST audit-2.8.4.tar.gz 1123889 BLAKE2B b80272b1984942d3c38bde30d22c736a8cc8896a2e42a9bf286446129313ce57a2a117ce26a0a5f1a4a06b4a48ddde463b8837b8c98273051be0c90e5bbebd42 SHA512 5795c565effab995cee447a2dc457ef6a6f15201fb185d7104992ac373a3cb5cfc865dd661c0896a895c96f452eff392d455064d0eead55cd7364d96e0d15c4a
-EBUILD audit-2.6.4.ebuild 6221 BLAKE2B 2ed4972ac948860f81a35632d35f75c22fc7456264e0305f26c9e8ab15e8b1691dd7dc9e686212c6c8d5706a20a1652a66777f439c6beeb9bc006f26b1d1c950 SHA512 6c76a939dae7c37e98f6201e06530ada3f4ad9f07ecdbc58073ac5e7305dc560cb86e358bcae8ef84b522a2a508367caed40aca0c495457042bada0a5141b7f4
-EBUILD audit-2.7.1.ebuild 6218 BLAKE2B c257aa128da8f572e899eb3391b6023c7e228cfe5e9992cbccef26462e2d4ba34ee4dc3ef019534c9f8285d160551fee9bee8da7c6607463981ecdfab7423967 SHA512 d1ab9b666e0d6d80f81a5fc33552a485f426e2e928fafe981746b76807b426e8742cb02637113b5897cae20d73fcae7e2295e4dcfdd51c2e053a5759f460247f
-EBUILD audit-2.8.2.ebuild 6154 BLAKE2B a9f8465ce878d0f9d7d4e1eb5e9738c78a0cd00bacf1fe42f45a80e19944d8cc91c1efab239c0886a56cef798b24a23826e39ef2b0f7926373061e3973521072 SHA512 176d40e94c7b6488ecba657d4c4e331e53277b47e4239b2faf644f9b56e5618b7698e3a569027de21231e56b9c5426b04f65a0466fb58d91c12373bd16a17004
-EBUILD audit-2.8.3.ebuild 6144 BLAKE2B d9aeaedb3e0d6cfc9a45d39fa8a91c90f58f51fb943aaeb99042a193a449f60f611ef98cb37f17a68a9e44b5ff6c2fb8eaf3d37f09129f00ae0953ab03e15785 SHA512 6c6614eeb2155a1e9635be9d39325dd1a7eef8fd11d76ed812422b1a16b7ce027dfd4d3d289cf7ff8ec7b8ef6e1a358f0d3bff0e3db69c6a314a7e22ae827f52
-EBUILD audit-2.8.4.ebuild 6150 BLAKE2B 93be631cacc6a0f8799b096a3f2aa5dd4431a45622a8f33c2ace826dbf06faf9c221a1d342d7fd4170eadb5a4f9125b68fd6d9072f9e8eb5220f2402db4252e4 SHA512 d1bcac252cc4439374a97d90614044ee308f1d631de573ecd9c10a6155801b290f4fb6967dcafff5cbe741e69be855710053e7fce09daf53edb0a83c471bb600
+DIST audit-2.8.5.tar.gz 1140694 BLAKE2B 64fd0cd93f934e3dd11faf21fcd765894a9c4336d8322179980bb7df1ef5a06d301a665860aeb84fefa0cf278940668023675b99ba7f33cdcfb542d869034358 SHA512 7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a
+EBUILD audit-2.6.4.ebuild 6217 BLAKE2B 44693e0fac00862024d689ca845ed2dafebbff950e9b42f7f3d12fd4fd0bb701b859682befb5b2af1ae9e5eea3e75bba3117309742f439426cc1d3d74a588cac SHA512 d6f93f120cc8034d70bde80007843a3f3f36eca14368045ae06efef8afed1c1fbfa4749b0af4555ab00abfd801717e23ebb6777e5e10fdaefd8eefd2cede1f5e
+EBUILD audit-2.7.1.ebuild 6214 BLAKE2B e325ba8aba754e5ce7d7154ca1eb53743d8547801cab1ef1e22e09c746e60787d18b1cf521efcd0a6f6402c2e1fdac5dea3e43aeac4c0d3a301ff10c8a46c50c SHA512 672e97774ee768ccc9dc0e83d4e093412efac6d284acf7c1598ca5b2e4b53a6134c9df7459e41f5a1ec137d6ab8be6ced9423d8a1b00f8b3df6cbf1b47cbbf3b
+EBUILD audit-2.8.2.ebuild 6150 BLAKE2B 26de7b9e39dee3ef7c54698503afcce041145d4b02af750977139a563ceb2f59b92e16d57d01923bb5fc64ae52f739e07bfafc574b264b35e40d67366bff7999 SHA512 9e21eadf69574599f33c2ad7e683f6170a3ef403a28d2b78d68f60a3fb2b6376f3158ac7d3ad72bee4d9cb31eea5ca38420519377acfa0e9e91e50ec46b16e86
+EBUILD audit-2.8.3.ebuild 6140 BLAKE2B 7a356cd49cabfa9f73ef77c68b55f7623d3ee09a3bcf394117ed9709a72ccbcd148285bc070e8191a876a941e066c16bf06b9b89e9b70c91e70818bf97c7bfcd SHA512 c506a2385adb96746121e3e8b131bd43a68dd314962c2b245aa333672812568c1072f7c93da18ee058e335a7c07bd5c7e52977b4a05726b96c7b5de715b25be9
+EBUILD audit-2.8.4.ebuild 6146 BLAKE2B 7eb3c9c3cb55b992c2997103c1ba175f6b7ed79885177c8814e1a97b7d81225e618e2a297b1409ccaa873c370ede4a7d34243178379c84e8cc728639f1800c91 SHA512 ec59c001f9d696001ef7f708fab8140881d27e2214a074dcaa6bbbbd64de9d452a2880a6de432921d8ca7fd7dd6f5ebda6487b708441ab834d16b9af4ce69378
+EBUILD audit-2.8.5.ebuild 6201 BLAKE2B d6e8399509049b00f5c73bb758c97a1339be35a08f20e38a0b24f1e4df5b2c1fee33aaa18e97eeb72cdd91c4e2bc04b5940f0a086577230303b45092f5b4941b SHA512 0d48e4687fcaefa50a84f7e7a3e53d9c084a89afb238fa8721bb4c3f1cdedcf14b802e940a2449662e14fbb75f94e0fb308626c89cd00687a5806ee8b3a28070
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild
index c50a44ddd92f..9c654ab7101b 100644
--- a/sys-process/audit/audit-2.6.4.ebuild
+++ b/sys-process/audit/audit-2.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools ltprune multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript
 
diff --git a/sys-process/audit/audit-2.7.1.ebuild b/sys-process/audit/audit-2.7.1.ebuild
index ffaa96aec521..d687f86e6e1b 100644
--- a/sys-process/audit/audit-2.7.1.ebuild
+++ b/sys-process/audit/audit-2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools ltprune multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript
 
diff --git a/sys-process/audit/audit-2.8.2.ebuild b/sys-process/audit/audit-2.8.2.ebuild
index 4aa75229e58c..63b2f673b91f 100644
--- a/sys-process/audit/audit-2.8.2.ebuild
+++ b/sys-process/audit/audit-2.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript
 
diff --git a/sys-process/audit/audit-2.8.3.ebuild b/sys-process/audit/audit-2.8.3.ebuild
index 737db834349c..8497219e4bee 100644
--- a/sys-process/audit/audit-2.8.3.ebuild
+++ b/sys-process/audit/audit-2.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript
 
diff --git a/sys-process/audit/audit-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild
index 5341b749058e..584cdbdd7cb3 100644
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ b/sys-process/audit/audit-2.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools multilib multilib-minimal toolchain-funcs preserve-libs python-r1 linux-info systemd usr-ldscript
 
diff --git a/sys-process/audit/audit-2.8.5.ebuild b/sys-process/audit/audit-2.8.5.ebuild
new file mode 100644
index 000000000000..5364f3c85f56
--- /dev/null
+++ b/sys-process/audit/audit-2.8.5.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,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 ~sh ~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
+
+			if python_is_python3; then
+				econf ${my_conf} --without-python --with-python3
+			else
+				econf ${my_conf} --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
+
+	[ -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
+}