diff --git a/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch b/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch new file mode 100644 index 0000000..e1941ba --- /dev/null +++ b/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch @@ -0,0 +1,37 @@ +From 17539e71e7ac112f04d5e34aa2644b41be39926d Mon Sep 17 00:00:00 2001 +From: Joel Savitz +Date: Mon, 7 Jun 2021 16:26:00 -0400 +Subject: [PATCH] kpatch: Sync signal subcmd usage output with manpage + +Fixes: 1188 + +Signed-off-by: Joel Savitz +--- + kpatch/kpatch | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kpatch/kpatch b/kpatch/kpatch +index da538069c014..4e46b124e492 100755 +--- a/kpatch/kpatch ++++ b/kpatch/kpatch +@@ -36,7 +36,7 @@ MAX_LOAD_ATTEMPTS=5 + RETRY_INTERVAL=2 + + usage_cmd() { +- printf ' %-20s\n %s\n' "$1" "$2" >&2 ++ printf ' %-20s\n%s\n' "$1" "$(fmt -w 80 <(echo " $2"))" >&2 + } + + usage () { +@@ -57,7 +57,7 @@ usage () { + echo >&2 + usage_cmd "list" "list installed patch modules" + echo >&2 +- usage_cmd "signal" "signal/poke any process stalling the current patch transition" ++ usage_cmd "signal" "signal/poke any process stalling the current patch transition. This is only useful on systems that have the sysfs livepatch signal interface. On other systems, the signaling should be done automatically by the OS and this subcommand is a no-op." + echo >&2 + usage_cmd "version" "display the kpatch version" + exit 1 +-- +2.26.3 + diff --git a/kpatch.spec b/kpatch.spec index d3c6b87..4b1ee3b 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -2,7 +2,7 @@ Name: kpatch Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -16,7 +16,7 @@ Patch0: 0001-contrib-disable-upstart-kpatch.conf-install.patch Patch1: 0002-kpatch-clarify-unload-unsupport.patch # Upstream backports (inactive -- for future reference) -#Patch100: 0100-kpatch-wait-for-module-ref-counts-on-unload.patch +Patch100: 0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch # kpatch-dnf backports (inactive -- for future reference) #Patch200: 0200-foo-bar-etcetera.patch @@ -49,8 +49,8 @@ kpatch-patch packages updates. %setup -q %patch0 -p1 %patch1 -p1 -# Use this to apply upstream patches to kpatch (inactive) -#%patch100 -p1 +# Use this to apply upstream patches to kpatch +%patch100 -p1 %setup -D -T -a 1 @@ -88,6 +88,9 @@ echo "To enable automatic kpatch-patch subscription, run:" echo -e "\t$ dnf kpatch auto" %changelog +* Thu Jun 10 2021 Joe Lawrence - 0.9.3-2 +- Rebase to latest upstream (via backport patch) + * Tue May 18 2021 Joel Savitz - 0.9.3-1 - Rebase to latest upstream