Bump to v18-1

0001-launch-align-errors-when-reading-service-files-with-.patch

@@ -1,53 +0,0 @@
-From a0869bdb8bb6dde92374bc12f5428913d5357653 Mon Sep 17 00:00:00 2001
-From: David Herrmann <dh.herrmann@gmail.com>
-Date: Fri, 11 Jan 2019 17:53:39 +0100
-Subject: [PATCH] launch: align errors when reading service-files with
- dbus-daemon(1)
-
-The reference implementation ignores all error-codes from
-bus1_desktop_file_load(), so we should do the same. However, none of
-these errors is expected, so lets make sure we print a warning.
-
-Reported-by: Yanko Kaneti <yaneti@declera.com>
-Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
----
- src/launch/main.c | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/src/launch/main.c b/src/launch/main.c
-index 2d3cce0..1a9e2eb 100644
---- a/src/launch/main.c
-+++ b/src/launch/main.c
-@@ -880,12 +880,24 @@ static int manager_ini_reader_parse_file(CIniGroup **groupp, const char *path) {
- 
-         fd = open(path, O_RDONLY | O_CLOEXEC);
-         if (fd < 0) {
--                if (errno == ENOENT) {
--                        *groupp = NULL;
--                        return 0;
--                }
-+                /*
-+                 * For compatibility reasons we have to accept any failure
-+                 * during open(2). dbus-daemon(1) simply ignores those errors
-+                 * and skips the service file in question.
-+                 *
-+                 * We would very much prefer to whitelist specific error codes
-+                 * here, but we would be playing whack-a-mole, so lets just
-+                 * treat it as soft-error.
-+                 */
-+                if (errno == ENOENT)
-+                        fprintf(stderr, "Original source was unlinked while parsing service file '%s'\n", path);
-+                else if (errno == EACCES)
-+                        fprintf(stderr, "Read access denied for service file '%s'\n", path);
-+                else
-+                        fprintf(stderr, "Unable to open service file '%s' (%d): %m\n", path, errno);
- 
--                return error_origin(-errno);
-+                *groupp = NULL;
-+                return 0;
-         }
- 
-         r = c_ini_reader_new(&reader);
--- 
-2.20.1
-

0001-units-system-run-in-the-root-network-namespace.patch

@@ -1,33 +0,0 @@
-From a11182d2cd4bc1a89a9795c572add2d85ea92fa7 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Mon, 14 Jan 2019 13:37:09 +0100
-Subject: [PATCH] units/system: run in the root network namespace
-
-The SELinux netlink socket can only be created in the root net
-namespace. libselinux does not support (as far as I can tell)
-providing the socket as a .socket unit, so we must run the broker
-in the root network namespace if we want to be notified about
-SELinux policy changes.
-
-This fixes issue #185.
-
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- src/units/system/dbus-broker.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/units/system/dbus-broker.service.in b/src/units/system/dbus-broker.service.in
-index 97f1655..4155630 100644
---- a/src/units/system/dbus-broker.service.in
-+++ b/src/units/system/dbus-broker.service.in
-@@ -14,7 +14,6 @@ LimitNOFILE=16384
- ProtectSystem=full
- PrivateTmp=true
- PrivateDevices=true
--PrivateNetwork=true
- ExecStart=@bindir@/dbus-broker-launch --scope system --audit
- ExecReload=@bindir@/busctl call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig
- 
--- 
-2.20.1
-

dbus-broker.spec

@@ -1,15 +1,13 @@
 %global dbus_user_id 81
 
 Name:                 dbus-broker
-Version:              17
-Release:              4%{?dist}
+Version:              18
+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-launch-align-errors-when-reading-service-files-with-.patch
-Patch2:               0001-units-system-run-in-the-root-network-namespace.patch
 Provides:             bundled(c-dvar) = 1
 Provides:             bundled(c-ini) = 1
 Provides:             bundled(c-list) = 3
@@ -114,6 +112,9 @@ fi
 %{_userunitdir}/dbus-broker.service
 
 %changelog
+* Thu Feb 21 2019 Tom Gundersen <teg@jklm.no> - 18-1
+- Minor bug fixes
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (dbus-broker-17.tar.xz) = 691fa5b4006e799240d483af1eb2870c736a9202ceedf86e4a53ceb820775fc33eade839acf6e218adcef0be0393afabcf762b716ea35208bf992b951a293d4d
+SHA512 (dbus-broker-18.tar.xz) = 90fd4e5f8d46c7d800eaff0089a5d7e27c2b833f4242ef260e4fe8827cc18a8cfefa5c98ec3849ac1ecacb7a4d23537e79989e7a21d437727291ff198b011cad