diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-vpn/pptpd/files | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'net-vpn/pptpd/files')
| -rw-r--r-- | net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch | 24 | ||||
| -rw-r--r-- | net-vpn/pptpd/files/pptpd-1.4.0-musl.patch | 16 |
2 files changed, 40 insertions, 0 deletions
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 */ |