gentoo resync : 22.12.2021

3 files changed, 46 insertions, 2 deletions

diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 15a3ea90292b..1fa9d7b98f5b 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,3 +1,4 @@
+AUX pdnsd-1.2.9a-linux-5.13_build_fix.patch 1075 BLAKE2B 198eadb46f7df2f8532d733ce8632536e8f7488aba306531c0d919c255aa77185ca48f26cc5545d481101fad293a6a2dd41b8c28b434307ce0faead3a91cc724 SHA512 05fca1485c6d4d5ef25a9faf0ce3e34c9f17a0bb94056bf15c56a58380c52084a77b27fc4832e5f395e2d478bba201459aa9d0e5e945ebd9b9e2ece897d2e231
 AUX pdnsd-online.confd 226 BLAKE2B 8846e8eb10d97b4fbfb8bb5615cb5f0f58c7ea9561ff378eac69155888f82406c06a21db6bdb12a82cad7e124b2b842b980b313d86d31c723d93f7a14d0a70ce SHA512 6f860b253acbe8b18f6473b987c9ba222e2f078981acd5162606834c34de5a388925aad3d1ed73a7a7b1f166871f93f1968ec38da9030b0eadfceb01f8e0bf1f
 AUX pdnsd.conf.test 370 BLAKE2B f48396e0f78954a6c0c21df19776b1bb8f221b5325612413b76f61110779d5f109eeffc952d66492dda308eba6f9d4bcc03b1c5a0f2748a22052a6028a7a57b4 SHA512 1882df76c4f3280041b9045b8ae06b929c8c418206270c25b09e604e591a5fb287328af340ec9164fb36c5af8bd2c9216a6a0fdf6eefad3986cc3221880d8138
 AUX pdnsd.confd 232 BLAKE2B 227f6f6aff676221021619bf3bb3052f8c8c3729eedc3f58e1e56cd69cff014276564e47ac293108576c163159571623ac701657ef844c537d7263f46bf9f72b SHA512 e50abe37c914d070b44c8aa63d57924840ba07c5668a0760dfc89e05a25176e76d96e9c7acfef5010750fa2cee38f01dfddc60b3a526f87763ab130caf7b5d8c
@@ -6,5 +7,5 @@ AUX pdnsd.rc8 573 BLAKE2B 9ba317e4c8df4c351452cb2de554c38b341e3ddf621d40c1486bae
 AUX pdnsd.service 269 BLAKE2B b14978db01ec729a6e04d4849a468fd45999c1fbd7d21e986b2034edb81f645df7f5ce8924d72e11b04a548c6957964c936442f1d57c5fa9a327667b331ce4f4 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2
 AUX pdnsd.tmpfiles 37 BLAKE2B c4da53c3d0ebea88e456e6ea07b2505ed187e074286bb40fabde6a27c4cc017dabea3207e8fde80aa3fe38957b12ce8e09c809b369f06356c1737ae0825cdbff SHA512 7beacc66e8504ca0f8e613dfc8ed2479362f1ebc98ffab902622b36c795fe75e176d9f0a330ad74e10a7f7b1597cce068d94eea6511a75b941e42b2458b76df5
 DIST pdnsd-1.2.9a-par.tar.gz 516061 BLAKE2B 33f2fa85f4b2fa3b709e612c12c8a6edff67f3d2203a8ccd9e838f72b8ab2664eb2e88c0957c08c64568581d9eeb4bede9157ba0928fa6d28ccca279f71fbd1a SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81
-EBUILD pdnsd-1.2.9a-r2.ebuild 2858 BLAKE2B 5010c16850b6b6efb35967f1bcbc2b03caf931b20a78d1f59622d41c8c4fa7776baddc88197b3c274fe5a2a4a1a8e1bdf70e88297fc68753f0a13c84c79b7937 SHA512 b986c42160e55f8bbab7fd8d2cdd3ba342c49972429e78de7eff5e7a38349a62ff274e5a00de847a198e8bb5c9c010b5d166d66ad6511a5bdba3fdaf468a6788
+EBUILD pdnsd-1.2.9a-r2.ebuild 2926 BLAKE2B de32dae5c34286bc766740f78f48791249b94152e008bd5b1c7ce9489a97312e2c34c6d1b39a2a39ca3b9d8526e8df2b27ff1ff78435ba7e9dc4468bda359518 SHA512 12d494362806dbe3762d2f02cda7fd7aa8c643b480de3904bbfa76edbe7598f9d83bbd53d2651192859b68f8e02fffd5ebeb11038223e20ce67c9c7e66a16520
 MISC metadata.xml 691 BLAKE2B 899f17bef6558bfdff61358e96cd84de7e33f023919c6a68430fe2b651355e84d73451c5d8360ccdf36777eb460f14b1fea16a6b5b7a4fac01042ff17db80a0e SHA512 d75384e1ec31c09bc1dc7b15eb1cf1a712420888ad7d788881533d05641afcd353fd42cc315c57ce5d371de3efbf219eee8641427a5d1b8024c105b33e703a11
diff --git a/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch b/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch
new file mode 100644
index 000000000000..fbc1e0bfd4ec
--- /dev/null
+++ b/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch
@@ -0,0 +1,39 @@
+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.13/5.14 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
+
+Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
+---
+ src/conff.h | 2 +-
+ src/dns.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/conff.h b/src/conff.h
+index a07b156..c66d210 100644
+--- a/src/conff.h
++++ b/src/conff.h
+@@ -32,7 +32,7 @@
+ #include <stdio.h>
+ #include <pthread.h>
+ #include <sys/socket.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #include "ipvers.h"
+ #include "list.h"
+ 
+diff --git a/src/dns.h b/src/dns.h
+index 0f6a4ac..ecc9680 100644
+--- a/src/dns.h
++++ b/src/dns.h
+@@ -27,7 +27,7 @@
+ #include <config.h>
+ #include <arpa/inet.h>
+ #include <sys/socket.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #include <sys/types.h>
+ #include <inttypes.h>
+ #include "rr_types.h"
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
index 209fff4708a5..e22913999e9a 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd tmpfiles
 
@@ -21,6 +21,10 @@ RDEPEND="
 "
 DEPEND="test? ( net-dns/bind-tools )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-linux-5.13_build_fix.patch" #801688
+)
+
 src_configure() {
 	local myeconfargs=(
 		--disable-isdn