Disable libaudit when not using SELinux. Should close bug #209571.

Thanks to jamatik <jamatik@wheep.de> for reporting.
Package-Manager: portage-2.1.4.3

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 855b1e962d7262befddacb4e53319a6c6b81c779..96f6dcca8b0029ea98a4b7c4f30b1cf2fa0214e1 100644 (file)
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.208 2008/02/07 00:56:52 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.209 2008/02/12 13:01:15 steev Exp $
+
+  12 Feb 2008; Steev Klimaszewski <steev@gentoo.org> dbus-1.1.4.ebuild:
+  Disable libaudit when not using SELinux.  Should close bug #209571.  
+  Thanks to jamatik <jamatik@wheep.de> for reporting.
 
   07 Feb 2008; Steev Klimaszewski <steev@gentoo.org> dbus-1.1.4.ebuild:
   Only patch if we are building with use X, the patch causes an error when

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f07594c1629bfdad926b2d3fa653fe3dadd99e73..890af8126b7b81d610ed889ddb85a91fb0c5797c 100644 (file)
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,6 +5,6 @@ AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e
 DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
 DIST dbus-1.1.4.tar.gz 1400585 RMD160 22d08a6c00ac3cd0bcf97d7733f39af36bcbfb0b SHA1 f246dfbc7dadb8a11a413f3376fdcd22e52eb1e4 SHA256 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d
 EBUILD dbus-1.0.2-r2.ebuild 3406 RMD160 2bc007e091ca12b57248ccb34677d001e7ca3a77 SHA1 bf45ae458276a3ae23551cb4531d8b3c3af81fc9 SHA256 627893aedf081dfef8562bdd48302e1eae7c532c508310cd887c0e197639bef7
-EBUILD dbus-1.1.4.ebuild 3481 RMD160 07fb9db8f24491723520f4cf02b971bb58e0e7f4 SHA1 0a5e7c4ebacc68789f5f2d76dadaad33d8109ca6 SHA256 44eac705c557133f7066ab21680e7fb6cbae86bd6d752ff958830baa78ec4ffc
-MISC ChangeLog 31476 RMD160 00a913c44acb5520ae03672de443a10a4825dcba SHA1 b715795f5b522b1c4a02be7f8654a6996e46c528 SHA256 2030071fc50a84126b0826acd63f2f75b2f8cff2eccfaae50e887002d34c1c2b
+EBUILD dbus-1.1.4.ebuild 3615 RMD160 e624bbf41d68ee262e979fdfe18ccefdcf0da17f SHA1 4de46e72c4dd2f56c6e448808969c5fb3f89e944 SHA256 cfeb8cf28565ec4a89e4382d8d1002fe97113ee545fcfd41c9adfdb0ba0e73db
+MISC ChangeLog 31675 RMD160 d2eb2cbc6e3ecd7533d16964dbcefcfe44c542de SHA1 d28ab39168d9b6d1109e146c0dee3ac57aa6ee70 SHA256 af032d5570da6983fcf18a13715ea8ba419d257a3eb3dbbef42e8e1574ae2347
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d

diff --git a/sys-apps/dbus/dbus-1.1.4.ebuild b/sys-apps/dbus/dbus-1.1.4.ebuild
index 566f4d3f9c30f6a2b8718d7359c98c6914db8791..f6d695e4fbc6018742b9c85c096afd7d72408e98 100644 (file)
--- a/sys-apps/dbus/dbus-1.1.4.ebuild
+++ b/sys-apps/dbus/dbus-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.6 2008/02/07 02:09:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.7 2008/02/12 13:01:15 steev Exp $
 
 inherit eutils multilib autotools flag-o-matic
 
@@ -39,12 +39,14 @@ src_compile() {
        local myconf=""
 
        hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-
+       # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+       # not on an SELinux profile.
        econf \
                $(use_with X x) \
                $(use_enable kernel_linux inotify) \
                $(use_enable kernel_FreeBSD kqueue) \
                $(use_enable selinux) \
+               $(use_enable selinux libaudit)  \
                $(use_enable debug verbose-mode) \
                $(use_enable debug asserts) \
                --with-xml=expat \