public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-process/audit: ChangeLog audit-2.0.5.ebuild
@ 2011-01-25  3:35 Robin H. Johnson (robbat2)
  0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson (robbat2) @ 2011-01-25  3:35 UTC (permalink / raw
  To: gentoo-commits

robbat2     11/01/25 03:35:01

  Modified:             ChangeLog
  Added:                audit-2.0.5.ebuild
  Log:
  Version bump. Fix bug #352198: parallel build, bug #322239: prelude support, bug #352239: CONFIG_AUDIT check.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.61                 sys-process/audit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?r1=1.60&r2=1.61

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -p -w -b -B -u -u -r1.60 -r1.61
--- ChangeLog	15 Oct 2010 21:15:49 -0000	1.60
+++ ChangeLog	25 Jan 2011 03:35:01 -0000	1.61
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/audit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.60 2010/10/15 21:15:49 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.61 2011/01/25 03:35:01 robbat2 Exp $
+
+*audit-2.0.5 (25 Jan 2011)
+
+  25 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +audit-2.0.5.ebuild:
+  Version bump. Fix bug #352198: parallel build, bug #322239: prelude support,
+  bug #352239: CONFIG_AUDIT check.
 
   15 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   audit-1.7.4.ebuild, +files/audit-1.7.4-python.patch, audit-1.7.17.ebuild,



1.1                  sys-process/audit/audit-2.0.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?rev=1.1&content-type=text/plain

Index: audit-2.0.5.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild,v 1.1 2011/01/25 03:35:01 robbat2 Exp $

EAPI="3"
PYTHON_DEPEND="2"

inherit autotools multilib toolchain-funcs python linux-info

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"
# 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}
	dev-lang/swig
	>=sys-kernel/linux-headers-2.6.34"
# Do not use os-headers as this is linux specific

CONFIG_CHECK="~AUDIT"

pkg_setup() {
	linux-info_pkg_setup
	python_set_active_version 2
	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
	sed -i \
		-e 's,system-config-audit,,g' \
		-e '/^SUBDIRS/s,\\$,,g' \
		"${S}"/Makefile.am
	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
		sed -i \
			-e '/^SUBDIRS/s,zos-remote,,g' \
			"${S}"/audisp/plugins/Makefile.am
	fi

	# Don't build static version of Python module.
	epatch "${FILESDIR}"/${PN}-1.7.17-python.patch

	# 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_install() {
	emake DESTDIR="${D}" install || die "emake install failed"
	dodoc AUTHORS ChangeLog README* THANKS TODO
	docinto contrib
	dodoc contrib/*
	docinto contrib/plugin
	dodoc contrib/plugin/*

	newinitd "${FILESDIR}"/auditd-init.d-1.7.17 auditd
	newconfd "${FILESDIR}"/auditd-conf.d-1.2.3 auditd

	# things like shadow use this so we need to be in /
	dodir /$(get_libdir)
	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
	gen_usr_ldscript libaudit.so libauparse.so

	# remove RedHat garbage
	rm -r "${D}"/etc/{rc.d,sysconfig} || die

	# Gentoo rules
	insinto /etc/audit/
	doins "${FILESDIR}"/audit.rules*

	# audit logs go here
	keepdir /var/log/audit/

	# Security
	lockdown_perms "${D}"

	# Don't install .la files in Python directories.
	python_clean_installation_image
}

pkg_postinst() {
	lockdown_perms "${ROOT}"
	python_mod_optimize audit.py
}

pkg_postrm() {
	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
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-process/audit: ChangeLog audit-2.0.5.ebuild
@ 2011-02-07 21:00 Arfrever Frehtes Taifersar Arahesis (arfrever)
  0 siblings, 0 replies; 3+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2011-02-07 21:00 UTC (permalink / raw
  To: gentoo-commits

arfrever    11/02/07 21:00:11

  Modified:             ChangeLog audit-2.0.5.ebuild
  Log:
  Don't install auparse.a in Python site-packages directories.
  
  (Portage version: 2.2.0_alpha21_p2/cvs/Linux x86_64)

Revision  Changes    Path
1.63                 sys-process/audit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?r1=1.62&r2=1.63

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog	25 Jan 2011 03:52:32 -0000	1.62
+++ ChangeLog	7 Feb 2011 21:00:11 -0000	1.63
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.62 2011/01/25 03:52:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.63 2011/02/07 21:00:11 arfrever Exp $
+
+  07 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  audit-2.0.5.ebuild, +files/audit-2.0.5-python.patch:
+  Don't install auparse.a in Python site-packages directories.
 
   25 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> audit-1.7.3.ebuild,
   audit-1.7.4.ebuild, audit-1.7.9.ebuild, audit-1.7.17.ebuild:



1.2                  sys-process/audit/audit-2.0.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?r1=1.1&r2=1.2

Index: audit-2.0.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audit-2.0.5.ebuild	25 Jan 2011 03:35:01 -0000	1.1
+++ audit-2.0.5.ebuild	7 Feb 2011 21:00:11 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild,v 1.1 2011/01/25 03:35:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild,v 1.2 2011/02/07 21:00:11 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -65,7 +65,7 @@
 	fi
 
 	# Don't build static version of Python module.
-	epatch "${FILESDIR}"/${PN}-1.7.17-python.patch
+	epatch "${FILESDIR}"/${P}-python.patch
 
 	# Regenerate autotooling
 	eautoreconf






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-process/audit: ChangeLog audit-2.0.5.ebuild
@ 2011-02-07 21:38 Arfrever Frehtes Taifersar Arahesis (arfrever)
  0 siblings, 0 replies; 3+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2011-02-07 21:38 UTC (permalink / raw
  To: gentoo-commits

arfrever    11/02/07 21:38:55

  Modified:             ChangeLog audit-2.0.5.ebuild
  Log:
  Support installation for multiple Python ABIs (bug #316965).
  
  (Portage version: 2.2.0_alpha21_p2/cvs/Linux x86_64)

Revision  Changes    Path
1.64                 sys-process/audit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?r1=1.63&r2=1.64

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	7 Feb 2011 21:00:11 -0000	1.63
+++ ChangeLog	7 Feb 2011 21:38:55 -0000	1.64
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/audit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.63 2011/02/07 21:00:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.64 2011/02/07 21:38:55 arfrever Exp $
+
+  07 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  audit-2.0.5.ebuild:
+  Support installation for multiple Python ABIs (bug #316965).
 
   07 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   audit-2.0.5.ebuild, +files/audit-2.0.5-python.patch:



1.3                  sys-process/audit/audit-2.0.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild?r1=1.2&r2=1.3

Index: audit-2.0.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audit-2.0.5.ebuild	7 Feb 2011 21:00:11 -0000	1.2
+++ audit-2.0.5.ebuild	7 Feb 2011 21:38:55 -0000	1.3
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild,v 1.2 2011/02/07 21:00:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.0.5.ebuild,v 1.3 2011/02/07 21:38:55 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit autotools multilib toolchain-funcs python linux-info
 
@@ -31,8 +33,8 @@
 
 pkg_setup() {
 	linux-info_pkg_setup
-	python_set_active_version 2
 	python_pkg_setup
+	PYTHON_DIRS="bindings/python swig"
 }
 
 src_prepare() {
@@ -67,6 +69,10 @@
 	# Don't build static version of Python module.
 	epatch "${FILESDIR}"/${P}-python.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
 
@@ -83,8 +89,37 @@
 	econf --sbindir=/sbin $(use_with prelude)
 }
 
+src_compile() {
+	default
+
+	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_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+
+	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
+
 	dodoc AUTHORS ChangeLog README* THANKS TODO
 	docinto contrib
 	dodoc contrib/*






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-02-07 21:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-07 21:00 [gentoo-commits] gentoo-x86 commit in sys-process/audit: ChangeLog audit-2.0.5.ebuild Arfrever Frehtes Taifersar Arahesis (arfrever)
  -- strict thread matches above, loose matches on Subject: below --
2011-02-07 21:38 Arfrever Frehtes Taifersar Arahesis (arfrever)
2011-01-25  3:35 Robin H. Johnson (robbat2)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox