From 434d169667ad0650e9c5f12654be5fadf1d1a456 Mon Sep 17 00:00:00 2001 From: lingsheng Date: Thu, 30 Sep 2021 14:42:32 +0800 Subject: [PATCH] add usage output (cherry picked from commit a6f7a35fb85a342a93e88ccb167bd2e6e9b76552) --- add-usage-output.patch | 34 ++++++++++++++++++++++++++++++++++ mosquitto.spec | 6 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 add-usage-output.patch diff --git a/add-usage-output.patch b/add-usage-output.patch new file mode 100644 index 0000000..4eb171b --- /dev/null +++ b/add-usage-output.patch @@ -0,0 +1,34 @@ +From 5e1dbdb12f32d2c89373f91c764b396b4316690b Mon Sep 17 00:00:00 2001 +From: lingsheng +Date: Thu, 30 Sep 2021 11:33:52 +0800 +Subject: [PATCH] add usage output + +--- + src/conf.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/conf.c b/src/conf.c +index 9d31ad9..ed989d5 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -358,12 +358,12 @@ static void print_usage(void) + printf("mosquitto version %s\n\n", VERSION); + printf("mosquitto is an MQTT v5.0/v3.1.1/v3.1 broker.\n\n"); + printf("Usage: mosquitto [-c config_file] [-d] [-h] [-p port]\n\n"); +- printf(" -c : specify the broker config file.\n"); +- printf(" -d : put the broker into the background after starting.\n"); +- printf(" -h : display this help.\n"); +- printf(" -p : start the broker listening on the specified port.\n"); ++ printf(" -c, --config-file : specify the broker config file.\n"); ++ printf(" -d, --daemon : put the broker into the background after starting.\n"); ++ printf(" -h, --help : display this help.\n"); ++ printf(" -p, --port : start the broker listening on the specified port.\n"); + printf(" Not recommended in conjunction with the -c option.\n"); +- printf(" -v : verbose mode - enable all logging types. This overrides\n"); ++ printf(" -v, --verbose : verbose mode - enable all logging types. This overrides\n"); + printf(" any logging options given in the config file.\n"); + printf("\nSee https://mosquitto.org/ for more information.\n\n"); + } +-- +2.23.0 + diff --git a/mosquitto.spec b/mosquitto.spec index 529c8f1..7981aae 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -1,10 +1,11 @@ Name: mosquitto Version: 1.6.15 -Release: 2 +Release: 3 Summary: Open Source MQTT v3.1/v3.1.1 Broker License: BSD URL: http://mosquitto.org/ Source0: http://mosquitto.org/files/source/%{name}-%{version}.tar.gz +Patch0001: add-usage-output.patch BuildRequires: c-ares-devel gcc-c++ libuuid-devel libwebsockets-devel openssl-devel BuildRequires: systemd-devel BuildRequires: make @@ -88,6 +89,9 @@ exit 0 %{_mandir}/man3/*.3.* %changelog +* Thu Sep 30 2021 lingsheng - 1.6.15-3 +- add usage output + * Tue Sep 24 2021 zhengyaohui - 1.6.15-2 - add buildrequires make -- Gitee