gentoo resync : 25.08.2020

4 files changed, 46 insertions, 2 deletions

diff --git a/net-vpn/pptpd/Manifest b/net-vpn/pptpd/Manifest
index 4b6919d95516..5a9f1e167a68 100644
--- a/net-vpn/pptpd/Manifest
+++ b/net-vpn/pptpd/Manifest
@@ -1,8 +1,10 @@
 AUX pptpd-1.4.0-gentoo.patch 2360 BLAKE2B ca5ac7babf0ee6752305659ca50ce4c7972c433007249ced3c99d4c04a3a9461c245151082fa545b642fd85b375f51ba622fc6137ce538a9ec54798a7b73b27a SHA512 ba89b3b9eacd19e7cf6173289e8cb5db2443b55b3ad86f053c58636ed4f65227c626678f052f2d0a3c4c22fe4e0487493d097cd9a5434101017b95605966fc5b
+AUX pptpd-1.4.0-libdir.patch 1205 BLAKE2B 4b0d269b4de78346ffe577379824510dfb330e84606ff1b56abda08a4296935c947a0c61188475007c565cb5d5ba987beca61020e20a8cf050c82ff2f9335502 SHA512 927254c2527eada485d7d86940858835712d272fea818e17a6dd81878843b1a58dd6f1230fdc1b5e5ac0cd0fd726956d816655884ac7b8f6ee3c2e6b20e6beb4
+AUX pptpd-1.4.0-musl.patch 381 BLAKE2B b3094ada7db21fcf5e249512d0f3aabb4782562e82dcda1fedfc8d78f70f59a062751e2cc6c03789871cc8b2f79bece8b6f125a7849eefbfca566e0b083d3194 SHA512 ac48f18aea8ce89c55bb102705912391fa4d0f3da237261110dfc3ec04b7c461cd4676419bffeabc52afddb78c8f7a2494df6a60bbd507f306f01be592b9e2b3
 AUX pptpd-1.4.0-pidfile.patch 1348 BLAKE2B 7b19d05f5a8b18069c05e110963cf032dc68c7558a970c00126162d7f7d71a702d4b64f40105a36b5da879b8a6bbd6b16785560ecb1b3214bd91aeac20f00378 SHA512 0d0e4df9cc1827345001ebfb88ec87bdce818792aa2243e92127643ffbf64a2c7d62cb5cd26930085d7533ae32135cbcc36da755adce3297bcad4abf764b3b6e
 AUX pptpd-1.4.0-sandbox-fix.patch 528 BLAKE2B 1b784cbf9eb1699a5c8e31a6ebb64035e9656a175b81ca4df778e9799b22fdb283c851d66e3ba0b9c056cf099011be049bd71d1b47d9839786538d1d436ac0f9 SHA512 7f80c66185207f4d14fd6163e41fed3acc7ffdeea91d3f62e000ab1fcbe6abd8f3bb6a1ea927a9fa29ef1b38b2c0ffe364625e155474c4145126de674cd7f2bb
 AUX pptpd-confd 131 BLAKE2B b1cf43035bb96859e3f69ad2ba8d161fd5e7c98370f407767a74ec9e87fd3187ec127155171bebf3e0655d076d2edb640993ec4445672abb40a9d87fb5a6b008 SHA512 59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488
 AUX pptpd-init-r2 325 BLAKE2B 492d4a17910fd45475337376570e23b2193f0b5471e82a575465eb139a9cf0f9296388962e3dc2584784a4be6aac17edf4da67410ca422498a2f3c39c9baba43 SHA512 5eb0839310b6897aeb5ef067f3bbccc3f302f9d5375fea9c2cf405a6e823560a776a96fa0189b4c9adf1744651a35a41d4fcafc3f9e1ebf5ddeb5d88bece9678
 DIST pptpd-1.4.0.tar.gz 252167 BLAKE2B c7fa9397c0a1b7c1ae5f22f9d7f85ba1bb60966984506f7b7c7b4f5dce69efa717f41e8d9a717e4c6f482d2d3e4052611709e0b825a2fcc63fabf19a53a550f0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484
