testing/pptpd: bump to 1.40 and fix compilation

3 files changed, 39 insertions, 41 deletions

diff --git a/testing/pptpd/APKBUILD b/testing/pptpd/APKBUILD
index 265e139393..ccefa96c2b 100644
--- a/testing/pptpd/APKBUILD
+++ b/testing/pptpd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Danilo Godec <danilo.godec@agenda.si>
 # Maintainer:
 pkgname=pptpd
-pkgver=1.3.4
+pkgver=1.4.0
 pkgrel=0
 pkgdesc="PoPToP - PPTP Daemon, Linux as Microsoft VPN Server"
 url="http://www.poptop.org/"
@@ -11,7 +11,14 @@ depends=""
 makedepends="ppp-dev"
 install=""
 subpackages="$pkgname-doc"
-source="saveas-http://sourceforge.net/projects/poptop/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download/$pkgname-$pkgver.tar.gz pptpd.patch pptpd.confd pptpd.initd options.pptp pptpd.conf"
+source="saveas-http://sourceforge.net/projects/poptop/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download/$pkgname-$pkgver.tar.gz
+	fix_MSG_TRYHARD.patch
+	pptpd.patch
+	pptpd.confd
+	pptpd.initd
+	options.pptp
+	pptpd.conf
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -40,9 +47,24 @@ package() {
 	install -Dm644 "$srcdir"/pptpd.conf "$pkgdir"/etc/
 }
 
-md5sums="b38df9c431041922c997c1148bedf591  pptpd-1.3.4.tar.gz
-5a6da6f9d62c9db58033267f0578e79f  pptpd.patch
+md5sums="36f9f45c6ffa92bc3b6e24ae2d053505  pptpd-1.4.0.tar.gz
+3dc72385cb3df526176a54ef2d2a7e06  fix_MSG_TRYHARD.patch
+7b274230768ab70aa32f45df06da501c  pptpd.patch
 bff575819b8997e7bbe743b95cb134cb  pptpd.confd
 184b6c9cc04e1efc830e39da6c3bfefc  pptpd.initd
 95f1efd9f4f896bf3b7aef1940c58e79  options.pptp
 0a7af8968a964ebccf12ad512be9bba5  pptpd.conf"
+sha256sums="8fcd8b8a42de2af59e9fe8cbaa9f894045c977f4d038bbd6346a8522bb7f06c0  pptpd-1.4.0.tar.gz
+a37ad055e31113fc8c51cc9c2b1f513dd1cb76093bd6697ac31232669a038b47  fix_MSG_TRYHARD.patch
+215df31dc64ca1706a1257f33d90af101193e000c85688cf56c6fc6452b3697c  pptpd.patch
+4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958  pptpd.confd
+9c7f6a5deaecd4098312eefedf9d803cbea1728f7b61d08451fa9a88b105f3c7  pptpd.initd
+668b4e3c8e48f7b96836497f43b449414ae4cb0c555b197a033843c75ef14aed  options.pptp
+19695e6dcf3e6df1aae0933fe5e91abc094999957cb3890a7f3b671b21f83ae3  pptpd.conf"
+sha512sums="cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484  pptpd-1.4.0.tar.gz
+718e9fd6a53322f2f390ee4d07b2b4f88b6dd3ad130d4471a4e12e82910942982a06865c06296ff26f08e87aa65f4f7ee4a020cf7c2ff0d67ca5bfb794fe10bc  fix_MSG_TRYHARD.patch
+2adbd7203451fe63472fdd443afcf9c85b66d1d4965574f94a7e99a29fdd7f37cfe1eb0f82afebef0e6e11726e0702208e75e90f9867b1103f1d5e401f8ba47f  pptpd.patch
+59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488  pptpd.confd
+22641da93b5b5a642383edf4c47cbb702b25ab44f4716fc9d146a23a382557d36f7fe70288ff016731400c48fbbb7addd8c0177628aa16607190ac04f36ad6ce  pptpd.initd
+acf235a1c34f34cded7f2c56d6757fec099032ffaefae003e79b0517ad3fc53e19698e8c644193da9613707f8923b9c78f9e642aa0d9c785db1d4e51717a486e  options.pptp
+ed6022b6711b0e6b3e336220d6da7ec9dd7d3a0679fc9219d0931f3b165296b80bc21e23123cc0ed621d76d06d5ad3435659eb7b924daa735ee1a069c1ebcbc1  pptpd.conf"
diff --git a/testing/pptpd/fix_MSG_TRYHARD.patch b/testing/pptpd/fix_MSG_TRYHARD.patch
new file mode 100644
index 0000000000..3e30295ca6
--- /dev/null
+++ b/testing/pptpd/fix_MSG_TRYHARD.patch
@@ -0,0 +1,13 @@
+--- a/bcrelay.c
++++ b/bcrelay.c
+@@ -61,6 +61,10 @@
+ // software to your hearts content.  You are free to redistribute it as
+ // long as it is accompanied with the source and my credit is included.
+ 
++#ifndef MSG_TRYHARD
++	# define MSG_TRYHARD    MSG_DONTROUTE
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
diff --git a/testing/pptpd/pptpd.patch b/testing/pptpd/pptpd.patch
index 3b4522dc76..c2118889da 100644
--- a/testing/pptpd/pptpd.patch
+++ b/testing/pptpd/pptpd.patch
@@ -10,32 +10,6 @@
  #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
  #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
  
---- pptpd-1.3.4/bcrelay.c
-+++ pptpd-1.3.4-orig/bcrelay.c
-@@ -381,12 +381,12 @@
-                         return 1;
-                 }
-   }
--  if (ifin == "") {
-+  if (!strlen(ifin)) {
-        syslog(LOG_INFO,"Incoming interface required!");
-        showusage(argv[0]);
-        _exit(1);
-   }
--  if (ifout == "" && ipsec == "") {
-+  if (!strlen(ifout) && !strlen(ipsec)) {
-        syslog(LOG_INFO,"Listen-mode or outgoing or IPsec interface required!");
-        showusage(argv[0]);
-        _exit(1);
-@@ -870,7 +870,7 @@
-     // IPSEC tunnels are a fun one.  We must change the destination address
-     // so that it will be routed to the correct tunnel end point.
-     // We can define several tunnel end points for the same ipsec interface.
--    } else if (ipsec != "" && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) {
-+    } else if (strlen(ipsec) && strncmp(ifs.ifc_req[i].ifr_name, "ipsec", 5) == 0) {
-       if (strncmp(ifs.ifc_req[i].ifr_name, ipsec, 6) == 0) {
-         struct hostent *hp = gethostbyname(ipsec+7);
-         ioctl(s, SIOCGIFINDEX, &ifs.ifc_req[i]);
 --- pptpd-1.3.4/plugins/Makefile
 +++ pptpd-1.3.4-orig/plugins/Makefile
 @@ -3,7 +3,7 @@
@@ -56,14 +30,3 @@
  
  install: $(PLUGINS)
  	$(INSTALL) -d $(LIBDIR)
---- pptpd-1.3.4/plugins/pptpd-logwtmp.c
-+++ pptpd-1.3.4-orig/plugins/pptpd-logwtmp.c
-@@ -12,7 +12,7 @@
- #include <unistd.h>
- #include <utmp.h>
- #include <string.h>
--#include "pppd.h"
-+#include <pppd/pppd.h>
- 
- char pppd_version[] = VERSION;
-