From 3c83458bd59000d06ed199eca1cff4e87655373b Mon Sep 17 00:00:00 2001
From: chengyechun <chengyechun1@huawei.com>
Date: Fri, 12 Jan 2024 07:37:07 +0000
Subject: [PATCH] Use the user-mode IPv6 header file

(cherry picked from commit a7ba336709cc42cc808cd99e1225abf5bd6c8fc7)
---
 libnl3.spec                                  | 10 +++++++++-
 solve-redefinition-of-struct-ipv6_mreq.patch | 12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 solve-redefinition-of-struct-ipv6_mreq.patch

diff --git a/libnl3.spec b/libnl3.spec
index 83b87a5..ad9bc45 100644
--- a/libnl3.spec
+++ b/libnl3.spec
@@ -1,6 +1,6 @@
 Name:          libnl3
 Version:       3.7.0
-Release:       2
+Release:       3
 Summary:       Providing APIs to netlink protocol based Linux kernel interfaces
 License:       LGPLv2
 URL:           http://www.infradead.org/~tgr/libnl/
@@ -9,6 +9,8 @@ Source:        https://github.com/thom311/libnl/releases/download/libnl3_7_0/lib
 Patch6000:     backport-prevent-segfault-in-af_request_type.patch
 Patch6001:     backport-fix-bridge-info-parsing.patch
 
+Patch9000:     solve-redefinition-of-struct-ipv6_mreq.patch
+
 BuildRequires: flex bison libtool autoconf automake swig
 Requires:      %{name} = %{version}-%{release}
 
@@ -92,6 +94,12 @@ cd python
 %{python3_sitearch}/netlink-*.egg-info
 
 %changelog
+* Fri Jan 12 2024 chengyechun <chengyechun1@huawei.com> - 3.7.0-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Use the user-mode IPv6 header file
+
 * Mon Aug 14 2023 chengyechun <chengyechun1@huawei.com> - 3.7.0-2
 - Type:bugfix
 - ID:NA
diff --git a/solve-redefinition-of-struct-ipv6_mreq.patch b/solve-redefinition-of-struct-ipv6_mreq.patch
new file mode 100644
index 0000000..af3b66c
--- /dev/null
+++ b/solve-redefinition-of-struct-ipv6_mreq.patch
@@ -0,0 +1,12 @@
+diff -uNrp libnl-3.2.28/include/linux-private/linux/if_bridge.h libnl-3.2.28-new//include/linux-private/linux/if_bridge.h
+--- libnl-3.2.28/include/linux-private/linux/if_bridge.h	2016-06-29 17:04:28.000000000 +0800
++++ libnl-3.2.28-new//include/linux-private/linux/if_bridge.h	2016-11-26 13:46:11.000000000 +0800
+@@ -15,7 +15,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
++#include <netinet/in.h>
+ 
+ #define SYSFS_BRIDGE_ATTR	"bridge"
+ #define SYSFS_BRIDGE_FDB	"brforward"
-- 
Gitee