Install systemd unit files instead of not used rc/sysconfig fedora stuff that was being manually removed at install phase (#503374 by Reuben Martin)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 203 insertions, 17 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index 6253fde18904..5a2ab7a70a41 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/audit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.93 2013/03/03 10:25:39 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.94 2014/03/30 14:06:53 pacho Exp $
+
+*audit-2.2.2-r1 (30 Mar 2014)
+
+  30 Mar 2014; Pacho Ramos <pacho@gentoo.org> +audit-2.2.2-r1.ebuild:
+  Install systemd unit files instead of not used rc/sysconfig fedora stuff that
+  was being manually removed at install phase (#503374 by Reuben Martin)
 
   03 Mar 2013; Mike Frysinger <vapier@gentoo.org> audit-2.1.3-r1.ebuild,
   audit-2.2.2.ebuild:
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 11648241d524..c9879bf7a553 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -33,23 +33,14 @@ EBUILD audit-1.7.4.ebuild 3394 SHA256 0cdf6975cefd382655936486a8c4b1bf7805e28e3a
 EBUILD audit-2.0.5.ebuild 4468 SHA256 af5a547f8a131e00050baf000232da2d742029199356d76db195a68e850c1152 SHA512 99837c530ca5a5f35e241f4c3b70e4bfe45a74e91d2181356f417b3f0fc72a1fdf8172c7d52c5b7322a1d59cb351d6ce3d69e623778ca77005cd01e0c86cb7a4 WHIRLPOOL e9554be479f1b11c6d466a4c11b54aa6d39df4c6617934d70ffc410d6006b4b4a6ea980a316dde91cbdb4b91ebb1190c17825df14b04e104a583b57e0a3cc1d9
 EBUILD audit-2.1.3-r1.ebuild 4974 SHA256 5fef4673e77a4a04837756ade173b97c42b18e6f4097736e67bd3d1cd1ebbd46 SHA512 b0669cd7fc48e360e71cc5049447eed028ae904bc6088008cf74b480c9783cbe98e6717f871ffbf470adb9ae9c61c4fda884316cec724729a9672da07a125994 WHIRLPOOL d8bab3e763e47a6dcc83f67fc95a7ed075bdacda98a448f2ae404e60cb2ad7fa0c72881053d11f5080c9f1fd7d55a27581b8870ecd06b5140bee51985c613a21
 EBUILD audit-2.1.3.ebuild 4503 SHA256 a921ad2e649cc25d513c3e1d66411751e15c544979ffc44c9ee589cd98bf7df1 SHA512 0e0c4a43220a8f898f7a590c0e9469839cf2f422da755678db24d39aa82247100973a80437a169af7f16f8af716e0a162c5e9346736e2bb2bacb1548b9ae7b3c WHIRLPOOL b400d245780b7b0f5a75b46fbc8c83949133f8cfe991058ff158072290618ef14bd495edb7f7e427ebbd1c63f8ed49c14150db56d87cb9b99f0a1a4adbeb0102
+EBUILD audit-2.2.2-r1.ebuild 4947 SHA256 b00a45af9186131160e72345d39b05c3eba8a73b9d28d9185231b3d737a85d73 SHA512 34595e1d1e35f495ca001f62131762d5b2834b17084b433fcbb180cfbd6d042bfaf4536859ec1b8391a49b3a2909da8fd677e698a5186b79f72a90f84ccfca28 WHIRLPOOL 26b942cda0f20c4d09591137d476ed6e0e447d3325f0ee8aa651026f13751bc60255ffc8dee21a270f4095fd0c59aff233f668aa4067bc7cf34430912889a93f
 EBUILD audit-2.2.2.ebuild 4984 SHA256 626ead30abf4b0671c31f489cb3f9cb1fe1907ffdf099e33baf9c3175e29f635 SHA512 2f4a72a219139fe6bd28dc3d7b9089ee1be9b6a5eae0d30d5c6843b9de885a11f29d4ac85a84925745ce1142e1bbc2febf1e09478bf5d13877716da4e135b44b WHIRLPOOL 1bfb1ca2c08a190690299e62aa8b12728aa061df825a84575666646e1a01922c216faf92648b74c283496d475780aba4a51e6f0119be32028e5793152352a98f
-MISC ChangeLog 14874 SHA256 0d527c884b9b9e18199d7103e3217f7c2f0663e61378eda515bd722a93dd1d29 SHA512 bf940abcf2e6f710cababc965e0c61dcfbca06b60ca19cb706f8444f4e970236862b2e52ad6643577564470249341cf44ac5a1e68a03a47bc195803b58243043 WHIRLPOOL 9524d1d577ef23c4d1a16139f2593d40ed765d9c5746b62022a2741479a18e7a463fa8d6f22df2cf1557c610c46e93f5b7061d0a1999403f0b9bfb9769fa8a30
+MISC ChangeLog 15128 SHA256 3ac6dc184c7555a0b8706fc2b13ff245b69eb5d55abe12a8df3c86134d204ae6 SHA512 8e8c6e29ddadc7017df58f19c833732d49a3010440bf001324723389b6c9e3dfa380fd46be999964acf815234fa12f07735172a66fb3efea3225e93f55c4b8ec WHIRLPOOL 70afd4442f4c5a265eaa66c86b5c2cb25a0885d01c2ddb8ede756f21ac36d20718cc8246c09f5022f1bc099c872a5faa0c849481b09b557f8c8f9a7148081fe1
 MISC metadata.xml 208 SHA256 474aad89b28273a47e9d612283399fab63cd9ada8b3c4fa65b16250128abf342 SHA512 761ae3cffc33d4832cd02525e53fa449295e779fac539a6c11d746001689e781939e059c8a444365b42b291e295d5d1620d67af401c2c80c568be8ef596d147d WHIRLPOOL 060c71b4ace40817c787afb38b4919804322e09983dba790fbdcf0c3021a7bfa94ed0f1f4fb5db8893d0c68aebdec378ed055f420501bd7df0f03eec50e220aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMyWHAAoJELEHsLL7fEFWov8QAIn21tk9UShMJz0WyEv/uV+g
-jsU0YecRsh0d8HZ2wCsbnKVdIk2BHzE0p+ptOAY1p8uoEValoHG1o1qZka6dIWbk
-mLSF/HnEG9q79T0xR2unFgWvhjJcAvIn2S7a9p/SIHYEXE/NOrgbkutoel9ok2/V
-7nEYeLq43DgW7vnrX7uIKf2Wd+EgaXPk+kPf/MsmE9/zi1y8z8YBJmoUqyfOZs/2
-SfUaPpGrXjtA77LgcFLlx49z1Y6SYe2IELL2wESX1vMKQ2BSchIa3ODZlPLHXaZL
-9kV6r53byWmZ4uVWgMtSYCFDeuwB6om4yfzKwxvubmRIp5l2hh1tdGduV1MPryuY
-STedQiPyq9ex4NRorxIGIoDVWiedypSrccHIZzznQoyhiAehsG0SAxfmJXBF8+jF
-7b3VTqfazf9LpoxP+YxLqGlyscUvZl03CxayTYKjGsyYGQKg6G+Og3TxDNcMUtuz
-/6b7gS0WDGhqvtACR/VfUwA173aiZgm9mYrrX6BURUBxG0ot/uCXyOmZNWPNoHI+
-rQMjJRvxtpDFuQP3V6cdjiLIJ8E3n0RGGxbCm0L98AThLdnUBwyhFxJX4h0SnWDa
-nCyWaDAGW1Y7UUwIz2LZAzKWLMtA9XEb7M8paXkaF17S16+KBVMwph2VjI+s3gm3
-+ZeXcGmMaY3C6MHOI2ng
-=VUAo
+iEYEAREIAAYFAlM4JP4ACgkQCaWpQKGI+9SPjQCfQ2TV56Tfb04MZ6TaUFFqdGmU
+NLIAnjpSm6vHQIMWHMnOkLxRDlfBjNer
+=skli
 -----END PGP SIGNATURE-----
diff --git a/sys-process/audit/audit-2.2.2-r1.ebuild b/sys-process/audit/audit-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..2a9c0834f964
--- /dev/null
+++ b/sys-process/audit/audit-2.2.2-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2-r1.ebuild,v 1.1 2014/03/30 14:06:53 pacho Exp $
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit autotools multilib toolchain-funcs python linux-info eutils
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
+SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ldap prelude python"
+# Testcases are pretty useless as they are built for RedHat users/groups and
+# kernels.
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+		 prelude? ( dev-libs/libprelude )
+		 sys-libs/libcap-ng"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	>=sys-kernel/linux-headers-2.6.34"
+# Do not use os-headers as this is linux specific
+
+CONFIG_CHECK="~AUDIT"
+PYTHON_DIRS="bindings/python swig"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	# Old patch applies fine
+	#EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch
+
+	# Applied by upstream
+	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.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
+
+	# Probably goes away in 1.6.9
+	#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/audit-1.6.8-subdirs-fix.patch
+
+	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.
+	epatch "${FILESDIR}"/${PN}-2.1.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.
+	epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+	# Python bindings are built/installed manually.
+	sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am
+	sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am
+
+	# Regenerate autotooling
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo "#!/bin/sh" > py-compile
+
+	# Bug 352198: Avoid parallel build fail
+	cd "${S}"/src/mt
+	[[ ! -s private.h ]] && ln -s ../../lib/private.h .
+}
+
+src_configure() {
+	#append-flags -D'__attribute__(x)='
+	econf \
+		--sbindir=/sbin \
+		--enable-systemd \
+		$(use_with prelude)
+}
+
+src_compile_python() {
+	python_copy_sources ${PYTHON_DIRS}
+
+	building() {
+		emake \
+			PYTHON_VERSION="$(python_get_version)" \
+			pyexecdir="$(python_get_sitedir)"
+	}
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		python_execute_function -s --source-dir ${dir} building
+	done
+}
+
+src_compile() {
+	default
+	use python && src_compile_python
+}
+
+src_install_python() {
+	installation() {
+		emake \
+			DESTDIR="${D}" \
+			PYTHON_VERSION="$(python_get_version)" \
+			pyexecdir="$(python_get_sitedir)" \
+			install
+	}
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		python_execute_function -s --source-dir ${dir} installation
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	use python && src_install_python
+
+	dodoc AUTHORS ChangeLog README* THANKS TODO
+	docinto contrib
+	dodoc contrib/{*.rules,avc_snap,skeleton.c}
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	# things like shadow use this so we need to be in /
+	gen_usr_ldscript -a audit auparse
+
+	[ -f "${D}"/sbin/audisp-remote ] && \
+	dodir /usr/sbin && \
+	mv "${D}"/{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/
+
+	# Security
+	lockdown_perms "${D}"
+
+	# Don't install .la files in Python directories.
+	use python && python_clean_installation_image
+}
+
+pkg_preinst() {
+	# Preserve from the audit-1 series
+	preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0
+}
+
+pkg_postinst() {
+	lockdown_perms "${ROOT}"
+	use python && python_mod_optimize audit.py
+	# Preserve from the audit-1 series
+	preserve_old_lib_notify /$(get_libdir)/libau{dit,parse}.so.0
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup audit.py
+}
+
+lockdown_perms() {
+	# upstream wants these to have restrictive perms
+	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
+}