gentoo resync : 20.03.2021

7 files changed, 5 insertions, 210 deletions

diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 55ff61620f2a..1501d1b23972 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,15 +1,8 @@
-AUX xl2tpd-dnsretry.patch 1509 BLAKE2B 54e0a77a765670b47742eb525a99a239de06d1ae2d4c638dbc57224c4fe5a729312ba14fc0f6f4eeb070303ca4771758b94b178c0c2790f79bea668d074fcfc0 SHA512 7999c8e990f7bcd620042295e5fc6e12cf4b1e4faf7cd560bdd4ade4103b171e76a06cb11caea0046b8141a4fa9592bd8851f933072c5e7f71d8b1f4b6fb2bbd
 AUX xl2tpd-init-r1 272 BLAKE2B 0a0f350d5ce3ce297b120750bed742eece7ee6f6b5c5ea24c09b2015a3b5dd2621eff76aa05cee56e5ed795df3204b2d81f8394de492ea655011a8efed3b8982 SHA512 80235d4084963f9285fc11f30ca648ebe4a23e3f74e41fddb81d6fdc08808b1772163192f61f56c677c3003f10809f7d014ddeaa427eabfad490106ac7e14f67
 AUX xl2tpd.conf 18 BLAKE2B 1486c7555965c14429cbbc7ab5dcebac02aa0639204d3eb203b58f6f46a042de4daa9a278d4e6f32ba6dca563c2de9757cf0e5af59563c5e0250b048a4f1f30f SHA512 0b3c6d4784b997d12734fe1e5165dc066269db24608638566c0fc317c1927331ed806fdb7a4f816bd16d1f22046b52badd99c2f0977c157b2b3f3ed42071ae42
 AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b72a9d501f75e59cf2f14e1326c347cc4d62c541696a2cf4e5af51f13c0c909c26f908a374944e39 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579
-DIST xl2tpd-1.3.10.tar.gz 510777 BLAKE2B 15ec09a6186d20facd4eceeca87a33a4676644a6976c2b69a61b288a2534c354bcc9b64eca4305aa7774d3b5fc29c97078478bebec7e81f8071865b29a97809e SHA512 304b8cd098608a866d32c65c55ba98a01e10abb473d8bff488c723fd1f6d4a66cf98c6d3044f7986a334739693767608c48999f873e95a51f0fa6c23cb61ecd4
-DIST xl2tpd-1.3.11.tar.gz 510652 BLAKE2B c120ba0a2bb96a87334743319808e4a1dfb1b95140fc37df51c33e176bdefdac547ad27d38731bab9d94a939b9a3ca93404ef17c8076e16567a3ecc5b568fb47 SHA512 9fd478aa6b7e22867aa977aa0c22ba9d856e3b659aa0ffdcdb17aa0d8358cceab37da565eeb799590d65fc2914720715423e006f6bbe7ca742f09d7cced52cb7
-DIST xl2tpd-1.3.12.tar.gz 513173 BLAKE2B a1f2e4d0e1af4402679eeec6589ca17b0422c664d37beae628511f988f6508ca22160d4657f8ff84bc5e5aac4d3e837c501b4d307964530044a792f2ecc599ab SHA512 e18f15ba038cd358fbad9dd7284c5f3c34273d9291bf8c66494c46d78150acfc1666cbf935fb5a66bd1f0220014f0b49fa0f7f55cb42de125e4123112c6eb00b
-DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e994db09b8c6fc9980b03bf5aab09a2f6187170f0e8639bd8a323b8417bf6e5d0a80fd9e45f8adc310902b256ae SHA512 02e3502a75f41745c001fe1a34dd9900c3a77eea274e08f9361f7145ac24e9a663975efe85ef6aef7c6da1aa9f3369eeb5542ac26e90b9d59753158a17b69ee4
 DIST xl2tpd-1.3.15.tar.gz 524960 BLAKE2B 5349b4bce7e4b8ea26ec3c739847456b6c8fdac667c8ad9d5241d3c83bc450a47c88c99c37cea2b0461fd4abb3e32da67de7c8ab95d288c8c423bea9af4abf1d SHA512 f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