-EBUILD pptpd-1.4.0-r2.ebuild 1932 BLAKE2B a1c098d914e159bfdde32613494d548039d7650e225851b7c5d534bf0d89b963ba19dd934d3632dd27d6a493da234cd7910876e81c50d4630c208a6e808fe8d7 SHA512 59df94fe86dcac6da782a134ae3af54958fbbd6887bdfddeae3b4982f9fc6e754635343128c221823550ab1c6e777f3305e07a2e8bcf38f2927cab193bc64ba3
+EBUILD pptpd-1.4.0-r3.ebuild 1996 BLAKE2B 0066992c4d1bb8510806f62ce6031ed2625a80c9bb99474c2df2d7a764b1ca36e2fcf6c425617e7bbb138893a154ed794bd50de6c9365e3c7cc2c934d68a8bd3 SHA512 3eb884e8eb2d524967efc1b98c9718dd880c5aed69b49ebf7a0ddb0a569509a800111129c4efadc26c756a0a35697aeaa855f1fe9f26d6a64cc42ef20e426a90
 MISC metadata.xml 468 BLAKE2B e988e5026cb8d530a6930e69359587600af78e252ac37a2a7088d43f92c2241c8e3e67a33d79c5213747cf88d1264045ec4c7783a2929a732571b89c9c40f97e SHA512 bc1558cbea7a1a7157bb339f1285e141607182f21c53fa5f7da35a9ce43c12d508650f9f75058a2e1514ae67f3fe60ee77d8e99463b18e4bd108d3e8c9b6d4d5
diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch b/net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch
new file mode 100644
index 000000000000..898c3aea89dc
--- /dev/null
+++ b/net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch
@@ -0,0 +1,24 @@
+diff -r -U 3 pptpd-1.4.0.orig/Makefile.am pptpd-1.4.0/Makefile.am
+--- pptpd-1.4.0.orig/Makefile.am	2020-06-29 00:24:23.301857353 +0300
++++ pptpd-1.4.0/Makefile.am	2020-06-29 00:25:16.072686760 +0300
+@@ -11,7 +11,7 @@
+ ##  warning with -Wmissing-prototypes).
+ ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
+ ##  aren't up to it).
+-CFLAGS += -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
++CFLAGS += -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -DLIBDIR='"$(libdir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
+ 
+diff -r -U 3 pptpd-1.4.0.orig/pptpctrl.c pptpd-1.4.0/pptpctrl.c
+--- pptpd-1.4.0.orig/pptpctrl.c	2013-10-23 08:53:19.000000000 +0400
++++ pptpd-1.4.0/pptpctrl.c	2020-06-29 00:25:23.356525131 +0300
+@@ -786,7 +786,7 @@
+ 
+         if (pptp_logwtmp) {
+                  pppd_argv[an++] = "plugin";
+-                 pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
++                 pppd_argv[an++] = LIBDIR "/pptpd/pptpd-logwtmp.so";
+                  pppd_argv[an++] = "pptpd-original-ip";
+                  pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
+         }
diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-musl.patch b/net-vpn/pptpd/files/pptpd-1.4.0-musl.patch
new file mode 100644
index 000000000000..998a07acf7e9
--- /dev/null
+++ b/net-vpn/pptpd/files/pptpd-1.4.0-musl.patch
@@ -0,0 +1,16 @@
+Modified patch from Alpine Linux
+https://git.alpinelinux.org/aports/plain/main/pptpd/fix_MSG_TRYHARD.patch
+
+--- a/bcrelay.c
++++ b/bcrelay.c
+@@ -103,6 +103,10 @@
+ #include "our_syslog.h"
+ #include "our_getopt.h"
+ 
++#ifndef MSG_TRYHARD
++	#define MSG_TRYHARD    MSG_DONTROUTE
++#endif
++
+ //#define VERSION "1.0"
+ 
+ /* uncomment if you compile this without poptop's configure script */
diff --git a/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
index 81d148bcf80d..d22507a50d47 100644
--- a/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild
+++ b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -24,6 +24,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-gentoo.patch"
 	"${FILESDIR}/${P}-sandbox-fix.patch"
 	"${FILESDIR}/${P}-pidfile.patch"
+	"${FILESDIR}/${P}-libdir.patch"
+	"${FILESDIR}/${P}-musl.patch"
 )
 
 src_prepare() {