diff --git a/0024-typofix-fix-incorrect-printing-in-lxcfs-help-interfa.patch b/0024-typofix-fix-incorrect-printing-in-lxcfs-help-interfa.patch new file mode 100644 index 0000000000000000000000000000000000000000..05ad8a0e1ff8818ed01346648ab5957cb9f221f0 --- /dev/null +++ b/0024-typofix-fix-incorrect-printing-in-lxcfs-help-interfa.patch @@ -0,0 +1,26 @@ +From c27c750ba028a65a3d136999e85939dbb9601b06 Mon Sep 17 00:00:00 2001 +From: vegbir +Date: Thu, 14 Dec 2023 07:27:07 +0000 +Subject: [PATCH] typofix: fix incorrect printing in lxcfs help interface + +Signed-off-by: vegbir +--- + src/lxcfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lxcfs.c b/src/lxcfs.c +index cb0739c..c55a388 100644 +--- a/src/lxcfs.c ++++ b/src/lxcfs.c +@@ -1181,7 +1181,7 @@ static void usage(void) + lxcfs_info("Options :"); + lxcfs_info(" -d, --debug Run lxcfs with debugging enabled"); + lxcfs_info(" -f, --foreground Run lxcfs in the foreground"); +- lxcfs_info(" -n, --help Print help"); ++ lxcfs_info(" -h, --help Print help"); + lxcfs_info(" -l, --enable-loadavg Enable loadavg virtualization"); + lxcfs_info(" -o Options to pass directly through fuse"); + lxcfs_info(" -p, --pidfile=FILE Path to use for storing lxcfs pid"); +-- +2.41.0 + diff --git a/lxcfs.spec b/lxcfs.spec index b1ae440e8c124b80d968aedd6305067a765af021..57736745e650d76cee67b831670b49b81c4c2a33 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -4,12 +4,17 @@ #Basic Information Name: lxcfs Version: 4.0.11 -Release: 8 +Release: 9 Summary: FUSE filesystem for LXC License: LGPL 2.1+ URL: http://linuxcontainers.org Source: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build + +# Add blanks to keep the number of lines in different branches consistent +## + +# The following is the full version of the patch Patch9001: 0001-systemd.patch Patch9002: 0002-remove-sysvinit-upstart.patch Patch9003: 0003-show-dev-name-in-container.patch @@ -32,7 +37,8 @@ Patch9019: 0019-fix-dev-read-memory-leak-in-container.patch Patch9020: 0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch Patch9021: 0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch Patch9022: 0022-cpuview-fix-possible-use-after-free-in-find_proc_sta.patch -Patch9023: 0023-proc-fix-proc-diskstats-output-format.patch +Patch9023: 0023-proc-fix-proc-diskstats-output-format.patch +Patch9024: 0024-typofix-fix-incorrect-printing-in-lxcfs-help-interfa.patch #Dependency BuildRequires: autoconf automake libtool help2man @@ -94,6 +100,12 @@ fi %{_unitdir}/* %changelog +* Fri Dec 15 2023 yangjiaqi - 4.0.11-9 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix incorrect printing in lxcfs help interface + * Wed Mar 22 2023 yangjiaqi - 4.0.11-8 - Type:bugfix - CVE:NA