rpms/dbus/devel dbus-0.35.2-selinux-avc-audit.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 dbus.spec, 1.51, 1.52 sources, 1.11, 1.12 dbus-0.23-selinux-avc-audit.patch, 1.2, NONE dbus-0.34-kill-babysitter.patch, 1.1, NONE dbus-0.34-python-threadsync.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 18 18:33:24 UTC 2005
Author: johnp
Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12976
Modified Files:
.cvsignore dbus.spec sources
Added Files:
dbus-0.35.2-selinux-avc-audit.patch
Removed Files:
dbus-0.23-selinux-avc-audit.patch
dbus-0.34-kill-babysitter.patch
dbus-0.34-python-threadsync.patch
Log Message:
- Upgrade to dbus-0.35.2
- removed dbus-0.34-kill-babysitter.patch
- removed dbus-0.34-python-threadsync.patch
- removed dbus-0.23-selinux-avc-audit.patch
- added dbus-0.35.2-selinux-avc-audit.patch
: ----------------------------------------------------------------------
dbus-0.35.2-selinux-avc-audit.patch:
bus/selinux.c | 24 ++++++++++++++++++++++++
configure.in | 17 +++++++++++++++++
2 files changed, 41 insertions(+)
--- NEW FILE dbus-0.35.2-selinux-avc-audit.patch ---
--- dbus-0.35.2/bus/selinux.c.selinux-avc-audit 2005-07-18 14:11:27.000000000 -0400
+++ dbus-0.35.2/bus/selinux.c 2005-07-18 14:20:12.000000000 -0400
@@ -38,6 +38,9 @@
#include <selinux/flask.h>
#include <signal.h>
#include <stdarg.h>
+#ifdef HAVE_LIBAUDIT
+#include <libaudit.h>
+#endif /* HAVE_LIBAUDIT */
#endif /* HAVE_SELINUX */
#define BUS_SID_FROM_SELINUX(sid) ((BusSELinuxID*) (sid))
@@ -100,12 +103,26 @@
* @param variable argument list
*/
#ifdef HAVE_SELINUX
+#ifdef HAVE_LIBAUDIT
+static int audit_fd = -1;
+static void audit_init(void)
+{
+ audit_fd = audit_open();
+ if (audit_fd < 0)
+ _dbus_warn ("Failed opening connection to the audit subsystem");
+}
+#endif /* HAVE_LIBAUDIT */
+
static void
log_callback (const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
+#ifdef HAVE_LIBAUDIT
+ audit_log_avc (audit_fd, AUDIT_USER_AVC, fmt, ap);
+#else
vsyslog (LOG_INFO, fmt, ap);
+#endif /* HAVE_LIBAUDIT */
va_end(ap);
}
@@ -313,6 +330,10 @@
freecon (bus_context);
+#ifdef HAVE_LIBAUDIT
+ audit_init ();
+#endif /* HAVE_LIBAUDIT */
+
return TRUE;
#else
return TRUE;
@@ -937,6 +958,9 @@
#endif /* DBUS_ENABLE_VERBOSE_MODE */
avc_destroy ();
+#ifdef HAVE_LIBAUDIT
+ audit_close (audit_fd);
+#endif /* HAVE_LIBAUDIT */
}
#endif /* HAVE_SELINUX */
}
--- dbus-0.35.2/configure.in.selinux-avc-audit 2005-07-17 15:36:24.000000000 -0400
+++ dbus-0.35.2/configure.in 2005-07-18 14:11:27.000000000 -0400
@@ -63,6 +63,7 @@
AC_ARG_ENABLE(mono_docs, [ --enable-mono-docs build mono docs],enable_mono_docs=$enableval,enable_mono_docs=auto)
AC_ARG_ENABLE(python, [ --enable-python build python bindings],enable_python=$enableval,enable_python=auto)
AC_ARG_ENABLE(selinux, [ --enable-selinux build with SELinux support],enable_selinux=$enableval,enable_selinux=auto)
+AC_ARG_ENABLE(libaudit, [ --enable-libaudit build audit daemon support for SELinux],enable_libaudit=$enableval,enable_libaudit=auto)
AC_ARG_WITH(xml, [ --with-xml=[libxml/expat] XML library to use])
AC_ARG_WITH(init-scripts, [ --with-init-scripts=[redhat] Style of init scripts to install])
@@ -842,6 +843,22 @@
fi
+# libaudit detection
+if test x$enable_libaudit = xno ; then
+ have_libaudit=no;
+else
+ # See if we have audit daemon library
+ AC_CHECK_LIB(audit, audit_vlog,
+ have_libaudit=yes, have_libaudit=no)
+fi
+
+AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes)
+
+if test x$have_libaudit = xyes ; then
+ SELINUX_LIBS="$SELINUX_LIBS -laudit"
+ AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support])
+fi
+
#### Set up final flags
DBUS_CLIENT_CFLAGS=
DBUS_CLIENT_LIBS=
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 28 Jun 2005 20:52:19 -0000 1.11
+++ .cvsignore 18 Jul 2005 18:33:21 -0000 1.12
@@ -4,3 +4,4 @@
dbus-0.32.tar.gz
dbus-0.33.tar.gz
dbus-0.34.tar.gz
+dbus-0.35.2.tar.gz
Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- dbus.spec 28 Jun 2005 21:00:22 -0000 1.51
+++ dbus.spec 18 Jul 2005 18:33:21 -0000 1.52
@@ -11,7 +11,7 @@
Summary: D-BUS message bus
Name: dbus
-Version: 0.34
+Version: 0.35.2
Release: 1
URL: http://www.freedesktop.org/software/dbus/
Source0: %{name}-%{version}.tar.gz
@@ -35,9 +35,7 @@
Conflicts: cups < 1:1.1.20-4
Patch1: dbus-0.32-selinux_chroot_workaround.patch
-Patch2: dbus-0.23-selinux-avc-audit.patch
-Patch7: dbus-0.34-kill-babysitter.patch
-Patch8: dbus-0.34-python-threadsync.patch
+Patch2: dbus-0.35.2-selinux-avc-audit.patch
%description
@@ -115,12 +113,10 @@
%patch1 -p1 -b .selinux_chroot_workaround
%patch2 -p1 -b .selinux-avc-audit
-%patch7 -p0 -b .kill-babysitter
-%patch8 -p1 -b .python-threadsync
%build
-COMMON_ARGS="--enable-glib=yes --enable-libaudit --enable-qt=no --enable-selinux=yes --disable-gtk --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid"
+COMMON_ARGS="--enable-glib=yes --enable-libaudit --enable-qt=no --enable-selinux=yes --disable-gtk --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid}"
if test -d %{_libdir}/qt-3.1 ; then
export QTDIR=%{_libdir}/qt-3.1
@@ -128,9 +124,6 @@
echo "WARNING: %{_libdir}/qt-3.1 does not exist"
fi
-#### Fix user to run the system bus as
-perl -pi -e 's@<user>[a-z]+</user>@<user>%{dbus_user_uid}</user>@g' bus/system.conf*
-
### this is some crack because bits of dbus can be
### smp-compiled but others don't feel like working
function make_fast() {
@@ -174,7 +167,7 @@
perl -pi -e 's/\/usr\/lib\//\/usr\/lib64\//g' INSTALLED_FILES
%endif
-rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/dbus/dbus_bindings*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/dbus/*.*a
## %find_lang %{gettext_package}
@@ -264,9 +257,16 @@
%files python
%defattr(-,root,root)
%{_libdir}/python*/site-packages/dbus/*.py*
-%{_libdir}/python*/site-packages/dbus/dbus_bindings.so
+%{_libdir}/python*/site-packages/dbus/*.so
%changelog
+* Mon Jul 18 2005 John (J5) Palmieri <johnp at redhat.com> - 0.35.2-1
+- Upgrade to dbus-0.35.2
+- removed dbus-0.34-kill-babysitter.patch
+- removed dbus-0.34-python-threadsync.patch
+- removed dbus-0.23-selinux-avc-audit.patch
+- added dbus-0.35.2-selinux-avc-audit.patch
+
* Tue Jun 28 2005 John (J5) Palmieri <johnp at redhat.com> - 0.34-1
- Upgrade to dbus-0.34
- added dbus-0.34-kill-babysitter.patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 28 Jun 2005 20:52:19 -0000 1.11
+++ sources 18 Jul 2005 18:33:21 -0000 1.12
@@ -1 +1 @@
-fd25c4ee2374f6c3ef9e236290667242 dbus-0.34.tar.gz
+414680dddd3dec84cc3b0c45cdfaafbc dbus-0.35.2.tar.gz
--- dbus-0.23-selinux-avc-audit.patch DELETED ---
--- dbus-0.34-kill-babysitter.patch DELETED ---
--- dbus-0.34-python-threadsync.patch DELETED ---
More information about the fedora-cvs-commits
mailing list