From e4638569d2fdfc30b9aa62763af20137ede17bc8 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Dec 08 2021 15:49:57 +0000 Subject: Update to v1.0.20211208 --- diff --git a/.gitignore b/.gitignore index 38ae886..e4c78db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/wireguard-linux-compat-1.0.20210606.tar.xz +SOURCES/wireguard-linux-compat-1.0.20211208.tar.xz diff --git a/.kmod-wireguard.metadata b/.kmod-wireguard.metadata index a9864be..75a10f8 100644 --- a/.kmod-wireguard.metadata +++ b/.kmod-wireguard.metadata @@ -1 +1 @@ -c86fb9780fdaedded1743ed0f0cb0ba2a115be93 SOURCES/wireguard-linux-compat-1.0.20210606.tar.xz +22ccf19398653706dc85d81a17042173f6d01624 SOURCES/wireguard-linux-compat-1.0.20211208.tar.xz diff --git a/SOURCES/0001-compat-account-for-latest-c8s-backports.patch b/SOURCES/0001-compat-account-for-latest-c8s-backports.patch deleted file mode 100644 index 0a600f7..0000000 --- a/SOURCES/0001-compat-account-for-latest-c8s-backports.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 50dda8ce5ee691b97ae640aba4cbe55aa9b62085 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Tue, 15 Jun 2021 01:13:41 +0200 -Subject: [PATCH] compat: account for latest c8s backports - -Signed-off-by: Jason A. Donenfeld ---- - src/compat/compat.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/compat/compat.h b/src/compat/compat.h -index 91d4388..b204132 100644 ---- a/src/compat/compat.h -+++ b/src/compat/compat.h -@@ -16,7 +16,7 @@ - #define ISRHEL7 - #elif RHEL_MAJOR == 8 - #define ISRHEL8 --#if RHEL_MINOR >= 4 -+#if RHEL_MINOR >= 5 - #define ISCENTOS8S - #endif - #endif -@@ -757,7 +757,7 @@ static inline void crypto_xor_cpy(u8 *dst, const u8 *src1, const u8 *src2, - #define hlist_add_behind(a, b) hlist_add_after(b, a) - #endif - --#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(ISCENTOS8S) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(ISRHEL8) - #define totalram_pages() totalram_pages - #endif - -@@ -849,7 +849,7 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb) - #endif - #endif - --#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) && !defined(ISCENTOS8S) - #define genl_dumpit_info(cb) ({ \ - struct { struct nlattr **attrs; } *a = (void *)((u8 *)cb->args + offsetofend(struct dump_ctx, next_allowedip)); \ - BUILD_BUG_ON(sizeof(cb->args) < offsetofend(struct dump_ctx, next_allowedip) + sizeof(*a)); \ --- -2.31.1 - diff --git a/SPECS/kmod-wireguard.spec b/SPECS/kmod-wireguard.spec index 628f7aa..cfe76ae 100644 --- a/SPECS/kmod-wireguard.spec +++ b/SPECS/kmod-wireguard.spec @@ -18,8 +18,8 @@ Name: kmod-%{pkg} -Version: 1.0.20210606 -Release: 7%{?dist} +Version: 1.0.20211208 +Release: 1%{?dist} Summary: Fast, modern, secure VPN tunnel License: GPLv2 @@ -27,8 +27,6 @@ URL: https://www.wireguard.com/ Source0: https://git.zx2c4.com/%{pkg}-linux-compat/snapshot/%{pkg}-linux-compat-%{version}.tar.xz -Patch1: 0001-compat-account-for-latest-c8s-backports.patch - ExclusiveArch: x86_64 aarch64 BuildRequires: elfutils-libelf-devel @@ -134,6 +132,9 @@ fi %changelog +* Wed Dec 08 2021 Peter Georg - 1.0.20211208-1 +- Update to v1.0.20211208 + * Tue Nov 09 2021 Peter Georg - 1.0.20210606-7 - Rebuild for 4.18.0-348.el8