Accepting request 503558 from home:simotek:branches:Base:System
- 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
- 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
OBS-URL: https://build.opensuse.org/request/show/503558
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=250
This commit is contained in:
Git OBS Bridge
parent
07536dbbce
commit
641faa1ad0
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 13 07:42:17 UTC 2017 - sflees@suse.de
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 7 05:54:09 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
@ -33,10 +33,13 @@ Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.ta
|
||||
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 coolo@suse.de -- 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 sflees@suse.de, 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 @@ in this separate package so server systems need not install X.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
|
||||
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 13 07:42:17 UTC 2017 - sflees@suse.de
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 7 05:54:09 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
44
dbus-1.spec
44
dbus-1.spec
@ -36,12 +36,13 @@ Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.ta
|
||||
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 coolo@suse.de -- 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 sflees@suse.de, 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 @@ bus daemon).
|
||||
|
||||
%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 @@ export V=1
|
||||
# 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 @@ rm -v %{buildroot}/%{_lib}/lib%{name}.so
|
||||
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 @@ install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
|
||||
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 @@ fi
|
||||
%{_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
|
||||
|
||||
43
fix-upstream-increase-backlog.patch
Normal file
43
fix-upstream-increase-backlog.patch
Normal file
@ -0,0 +1,43 @@
|
||||
commit 12bd6e893c91430fdbdf8a27087d4a792b04eef9
|
||||
Author: Lennart Poettering <lennart@poettering.net>
|
||||
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",
|
||||
Loading…
Reference in New Issue
Block a user