diff --git a/dbus-0.92-audit-system.patch b/dbus-0.92-audit-system.patch new file mode 100644 index 0000000..903f1cb --- /dev/null +++ b/dbus-0.92-audit-system.patch @@ -0,0 +1,37 @@ +--- dbus-0.92/bus/selinux.c.audit_system 2006-09-07 13:13:21.000000000 -0400 ++++ dbus-0.92/bus/selinux.c 2006-09-07 13:39:46.000000000 -0400 +@@ -126,6 +126,7 @@ + va_list ap; + va_start(ap, fmt); + #ifdef HAVE_LIBAUDIT ++ if (audit_fd > = 0) + { + char buf[PATH_MAX*2]; + +@@ -133,10 +134,10 @@ + vsnprintf(buf, sizeof(buf), fmt, ap); + audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL, + NULL, getuid()); ++ return; + } +-#else +- vsyslog (LOG_INFO, fmt, ap); + #endif /* HAVE_LIBAUDIT */ ++ vsyslog (LOG_INFO, fmt, ap); + va_end(ap); + } + +@@ -960,9 +961,12 @@ + { + sidput (bus_sid); + bus_sid = SECSID_WILD; +- ++ + #ifdef DBUS_ENABLE_VERBOSE_MODE ++ /* ++ TUrning off for now since this is misleading reporting as error message + bus_avc_print_stats (); ++ */ + #endif /* DBUS_ENABLE_VERBOSE_MODE */ + + avc_destroy (); diff --git a/dbus.spec b/dbus.spec index 12ae72d..7dcb04e 100644 --- a/dbus.spec +++ b/dbus.spec @@ -8,7 +8,7 @@ Summary: D-BUS message bus Name: dbus Version: 0.92 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -30,6 +30,7 @@ Conflicts: cups < 1:1.1.20-4 Patch2: dbus-0.61-selinux-avc-audit.patch Patch3: dbus-0.60-start-early.patch +Patch4: dbus-0.92-audit-system.patch %description @@ -62,7 +63,7 @@ in this separate package so server systems need not install X. %patch2 -p1 -b .selinux-avc-audit %patch3 -p1 -b .start-early - +%patch4 -p1 -b .audit_system autoreconf -f -i %build @@ -167,6 +168,9 @@ fi %{_includedir}/* %changelog +* Wed Sep 6 2006 Dan Walsh - 0.92-2 +- Only audit on the system bus + * Fri Aug 18 2006 John (J5) Palmieri - 0.92-1 - Update to 0.92 - remove old patches