!345 [sync] PR-343: fix tools with -? option give error

From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian

0047-fix-tools-with-option-give-error-message.patch

@@ -0,0 +1,25 @@
+From db2c7257ec518fe3e3cb1f8ea3a9cb32c227ce94 Mon Sep 17 00:00:00 2001
+From: "Neil.wrz" <wangrunze13@huawei.com>
+Date: Thu, 1 Sep 2022 05:20:08 -0700
+Subject: [PATCH] fix tools with -? option give error message
+
+Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
+---
+ src/lxc/tools/arguments.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
+index c16d99f..80c2083 100644
+--- a/src/lxc/tools/arguments.h
++++ b/src/lxc/tools/arguments.h
+@@ -145,6 +145,7 @@ struct lxc_arguments {
+ #define LXC_COMMON_OPTIONS                                                     \
+ 	    { "name",        required_argument, 0, 'n'         },              \
+ 	    { "help",        no_argument,       0, 'h'         },              \
++	    { "help",        no_argument,       0, '?'         },              \
+ 	    { "usage",       no_argument,       0, OPT_USAGE   },              \
+ 	    { "version",     no_argument,       0, OPT_VERSION },              \
+ 	    { "quiet",       no_argument,       0, 'q'         },              \
+-- 
+2.25.1
+

lxc.spec

@@ -1,4 +1,4 @@
-%global _release 2022083101
+%global _release 2022090201
 
 Name:           lxc
 Version:        4.0.3
@@ -54,6 +54,7 @@ Patch0043:	0043-do-not-operate-playload-and-attach-cgroup-if-no-cont.patch
 Patch0044:	0044-fix-HOME-env-unset-error.patch
 Patch0045:	0045-only-set-user-or-image-set-non-empty-HOME.patch
 Patch0046:	0046-return-fail-if-no-args-or-no-rootfs-path-found.patch
+Patch0047:      0047-fix-tools-with-option-give-error-message.patch    
 
 BuildRequires:  systemd-units git libtool graphviz docbook2X doxygen chrpath
 BuildRequires:  pkgconfig(libseccomp)
@@ -225,6 +226,12 @@ make check
 %{_mandir}/*/man7/%{name}*
 
 %changelog
+* Fri Sep 02 2022 Neil.wrz<wangrunze13@huawei.com> - 4.0.3-2022090201
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: fix tools using -? option give error 
+
 * Wed Aug 31 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022083101
 - Type:bugfix
 - ID:NA

series.conf

@@ -44,3 +44,4 @@
 0044-fix-HOME-env-unset-error.patch
 0045-only-set-user-or-image-set-non-empty-HOME.patch
 0046-return-fail-if-no-args-or-no-rootfs-path-found.patch
+0047-fix-tools-with-option-give-error-message.patch