Bump. Still in package.mask because swig refuses to build, with libtool looking for non-existent _audit.soT.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

3 files changed, 196 insertions, 2 deletions

diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog
index a98c057cad72..c85726550f11 100644
--- a/sys-process/audit/ChangeLog
+++ b/sys-process/audit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.84 2012/12/22 03:36:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.85 2012/12/22 07:02:50 robbat2 Exp $
+
+*audit-2.2.2 (22 Dec 2012)
+
+  22 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> +audit-2.2.2.ebuild:
+  Bump. Still in package.mask because swig refuses to build, with libtool
+  looking for non-existent _audit.soT.
 
   22 Dec 2012; Robin H. Johnson <robbat2@gentoo.org>
   +files/audit-2.1.3-ia64-compile-fix.patch, audit-2.1.3-r1.ebuild:
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 4a1e350d3ded..81682ee57961 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -23,11 +23,13 @@ DIST audit-1.7.18.tar.gz 1566698 SHA256 c3e9e7df9e0776c3f90acfde7432ed362ff3ae5c
 DIST audit-1.7.4.tar.gz 840298 SHA256 db5412852aa36ee25eb174e4f4a4676cc2d0b93cbe41a740eebf903b49b4d593 SHA512 89c99d0f9caebd3285535b3237e23499216a80e571175e16169ee0154e1581e885c1b3ee0c11a97b16db6569d6b91b05edfb3371f03b199ec52a510074834060 WHIRLPOOL 7ad1a63ce5b21a983bb6c36ab845d2cca22935d5b62343e00fb91c43d6e4c7eb18333bacdda0bacc32e0e340c8b70db39ff117edb686878bf82787723fc4c6cf
 DIST audit-2.0.5.tar.gz 810519 SHA256 1ef85e606a0fda21596577f5c205c0df7eb56d7cffbb84aeeeb72ce44e61a83b SHA512 5e5e7f6af79792aa4f8577b6a5975440167b19e35d555c7c60c51d0af20f6bfeafb78a89f8b546efe9b9c79296ee5872fa0056f34a61650c66f34ceedc8b15c4 WHIRLPOOL d5ec4d00555858f8d8e5d42400ce0775b9db1d7fc1efc995dbfb45fc59c34d2b0268879d2fd35b60af3b07498e166b2afc6dbbc23f5943a50e1da9898d7aeb4b
 DIST audit-2.1.3.tar.gz 833647 SHA256 1c61858d8ed299128aa6bd8e85bac758bfe33e61358d259e52acb7d961fee90e SHA512 0f5c02ee3eb35687e85cfea0cae2bc11c35d2de5c44347f8f3cde4d268aeef215547cfb4b577afffc737ce5944219f46b4594ac122479d8b2e185efe3cdb069b WHIRLPOOL c83ac2bf929f524c4bc34ffcd503db9687a2c8affe3b5bb0a908e40ba8e98beced6fee6f3212db7267cf11cef3dbd13915a1ee09334f2cf58a686a1acfff0946
