bump to v15.2

Add back --verbose switch.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2018-08-27 16:47:18 +02:00
parent bb8a8504b8
commit 9489ba6921
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From 1fca70b8f331e794c35fd1f7e55cd4cd72baad64 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Mon, 27 Aug 2018 10:49:24 +0200
Subject: [PATCH] launch: add back --verbose command line switch
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
diff --git a/src/launch/main.c b/src/launch/main.c
index fc80bc3..60c0a2f 100644
--- a/src/launch/main.c
+++ b/src/launch/main.c
@@ -1634,6 +1634,7 @@ static void help(void) {
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_VERSION = 0x100,
+ ARG_VERBOSE,
ARG_AUDIT,
ARG_CONFIG,
ARG_SCOPE,
@@ -1641,6 +1642,7 @@ static int parse_argv(int argc, char *argv[]) {
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
+ { "verbose", no_argument, NULL, ARG_VERBOSE },
{ "audit", no_argument, NULL, ARG_AUDIT },
{ "config-file", required_argument, NULL, ARG_CONFIG, },
{ "scope", required_argument, NULL, ARG_SCOPE },
@@ -1658,6 +1660,10 @@ static int parse_argv(int argc, char *argv[]) {
printf("dbus-broker-launch %d\n", PACKAGE_VERSION);
return MAIN_EXIT;
+ /* noop for backward compatibility */
+ case ARG_VERBOSE:
+ break;
+
case ARG_AUDIT:
main_arg_audit = true;
break;
--
2.17.1

View File

@ -1,10 +1,11 @@
Name: dbus-broker
Version: 15
Release: 1%{?dist}
Release: 2%{?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: 1fca70b8f331e794c35fd1f7e55cd4cd72baad64.patch
Provides: bundled(c-dvar) = 1
Provides: bundled(c-list) = 3
Provides: bundled(c-rbtree) = 3
@ -63,6 +64,9 @@ recent Linux kernel releases.
%{_userunitdir}/dbus-broker.service
%changelog
* Mon Aug 27 2018 Tom Gundersen <teg@jklm.no> - 15-2
- add back --verbose switch for backwards compatibility
* Wed Aug 08 2018 Tom Gundersen <teg@jklm.no> - 15-1
- fix audit support
- make logging about invalid config less verbose