diff --git a/SOURCES/0001-compat-account-for-latest-c8s-backports.patch b/SOURCES/0001-compat-account-for-latest-c8s-backports.patch new file mode 100644 index 0000000..0a600f7 --- /dev/null +++ b/SOURCES/0001-compat-account-for-latest-c8s-backports.patch @@ -0,0 +1,44 @@ +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 132d6c2..63f07f0 100644 --- a/SPECS/kmod-wireguard.spec +++ b/SPECS/kmod-wireguard.spec @@ -1,6 +1,6 @@ %global pkg wireguard -%global kernel_version 4.18.0-305.7.1.el8_4 +%global kernel_version 4.18.0-348.el8 %global _use_internal_dependency_generator 0 %global __find_requires /usr/lib/rpm/redhat/find-requires @@ -19,7 +19,7 @@ Name: kmod-%{pkg} Version: 1.0.20210606 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fast, modern, secure VPN tunnel License: GPLv2 @@ -27,6 +27,8 @@ 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 @@ -132,6 +134,9 @@ fi %changelog +* Tue Nov 09 2021 Peter Georg - 1.0.20210606-7 +- Rebuild for 4.18.0-348.el8 + * Wed Sep 29 2021 Peter Georg - 1.0.20210606-6 - Convert to kABI tracking kmod package (kernel >= 4.18.0-305.7.1.el8_4)