-EBUILD xl2tpd-1.3.10.ebuild 1421 BLAKE2B e01f0741bd4033d9d458a5cc88cc3ea9558649315c843a9624c25deaabb285f4cfae2f65fe5349db107629f496c767c820dc9fa3780e660cdca605554f52c6d7 SHA512 ef78b9b7389be4c19084be285bf66258fa3a545a9f22ce112b8b8205dba59033f3f78d533fb034d9dbb81392922ea9194c430d696f3989377b0396b46cf52fe8
-EBUILD xl2tpd-1.3.11.ebuild 1425 BLAKE2B 4d8761c143e9957591121c6b0d1f4ea4957e8fb250071f50544219919799cba8438f27696807cff8930a00797635ced0bd9c26a1a0f78adbd37e974569ab8d91 SHA512 c498dbb8ae9edead2149bc7a80e1aa355d7499e07b02abbc85bd2a61f3257c34ee9b906c6d57810642d5b5499138d4be45cb682d180f46b470aa98c259e06a44
-EBUILD xl2tpd-1.3.12.ebuild 1001 BLAKE2B b3e107a62fd46852ca2a78c421d707953be37c961e0df13dd7847a862c9c1ea897d3e87970a65404e625c4387cd0875a006a03489d592794b68ad40d188465c9 SHA512 4b3076c293249a76259713a1ed2be673f21ffa5d4ed0900638d68973b177eb906c93ecb439c2aca368d79b83b2c814ad4462eb04578371978f73a65f3db5eaed
-EBUILD xl2tpd-1.3.13.ebuild 1082 BLAKE2B 2052ff441fbc288b7e95c3e6492aabe74d7e9f1bbf01783e135a8962a86f207599a9bde2f46bd91733ce607148a23cc584a5e50639521bc3ca0ae7899ba1aef1 SHA512 360440ac755e0425618b8b509933eddafd745ae3e101138117e3bb9bfd550db293f7f18020f8ca24e1c717cb279c7037b95460c7de641fb3f536bd399200b203
+DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16
 EBUILD xl2tpd-1.3.15.ebuild 1074 BLAKE2B 1f6fad5624a8c3376a9d40dfcdd89510473dfef6634b27233cd6cee363be7a366aadfdccc12d7e74db4efaf290577feba9eb4235e1623d151b223047a563917c SHA512 0b13197b0842a9dbd1c126e7b14cb08f1c249a2d0b89d2c65ab0e84bbcdc76c0da3b4e4fe51309ccf52812b9b68ff5704b33879c24acc5d879d9540b51b8ea30
