Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2017-06-21 13:51:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1" Wed Jun 21 13:51:54 2017 rev:146 rq:504640 version:1.10.18 Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2017-04-11 12:42:39.171875749 +0200 +++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2017-06-21 13:51:55.607929496 +0200 @@ -1,0 +2,21 @@ +Tue Jun 13 07:42:17 UTC 2017 - [email protected] + +- swap to /usr/bin bsc#1029968 +- Add the following fixes from SLE12 + * bsc#980928 increase listen() backlog of AF_UNIX sockets to + SOMAXCONN fix-upstream-increase-backlog.patch +- The following bugs were already fixed but are missing changelog + entries + * bsc#867256 (No longer applicable) + * bsc#916785 (No longer applicable) + * bsc#1012564 (Not applicable) + * fdo#90004 (Fixed Upstream) +- Rename the following patches as a tidy up + * dbus-log-deny.patch to feature-suse-log-deny.patch + * dbus-do-autolaunch.patch feature-suse-do-autolaunch.patch + * 0001-Add-RefuseManualStartStop.patch to + feature-suse-refuse-manual-start-stop.patch + * 0001-Drop-Install-sections-from-user-services.patch to + fix-upstream-drop-install-sections-from-user-services.patch + +------------------------------------------------------------------- dbus-1.changes: same change Old: ---- 0001-Add-RefuseManualStartStop.patch 0001-Drop-Install-sections-from-user-services.patch dbus-do-autolaunch.patch dbus-log-deny.patch New: ---- feature-suse-do-autolaunch.patch feature-suse-log-deny.patch feature-suse-refuse-manual-start-stop.patch fix-upstream-drop-install-sections-from-user-services.patch fix-upstream-increase-backlog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.9J7NwA/_old 2017-06-21 13:51:56.643783378 +0200 +++ /var/tmp/diff_new_pack.9J7NwA/_new 2017-06-21 13:51:56.647782814 +0200 @@ -33,10 +33,13 @@ Source2: dbus-1.desktop Source3: dbus_at_console.ck Source4: baselibs.conf -Patch0: dbus-log-deny.patch +Patch0: feature-suse-log-deny.patch # PATCH-FIX-OPENSUSE [email protected] -- force a feature configure won't accept without x11 in buildrequires -Patch1: dbus-do-autolaunch.patch -Patch2: 0001-Drop-Install-sections-from-user-services.patch +Patch1: feature-suse-do-autolaunch.patch +# Patch-Feature-opensuse [email protected], users shouldn't be allowed to start / stop the dbus service. +Patch2: feature-suse-refuse-manual-start-stop.patch +Patch3: fix-upstream-drop-install-sections-from-user-services.patch +Patch4: fix-upstream-increase-backlog.patch BuildRequires: libcap-ng-devel BuildRequires: libexpat-devel BuildRequires: libtool @@ -58,9 +61,7 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autopatch -p1 %build echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.9J7NwA/_old 2017-06-21 13:51:56.675778864 +0200 +++ /var/tmp/diff_new_pack.9J7NwA/_new 2017-06-21 13:51:56.675778864 +0200 @@ -36,12 +36,13 @@ Source2: dbus-1.desktop Source3: dbus_at_console.ck Source4: baselibs.conf -Patch0: dbus-log-deny.patch +Patch0: feature-suse-log-deny.patch # PATCH-FIX-OPENSUSE [email protected] -- force a feature configure won't accept without x11 in buildrequires -Patch1: dbus-do-autolaunch.patch -Patch2: 0001-Drop-Install-sections-from-user-services.patch +Patch1: feature-suse-do-autolaunch.patch # Patch-Feature-opensuse [email protected], users shouldn't be allowed to start / stop the dbus service. -Patch3: 0001-Add-RefuseManualStartStop.patch +Patch2: feature-suse-refuse-manual-start-stop.patch +Patch3: fix-upstream-drop-install-sections-from-user-services.patch +Patch4: fix-upstream-increase-backlog.patch BuildRequires: audit-devel BuildRequires: doxygen BuildRequires: libcap-ng-devel @@ -114,10 +115,7 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autopatch -p1 %build echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in @@ -131,7 +129,7 @@ # is_opensuse was first defined after openSUSE 13.2 %configure \ --disable-static \ - --bindir=/bin \ + --bindir=/%{_bindir} \ --libexecdir=/lib/dbus-1 \ --libdir=/%{_lib} \ --with-init-scripts=suse \ @@ -173,9 +171,7 @@ mkdir -p %{buildroot}%{_libdir}/dbus-1.0/include/ mkdir -p %{buildroot}/lib/dbus-1/system-services # dbus-launch, too -mkdir -p %{buildroot}/%{_bindir} -mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir} -mv -f %{buildroot}/bin/dbus-launch %{buildroot}%{_bindir}/dbus-launch.nox11 +mv -f %{buildroot}/%{_bindir}/dbus-launch %{buildroot}%{_bindir}/dbus-launch.nox11 mkdir -p %{buildroot}%{_sbindir} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus %if 0%{?suse_version} <= 1315 && !0%{?is_opensuse} @@ -205,10 +201,17 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/dbus touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id -# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr +# Link the binaries that were in /bin back to /bin for compat (maybe remove for SLE-16) # Currently required to make upower work together with systemd -mkdir -p %{buildroot}%{_prefix}/bin -ln -sf /bin/dbus-send %{buildroot}%{_bindir}/dbus-send +mkdir -p %{buildroot}/bin + +ln -sf /%{_bindir}/dbus-cleanup-sockets %{buildroot}/bin/dbus-cleanup-sockets +ln -sf /%{_bindir}/dbus-daemon %{buildroot}/bin/dbus-daemon +ln -sf /%{_bindir}/dbus-monitor %{buildroot}/bin/dbus-monitor +ln -sf /%{_bindir}/dbus-send %{buildroot}/bin/dbus-send +ln -sf /%{_bindir}/dbus-test-tool %{buildroot}/bin/dbus-test-tool +ln -sf /%{_bindir}/dbus-update-activation-environment %{buildroot}/bin/dbus-update-activation-environment +ln -sf /%{_bindir}/dbus-uuidgen %{buildroot}/bin/dbus-uuidgen mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-launch @@ -307,12 +310,19 @@ %{_datadir}/dbus-1/session.conf %{_datadir}/dbus-1/system.conf %{_sysconfdir}/ConsoleKit +%{_bindir}/dbus-cleanup-sockets +%{_bindir}/dbus-daemon +%{_bindir}/dbus-monitor +%{_bindir}/dbus-run-session +%{_bindir}/dbus-send +%{_bindir}/dbus-send +%{_bindir}/dbus-test-tool +%{_bindir}/dbus-update-activation-environment +%{_bindir}/dbus-uuidgen /bin/dbus-cleanup-sockets /bin/dbus-daemon /bin/dbus-monitor -%{_bindir}/dbus-run-session /bin/dbus-send -%{_bindir}/dbus-send /bin/dbus-test-tool /bin/dbus-update-activation-environment /bin/dbus-uuidgen ++++++ feature-suse-do-autolaunch.patch ++++++ From: Stephan Kulow <[email protected]> We want x11 autolaunch even if we have no x11 in the build environment Index: dbus-1.6.8/dbus/dbus-sysdeps-unix.c =================================================================== --- dbus-1.6.8.orig/dbus/dbus-sysdeps-unix.c +++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c @@ -3230,7 +3230,7 @@ _dbus_get_tmpdir(void) return tmpdir; } -#if defined(DBUS_ENABLE_X11_AUTOLAUNCH) || defined(DBUS_ENABLE_LAUNCHD) +#if 1 /** * Execute a subprocess, returning up to 1024 bytes of output * into @p result. @@ -3450,7 +3450,7 @@ _dbus_get_autolaunch_address (const char *scope, DBusString *address, DBusError *error) { -#ifdef DBUS_ENABLE_X11_AUTOLAUNCH +#if 1 /* Perform X11-based autolaunch. (We also support launchd-based autolaunch, * but that's done elsewhere, and if it worked, this function wouldn't * be called.) */ ++++++ feature-suse-log-deny.patch ++++++ --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -48,7 +48,7 @@ <!-- Holes must be punched in service configuration files for name ownership and sending method calls --> <deny own="*"/> - <deny send_type="method_call"/> + <deny send_type="method_call" log="true"/> <!-- Signals and reply messages (method returns, errors) are allowed by default --> ++++++ feature-suse-refuse-manual-start-stop.patch ++++++ Index: dbus-1.10.12/bus/dbus.service.in =================================================================== --- dbus-1.10.12.orig/bus/dbus.service.in +++ dbus-1.10.12/bus/dbus.service.in @@ -2,6 +2,8 @@ Description=D-Bus System Message Bus Documentation=man:dbus-daemon(1) Requires=dbus.socket +RefuseManualStart=true +RefuseManualStop=true [Service] ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation ++++++ fix-upstream-drop-install-sections-from-user-services.patch ++++++ >From 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 Mon Sep 17 00:00:00 2001 From: Simon McVittie <[email protected]> Date: Sat, 7 Nov 2015 13:03:47 +0100 Subject: [PATCH] Drop [Install] sections from user services We install the symlink to enable dbus.socket statically, so it doesn't make much sense to invoke `systemctl enable` on it; and dbus.service should normally be started by socket activation (or possibly an explicit dependency) rather than manually. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92402 Signed-off-by: Simon McVittie <[email protected]> Reviewed-by: Lennart Poettering --- bus/systemd-user/dbus.service.in | 3 --- bus/systemd-user/dbus.socket.in | 4 ---- 2 files changed, 7 deletions(-) diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in index b41f522b8af8c174..4355d72844079cc5 100644 --- a/bus/systemd-user/dbus.service.in +++ b/bus/systemd-user/dbus.service.in @@ -6,6 +6,3 @@ Requires=dbus.socket [Service] ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - -[Install] -Also=dbus.socket diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in index 4793d1d4ff1dc13e..304ac4034208f811 100644 --- a/bus/systemd-user/dbus.socket.in +++ b/bus/systemd-user/dbus.socket.in @@ -4,7 +4,3 @@ Description=D-Bus User Message Bus Socket [Socket] ListenStream=%t/bus ExecStartPost=-@SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus - -[Install] -WantedBy=sockets.target -Also=dbus.service -- 2.9.3 ++++++ fix-upstream-increase-backlog.patch ++++++ commit 12bd6e893c91430fdbdf8a27087d4a792b04eef9 Author: Lennart Poettering <[email protected]> Date: Wed May 4 18:06:17 2016 +0200 sysdeps: increase listen() backlog of AF_UNIX sockets to SOMAXCONN Previously, the listen() backlog was set to an arbitrary 30. This means that if dbus-daemon is overloaded only 30 more connections may be queued by the kernel, before connect() fails with EAGAIN. (Note that EAGAIN != EINPROGRESS -- the latter is what is returned if a connection is queued and being processed for asynchronous sockets; EAGAIN in this case is really an error, that cannot be recovered from). Most software simply sets SOMAXCONN as backlog for AF_UNIX sockets, to allow queuing of as many connections as the kernel allows. SOMAXCONN is 128 on Linux, which is not particularly high, but at least higher than 30. This patch changes dbus-daemon to do the same. I noticed this when flooding dbus-daemon with a lot of connections, where it pretty quickly ceased to respond, much earlier than it really should. Note that the backlog has nothing to do with the number of concurrent connections allowed, it simply controls how many queued, but not accept()ed connections there may be on the listening socket. https://bugs.freedesktop.org/show_bug.cgi?id=95264 Index: dbus-1.8.22/dbus/dbus-sysdeps-unix.c =================================================================== --- dbus-1.8.22.orig/dbus/dbus-sysdeps-unix.c +++ dbus-1.8.22/dbus/dbus-sysdeps-unix.c @@ -1119,7 +1119,7 @@ _dbus_listen_unix_socket (const char return -1; } - if (listen (listen_fd, 30 /* backlog */) < 0) + if (listen (listen_fd, SOMAXCONN /* backlog */) < 0) { dbus_set_error (error, _dbus_error_from_errno (errno), "Failed to listen on socket \"%s\": %s",
