diff --git a/.gitignore b/.gitignore index 2677fbc..4524524 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/v0.9.3.tar.gz -/kpatch-dnf-v0.3.tar.gz +/v0.9.4.tar.gz +/kpatch-dnf-v0.4.tar.gz diff --git a/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch b/0100-kpatch-Sync-signal-subcmd-usage-output-with-manpage.patch deleted file mode 100644 index e1941ba..0000000 --- a/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/kpatch.spec b/kpatch.spec index 78432be..0a921ce 100644 --- a/kpatch.spec +++ b/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 diff --git a/sources b/sources index 8b12f92..0cf3072 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (kpatch-dnf-v0.3.tar.gz) = 98d2c29d11f052dd3ad7c719084c3e0f5df4a05ae41677dc2d7db56545acbc0a00feadd3e8b71296dbf51c04ddf5fada26133beef198cf51d700ba76d906c6dc -SHA512 (v0.9.3.tar.gz) = a5d51ccfe8e0d74646c82c4c7739abdea19620f7151de859d651f7d12dca357db937a9e1d6968618f04dd64f6c1d770080cfcd5d4058ca21e5ffc7daa312343e +SHA512 (v0.9.4.tar.gz) = 647509fb9772b7564c0533ea043a15a66e29d413e045258036e78890c1d9cb072622bf458dda9bd4a87fe0855522c9b6ec3761f9bb4ab7e08157a179abfbaa62 +SHA512 (kpatch-dnf-v0.4.tar.gz) = d76b2ec5595e06fd560ae928f43ad275b4ce07574a1fc829d184d56c5f09a88ce0cb1d1b05e58eb53e6d934a879886b7f0149f782950d7856fbb99c61ce436c3