diff --git a/.gitignore b/.gitignore index 40d972e..5083f33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/kpatch-dnf-v0.3.tar.gz -SOURCES/v0.9.3.tar.gz +SOURCES/kpatch-dnf-v0.4.tar.gz +SOURCES/v0.9.4.tar.gz diff --git a/.kpatch.metadata b/.kpatch.metadata index d994ee3..20fca39 100644 --- a/.kpatch.metadata +++ b/.kpatch.metadata @@ -1,2 +1,2 @@ -6e905f1a910777a0a5f7a41d22331f6508cbd260 SOURCES/kpatch-dnf-v0.3.tar.gz -2b781cf5acd4869510950696e610b747ed508913 SOURCES/v0.9.3.tar.gz +fa86620559069e8253b5172849797a6d03b509be SOURCES/kpatch-dnf-v0.4.tar.gz +1f080a31cc087b41cb4d37c514819444bd8a75ae SOURCES/v0.9.4.tar.gz diff --git a/SOURCES/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch b/SOURCES/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch deleted file mode 100644 index e1941ba..0000000 --- a/SOURCES/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch +++ /dev/null @@ -1,37 +0,0 @@ -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/SPECS/kpatch.spec b/SPECS/kpatch.spec index 78432be..0a921ce 100644 --- a/SPECS/kpatch.spec +++ b/SPECS/kpatch.spec @@ -1,8 +1,8 @@ -%define kpatch_dnf_ver 0.3 +%define kpatch_dnf_ver 0.4 Name: kpatch -Version: 0.9.3 -Release: 3%{?dist} +Version: 0.9.4 +Release: 1%{?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-Sync-signal-subcmd-usage-output-with-manpage.patch +#Patch100: 0100-xxx.patch # kpatch-dnf backports (inactive -- for future reference) #Patch200: 0200-foo-bar-etcetera.patch @@ -50,7 +50,7 @@ kpatch-patch packages updates. %patch0 -p1 %patch1 -p1 # Use this to apply upstream patches to kpatch -%patch100 -p1 +#%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 +* Wed Sep 29 2021 Artem Savkov - 0.9.4-1 +- Rebase to 0.9.4 + * Mon Aug 09 2021 Mohan Boddu - 0.9.3-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688