+DIST audit-2.2.2.tar.gz 907066 SHA256 8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b SHA512 98d83162e69816611dfac3d3ecc19235403ea5809d7a5cd9f13444c2085f03e46657802addb58ee31c251749f89417926ae40bcd99a77d64f062712830fde9bb WHIRLPOOL f127d3b9645d4e679a83767d688b83c7d59d4a35a166bc9f5038df89852768b695bc0c30e26fea0930aa29fed4583aa5218a42d5898d2a7c542e04cf58b9a9e9
 EBUILD audit-1.7.17.ebuild 3491 SHA256 68b02ea9e54e67b4f06e10341ba267df69efd50a777605095a5ffb534eaa160b SHA512 482bf8e98a602aea3b4a1681ecc99f113e93539fd7533ce8581fcc0d72322b97bd443b1ca22af022d42ded2f3cfb5f95c2e6b7a277d46104fb36bf79bf499fe1 WHIRLPOOL 34f3d8a2fbf6e82738cbc64c18d57d4b3a9a8f741a4aa6c58bb9da883cf2793ac0f80500ba9425f89bfee895f4d51580408570421c3e50339a0b0b110900aabc
 EBUILD audit-1.7.18.ebuild 3491 SHA256 ef678f9bb88c2f1dd949cdf3bd92207b4d0f5bd295fde08baf425e66d550c0e6 SHA512 7da7d063fd9802567f3758b887d40d8ece6343845cb48b02d01b2231cdafe1fc770b2d2b8a6404a5cfa17518af30531ccb18648b57f2d93e758b06402d2f1a56 WHIRLPOOL 21f393e0c8c1b48d80528275a2c0b36ed1b3da261eb7cea09ea1fb4d6d9dabf335a9584c811929360acba7c784a0d265246f0bb3075daf1efd41c54cdbc73dd3
 EBUILD audit-1.7.4.ebuild 3394 SHA256 0cdf6975cefd382655936486a8c4b1bf7805e28e3aa45c9264bc92304afbd685 SHA512 153b3479b228675a950564f7f38f734692a4611059ef11b2e0c7a8b1c55acfb8f06fe58ec0e3d36757c91e7e33586336cf1907348a29ce0ddd647b44f681cb3a WHIRLPOOL 37a274d499950c9381d3f5de90f35b84aa2143350898bd214630b58f5f41aff19f3b74f2e7be537f325c542d3f226e77fffa711bf8568c5d16f1d4218784781c
 EBUILD audit-2.0.5.ebuild 4468 SHA256 af5a547f8a131e00050baf000232da2d742029199356d76db195a68e850c1152 SHA512 99837c530ca5a5f35e241f4c3b70e4bfe45a74e91d2181356f417b3f0fc72a1fdf8172c7d52c5b7322a1d59cb351d6ce3d69e623778ca77005cd01e0c86cb7a4 WHIRLPOOL e9554be479f1b11c6d466a4c11b54aa6d39df4c6617934d70ffc410d6006b4b4a6ea980a316dde91cbdb4b91ebb1190c17825df14b04e104a583b57e0a3cc1d9
 EBUILD audit-2.1.3-r1.ebuild 4929 SHA256 295efbc782206bf0a01e037f5d57876d92714dca4a0524fd71c8909276a57e27 SHA512 a0325fb8efd1ab4653d1bf2213dceb84e379021c3189fd9a167e3ae37aab961889a85213c9a5f3b68a0eba3a6862283f970356d5a33cc95adc8ad77d98e1fec5 WHIRLPOOL 1af17add2d8d0920973187a06f4a1b4921e2e27968c9bfef4a1689fa64a54cc980fc239d9e9e1be1d488c012f335e73b50a3f47b86cde35d0fee608ad325e6ff
 EBUILD audit-2.1.3.ebuild 4503 SHA256 a921ad2e649cc25d513c3e1d66411751e15c544979ffc44c9ee589cd98bf7df1 SHA512 0e0c4a43220a8f898f7a590c0e9469839cf2f422da755678db24d39aa82247100973a80437a169af7f16f8af716e0a162c5e9346736e2bb2bacb1548b9ae7b3c WHIRLPOOL b400d245780b7b0f5a75b46fbc8c83949133f8cfe991058ff158072290618ef14bd495edb7f7e427ebbd1c63f8ed49c14150db56d87cb9b99f0a1a4adbeb0102
-MISC ChangeLog 13617 SHA256 4abfdbdc8c90c92bb65c735e67ef1cd14793f00c4c67a4852f19f7eccfa98d58 SHA512 0da6d32db0c857bf2c7a72fadfd5a2a2406dcab6d33c1e60c79fa83adbff899204164d8a72d5fe866340892113bace6ae8d9bf800c5145cfa8b4f218b49d8f21 WHIRLPOOL 4584d9f32d87e48554c1b91f5e19ec7c8065663c3e61f9079795a4a71b6386da88fee54c95f03e1901ca1851a02a7d189667645743e1b213e68ff95e1cff4cf0
+EBUILD audit-2.2.2.ebuild 4871 SHA256 9ac1e374396ad2588ddd64ef7b6763de7d303be4e4a1f6016f23088da0ca2a25 SHA512 1feebd6e89d0131713c3b197f405cb908789f6d25be5755b587d12b2f0c51dce8bb3627e7e649ca89b58ece096de3d45f5641ce454f2ac0791df09911bd2459a WHIRLPOOL c23d294e41a8145355b8fef66ef01e0e43d276e4539469d0d8549bb6603bbc733d86f2a6087d069ff61528102c18dee354717a3c5a00f26bfaad63d7b5fe6eec
+MISC ChangeLog 13833 SHA256 84793682a926d4a7a0dc30f9df428c26b52254379df6ca15a3fcb960b2012746 SHA512 d135a88179ad5682c196577725ad3555ae666c2ad5cea35e4a8c25949fa48c72b5392ac2eb01f06df9935a3999f6b5f22672b0a4bd563ff552c0d56d18d3b35a WHIRLPOOL 73ba5b9d0d66a6e16f65881d9acdc8c7993dcbae58cac0e795b4e0c956d7519fb19d66bf70957dd64562fc5edb5028f6fecc36ac0b55f10dc2c080ad3d853b44
 MISC metadata.xml 208 SHA256 474aad89b28273a47e9d612283399fab63cd9ada8b3c4fa65b16250128abf342 SHA512 761ae3cffc33d4832cd02525e53fa449295e779fac539a6c11d746001689e781939e059c8a444365b42b291e295d5d1620d67af401c2c80c568be8ef596d147d WHIRLPOOL 060c71b4ace40817c787afb38b4919804322e09983dba790fbdcf0c3021a7bfa94ed0f1f4fb5db8893d0c68aebdec378ed055f420501bd7df0f03eec50e220aa
diff --git a/sys-process/audit/audit-2.2.2.ebuild b/sys-process/audit/audit-2.2.2.ebuild
new file mode 100644
index 000000000000..cd515e140cf8
--- /dev/null
+++ b/sys-process/audit/audit-2.2.2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/12/22 07:02:50 robbat2 Exp $
+
+EAPI="4"
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 $(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
+
+	# remove RedHat garbage
+	rm -r "${D}"/etc/{rc.d,sysconfig} || 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() {
+	default
+	# 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
+}