298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

pdns-alt: refresh patches (#8587)

Browse Source 
Co-authored-by: W_Y_CPP <383152993@qq.com>
This commit is contained in:
Beginner 2022-01-03 12:48:45 +08:00 committed by GitHub
parent 86b2e8ab49
commit 24b49256a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
package/lean/pdnsd-alt/patches/002-fix-pdnsd-alt-build-error-within-kernel_5.15.patch
View File

@ -1,18 +1,16 @@
From 59859acf9083010639eb9bc0bf8cb5d03f03935f Mon Sep 17 00:00:00 2001
From: SiYao Mo <msylgj@vip.qq.com>
Date: Fri, 16 Jul 2021 14:25:44 +0800
Subject: [PATCH] pdnsd-alt: fix cmake error in kernel 5.15 Because of
redefinition of 'struct ifmap' & 'struct ifreq' & 'struct ifconf' in
linux/if.h (Linux Kernel above 5.13) Replace net/if.h with linux/if.h
From 09171eef574503a82342a8b23d4a55b8a5286724 Mon Sep 17 00:00:00 2001
From: W_Y_CPP <383152993@qq.com>
Date: Sat, 1 Jan 2022 13:05:37 +0900
Subject: [PATCH] fix pdnsd alt build error with kernel_5.15
Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
---
src/conff.h | 2 +-
src/dns.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
src/conff.h | 2 +-
src/dns.h | 2 +-
src/netdev.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/conff.h b/src/conff.h
index a07b156..c66d210 100644
index a07b1561b..c66d210aa 100644
--- a/src/conff.h
+++ b/src/conff.h
@@ -32,7 +32,7 @@
@ -25,7 +23,7 @@ index a07b156..c66d210 100644
#include "list.h"
diff --git a/src/dns.h b/src/dns.h
index 0f6a4ac..ecc9680 100644
index 0f6a4ac1e..ecc9680b2 100644
--- a/src/dns.h
+++ b/src/dns.h
@@ -27,7 +27,7 @@
@ -37,3 +35,18 @@ index 0f6a4ac..ecc9680 100644
#include <sys/types.h>
#include <inttypes.h>
#include "rr_types.h"
diff --git a/src/netdev.c b/src/netdev.c
index bd5f8c451..bfd5046df 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -59,7 +59,7 @@
#include "ipvers.h"
#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <net/if.h>
+#include <linux/if.h>
#include <netdb.h>
#include <string.h>
#include <unistd.h>
--
2.17.1