-MISC metadata.xml 748 BLAKE2B 54984b3f195d776bab05dea5407a0efbc1e98075ef43260013359f78268cfbc3500ffc1ad816d0790c0bef77a44ad2326c28f43ce52254cdd301ee6e0709e1dc SHA512 a7a28c1454d6cafff7d70abed1b57fbddf3929f85e947f7f87654aecdfaf7bad89daf11f40002b9115dd284449b30d172d5762bca0c8c053dd538139c7e8431f
+EBUILD xl2tpd-1.3.16.ebuild 1078 BLAKE2B 2fde8bf80db10114656e361546c0b92588002ac207b7be819bdda2ec28171a1efcabb499789f41bc1b00d9a6962e20d10d3aedfc39048959a7c936597463b17a SHA512 147419d02f47afc597a128e86890a30102ec601af107d6864cb5b78e37a54e0b5dd4427fbc3926a4b7fa9129fab7385b88d7cd72b94a1383bbe59741fb87be26
+MISC metadata.xml 658 BLAKE2B 0234424bd64d54ff71bce404044a874c90c32f7af4857941f9fb1014619da53e97ae925f9f91f4b0d53576a2af2d84d624c4462b104882a6ca3b716a1915e9ff SHA512 38c8247a784afe819a63194373dd04600ac73d38d5a53e6a40ae1cabfb3070f0b8c72669f9aaef2702cbe98b6ecb47aa88a5f63772302e55a2177f17e191e296
diff --git a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
deleted file mode 100644
index b27703fe435e..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=307489
-http://homenet.beeline.ru/index.php?showtopic=192551&st=0&p=1063626345&#entry1063626345
-
---- xl2tpd.c	2010-05-10 22:35:43.000000000 +0200
-+++ xl2tpd.c	2010-08-15 22:02:14.000000000 +0200
-@@ -587,9 +587,33 @@
-     hp = gethostbyname (host);
-     if (!hp)
-     {
--        l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n",
--             host);
--        return NULL;
-+        if ( lac->redial ) 
-+        {
-+            int imax=lac->rmax;
-+            if ( lac->rmax == 0 )
-+                imax = 1;
-+            while ( imax > 0 ) 
-+            {
-+                hp = gethostbyname ( host );
-+                if ( hp )
-+                    break;
-+                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s. Trying to look again in %d seconds.\n", host, lac->rtimeout );
-+                if ( lac->rtimeout > 0 )
-+                    sleep ( lac->rtimeout );
-+                if ( lac->rmax > 0 )
-+                    imax--;
-+            }
-+            if ( ( imax == 0 ) && ( lac->rmax > 0 ) ) 
-+            {
-+                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s after %d tries. Lookup stops now.\n", host, lac->rmax );
-+                return NULL;
-+            }
-+        }
-+        else 
-+        {
-+            l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n", host);
-+            return NULL;
-+        }
-     }
-     bcopy (hp->h_addr, &addr, hp->h_length);
-     /* Force creation of a new tunnel
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 42549f5d851d..bab6c0296178 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -4,7 +4,6 @@
 	<!-- maintainer-needed -->
 	<longdescription>xl2tpd is a fork of l2tpd Layer 2 Tunneling Protocol (L2TP) daemon that can be used to transfer frames of OSI layer 2 protocols through an IP tunnel. While it provides authentication via CHAP or PAP it does not provide encryption itself and should therefore be externally secured (via IPSEC).</longdescription>
 	<use>
-		<flag name="dnsretry">Patch for host lookup retries, activated by redial feature</flag>
 		<flag name="kernel">Enable kernel interface for PPPoL2TP</flag>
 	</use>
 	<upstream>
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
deleted file mode 100644
index 4f97f86be8e9..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 x86"
-IUSE="dnsretry"
-
-DEPEND="
-	net-libs/libpcap
-	>sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
-	default
-	# The below patch is questionable. Why wasn't it submitted upstream? If it
-	# ever breaks, it will just be removed. -darkside 20120914
-	# Patch has been discussed with upstream and is marked as feature by now:
-	# https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
-	use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	newins doc/l2tp-secrets.sample l2tp-secrets
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
deleted file mode 100644
index ff66464ce648..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="dnsretry"
-
-DEPEND="
-	net-libs/libpcap
-	>sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
-	default
-	# The below patch is questionable. Why wasn't it submitted upstream? If it
-	# ever breaks, it will just be removed. -darkside 20120914
-	# Patch has been discussed with upstream and is marked as feature by now:
-	# https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
-	use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	newins doc/l2tp-secrets.sample l2tp-secrets
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
deleted file mode 100644
index 3e7e2ce70f46..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="https://github.com/xelerance/xl2tpd"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-	>=sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	insopts -m 0600
-	newins doc/l2tp-secrets.sample l2tp-secrets
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
index a383fd15cbf8..e20c5ce6dfa5 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd toolchain-funcs tmpfiles
 
@@ -22,7 +22,7 @@ RDEPEND="
 	${DEPEND}
 	net-dialup/ppp"
 
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
+DOCS=(CREDITS README.md BUGS CHANGES TODO doc/README.patents)
 
 src_compile() {
 	tc-export CC