From d7506cc686103684aebb9b60446decd36463fff3 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 26 Jun 2023 18:39:43 -0400
Subject: [PATCH] Fix FTBFS with 6.4 kernel

https://pagure.io/dlm/c/ddbba6608896f81bfce8f8edf3d0f507714cfc43?branch=main
---
 ...ld-remove-unnecessary-header-include.patch | 33 +++++++++++++++++++
 dlm.spec                                      |  3 ++
 2 files changed, 36 insertions(+)
 create mode 100644 0030-dlm_controld-remove-unnecessary-header-include.patch

diff --git a/0030-dlm_controld-remove-unnecessary-header-include.patch b/0030-dlm_controld-remove-unnecessary-header-include.patch
new file mode 100644
index 0000000..924e381
--- /dev/null
+++ b/0030-dlm_controld-remove-unnecessary-header-include.patch
@@ -0,0 +1,33 @@
+From ddbba6608896f81bfce8f8edf3d0f507714cfc43 Mon Sep 17 00:00:00 2001
+From: Alexander Aring <aahringo@redhat.com>
+Date: Wed, 24 May 2023 08:56:41 -0400
+Subject: [PATCH 30/32] dlm_controld: remove unnecessary header include
+
+The timewarn netlink functionality got dropped and will be removed by
+kernel v6.4. The user space part was already dropped by commit 34ea31e7
+("controld: remove timewarn handling"). This is just a left over of this
+commit. Recent builds fails now because the UAPI header in the Linux
+kernel was removed. This means older dlm sources cannot be build with
+newer kernel-headers, however it is not recommended to use older dlm
+sources and all existing users should upgrade anyway.
+
+Reported-by: Fabio M. Di Nitto <fdinitto@redhat.com>
+---
+ dlm_controld/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/dlm_controld/main.c b/dlm_controld/main.c
+index c9d1c5f1..14be5edd 100644
+--- a/dlm_controld/main.c
++++ b/dlm_controld/main.c
+@@ -12,7 +12,6 @@
+ #include <pthread.h>
+ #include <linux/netlink.h>
+ #include <linux/genetlink.h>
+-#include <linux/dlm_netlink.h>
+ #include <uuid/uuid.h>
+ 
+ #ifdef USE_SD_NOTIFY
+-- 
+2.41.0
+
diff --git a/dlm.spec b/dlm.spec
index 00c6e83..fc04691 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -16,6 +16,8 @@ BuildRequires: make
 Source0:	https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
 
 Patch0: 0001-Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch
+# Fix FTBFS with 6.4 kernel
+Patch30: 0030-dlm_controld-remove-unnecessary-header-include.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 ExclusiveArch: i686 x86_64
@@ -35,6 +37,7 @@ The kernel dlm requires a user daemon to control membership.
 %prep
 %setup -q
 %patch0 -p1 -b .backup0
+%patch30 -p1 -b .backup30
 
 %build
 # upstream does not require configure