diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-12-22 07:36:33 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-12-22 07:36:33 +0000 |
| commit | f6c9b2361c3fd972df6dfbe60d0431ba1d5f0773 (patch) | |
| tree | e77143a6f26a17c723895aa1c765799a7fa1bca0 /sys-process/audit | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f6c9b2361c3fd972df6dfbe60d0431ba1d5f0773.tar.gz gentoo-2-f6c9b2361c3fd972df6dfbe60d0431ba1d5f0773.tar.bz2 gentoo-2-f6c9b2361c3fd972df6dfbe60d0431ba1d5f0773.zip | |
Fix swig build. Bug #398071: Fix audisp-remote location, move to /usr/sbin due to linkage against libcap-ng.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-process/audit')
| -rw-r--r-- | sys-process/audit/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-process/audit/audit-2.1.3-r1.ebuild | 7 | ||||
| -rw-r--r-- | sys-process/audit/audit-2.2.2.ebuild | 7 |
3 files changed, 16 insertions, 5 deletions
diff --git a/sys-process/audit/ChangeLog b/sys-process/audit/ChangeLog index c85726550f11..049029c17424 100644 --- a/sys-process/audit/ChangeLog +++ b/sys-process/audit/ChangeLog @@ -1,6 +1,11 @@ # 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.85 2012/12/22 07:02:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.86 2012/12/22 07:36:33 robbat2 Exp $ + + 22 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> audit-2.1.3-r1.ebuild, + audit-2.2.2.ebuild: + Fix swig build. Bug #398071: Fix audisp-remote location, move to /usr/sbin due + to linkage against libcap-ng. *audit-2.2.2 (22 Dec 2012) diff --git a/sys-process/audit/audit-2.1.3-r1.ebuild b/sys-process/audit/audit-2.1.3-r1.ebuild index 5a06c65474bc..b3faf3249d08 100644 --- a/sys-process/audit/audit-2.1.3-r1.ebuild +++ b/sys-process/audit/audit-2.1.3-r1.ebuild @@ -1,6 +1,6 @@ # 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.1.3-r1.ebuild,v 1.11 2012/12/22 03:36:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.12 2012/12/22 07:36:33 robbat2 Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -75,7 +75,7 @@ src_prepare() { # Python bindings are built/installed manually. sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am - sed -e "/^SUBDIRS =/s/ swig//" -i Makefile.am + sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am # Regenerate autotooling eautoreconf @@ -142,6 +142,9 @@ src_install() { # things like shadow use this so we need to be in / gen_usr_ldscript -a audit auparse + [ -f "${D}"/sbin/audisp-remote ] && \ + mv "${D}"/{sbin,usr/sbin}/audisp-remote || die + # remove RedHat garbage rm -r "${D}"/etc/{rc.d,sysconfig} || die diff --git a/sys-process/audit/audit-2.2.2.ebuild b/sys-process/audit/audit-2.2.2.ebuild index cd515e140cf8..660171dd9447 100644 --- a/sys-process/audit/audit-2.2.2.ebuild +++ b/sys-process/audit/audit-2.2.2.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2.ebuild,v 1.2 2012/12/22 07:36:33 robbat2 Exp $ EAPI="4" PYTHON_DEPEND="python? 2" @@ -75,7 +75,7 @@ src_prepare() { # Python bindings are built/installed manually. sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am - sed -e "/^SUBDIRS =/s/ swig//" -i Makefile.am + sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am # Regenerate autotooling eautoreconf @@ -142,6 +142,9 @@ src_install() { # things like shadow use this so we need to be in / gen_usr_ldscript -a audit auparse + [ -f "${D}"/sbin/audisp-remote ] && \ + mv "${D}"/{sbin,usr/sbin}/audisp-remote || die + # remove RedHat garbage rm -r "${D}"/etc/{rc.d,sysconfig} || die |