rpms/dbus-broker
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Bump to v17-1

Browse Source
This commit is contained in:
Tom Gundersen 2019-01-02 15:38:03 +01:00
parent a9ff9ff2fa
commit 5829572a68
4 changed files with 13 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-peer-request_name-fix-typo-in-policy-check.patch
View File

@ -1,26 +0,0 @@
From 11957a930725d6e3af059bb5a0d98b540ce6fd20 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sun, 25 Nov 2018 22:55:15 +0100
Subject: [PATCH] peer/request_name: fix typo in policy check
Signed-off-by: Tom Gundersen <teg@jklm.no>
---
src/bus/peer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bus/peer.c b/src/bus/peer.c
index 877da48..1a3ac66 100644
--- a/src/bus/peer.c
+++ b/src/bus/peer.c
@@ -312,7 +312,7 @@ int peer_request_name(Peer *peer, const char *name, uint32_t flags, NameChange *
r = policy_snapshot_check_own(peer->policy, name);
if (r) {
- if (r == POLICY_E_ACCESS_DENIED || r == POLICY_E_ACCESS_DENIED)
+ if (r == POLICY_E_ACCESS_DENIED || r == POLICY_E_SELINUX_ACCESS_DENIED)
return PEER_E_NAME_REFUSED;
return error_fold(r);
--
2.19.1

31
0001-peer-request_name-handle-SELinux-denial-gracefully.patch
View File

@ -1,31 +0,0 @@
From a35b2c24e3e99c121132d0b201179618f9be3485 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sun, 25 Nov 2018 22:28:55 +0100
Subject: [PATCH] peer/request_name: handle SELinux denial gracefully
We were not handling policy failure due to SELinux properly, causing
the bus to shut down due to an unexpected error.
This bug was introduced in commit cb18435c5d42436dfedfcf9e389e023f2669c87b.
Signed-off-by: Tom Gundersen <teg@jklm.no>
---
src/bus/peer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bus/peer.c b/src/bus/peer.c
index bb85475..877da48 100644
--- a/src/bus/peer.c
+++ b/src/bus/peer.c
@@ -312,7 +312,7 @@ int peer_request_name(Peer *peer, const char *name, uint32_t flags, NameChange *
r = policy_snapshot_check_own(peer->policy, name);
if (r) {
- if (r == POLICY_E_ACCESS_DENIED)
+ if (r == POLICY_E_ACCESS_DENIED || r == POLICY_E_ACCESS_DENIED)
return PEER_E_NAME_REFUSED;
return error_fold(r);
--
2.19.1

8
0001-units-system-add-messagebus-alias.patch
View File

@ -1,4 +1,4 @@
From 10e6ca1d517def513cad0272d60a1dbef7577143 Mon Sep 17 00:00:00 2001
From b7155364aa8df83534cbe5795f5959cb32030be1 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Tue, 20 Nov 2018 17:09:44 +0100
Subject: [PATCH] units/system: add `messagebus` alias
@ -12,10 +12,10 @@ Signed-off-by: Tom Gundersen <teg@jklm.no>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/units/system/dbus-broker.service.in b/src/units/system/dbus-broker.service.in
index 1ccf4db..f3bae16 100644
index 97f1655..ed28e66 100644
--- a/src/units/system/dbus-broker.service.in
+++ b/src/units/system/dbus-broker.service.in
@@ -15,4 +15,6 @@ ExecStart=@bindir@/dbus-broker-launch --scope system --audit
@@ -19,4 +19,6 @@ ExecStart=@bindir@/dbus-broker-launch --scope system --audit
ExecReload=@bindir@/busctl call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig
[Install]
@ -24,5 +24,5 @@ index 1ccf4db..f3bae16 100644
+# old SysV script (messagebus).
+Alias=dbus.service messagebus.service
--
2.19.1
2.20.1

14
dbus-broker.spec
View File

@ -1,23 +1,22 @@
%global dbus_user_id 81
Name: dbus-broker
Version: 16
Release: 8%{?dist}
Version: 17
Release: 1%{?dist}
Summary: Linux D-Bus Message Broker
License: ASL 2.0
URL: https://github.com/bus1/dbus-broker
Source0: https://github.com/bus1/dbus-broker/releases/download/v%{version}/dbus-broker-%{version}.tar.xz
Patch0: 0001-units-system-add-messagebus-alias.patch
Patch1: 0001-peer-request_name-handle-SELinux-denial-gracefully.patch
Patch2: 0001-peer-request_name-fix-typo-in-policy-check.patch
Provides: bundled(c-dvar) = 1
Provides: bundled(c-ini) = 1
Provides: bundled(c-list) = 3
Provides: bundled(c-rbtree) = 3
Provides: bundled(c-shquote) = 1
%{?systemd_requires}
BuildRequires: pkgconfig(audit)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libcap-ng)
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libsystemd)
@ -113,6 +112,11 @@ fi
%{_userunitdir}/dbus-broker.service
%changelog
* Wed Jan 2 2019 Tom Gundersen <teg@jklm.no> - 17-1
- apply more sandboxing through systemd
- improve logging on disconnect
- don't send FDs to clients who don't declare support
* Wed Nov 28 2018 Tom Gundersen <teg@jklm.no> - 16-8
- don't apply presets on updates to dbus-daemon