From b247e33b4c8eef9ef3b9ecd1d8f75b815f434cf3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 22 Dec 2013 11:40:53 +0100
Subject: fix musl compile, update to latest upstream
---
package/pptp/Makefile | 6 +++---
package/pptp/patches/patch-Makefile | 22 +++++++++-------------
package/pptp/patches/patch-pptp_c | 11 +++++++++++
package/pptp/patches/patch-pqueue_c | 10 ++++++++++
4 files changed, 33 insertions(+), 16 deletions(-)
create mode 100644 package/pptp/patches/patch-pptp_c
create mode 100644 package/pptp/patches/patch-pqueue_c
(limited to 'package/pptp')
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index a2d6fb90a..feea59480 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= pptp
-PKG_VERSION:= 1.6.0
-PKG_RELEASE:= 3
-PKG_MD5SUM:= 9a706327fb9827541d7c86d48ceb9631
+PKG_VERSION:= 1.8.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 4efce9f263e2c3f38d79d9df222476de
PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) client
PKG_SECTION:= ppp
PKG_DEPENDS:= ppp kmod-net-ipgre
diff --git a/package/pptp/patches/patch-Makefile b/package/pptp/patches/patch-Makefile
index 1b7ad4a3d..f96b980fe 100644
--- a/package/pptp/patches/patch-Makefile
+++ b/package/pptp/patches/patch-Makefile
@@ -1,22 +1,18 @@
---- pptp-1.6.0.orig/Makefile 2005-02-18 02:42:45.000000000 +0100
-+++ pptp-1.6.0/Makefile 2011-01-16 21:44:38.000000000 +0100
-@@ -11,14 +11,15 @@ BINDIR=$(DESTDIR)/usr/sbin
+--- pptp-1.8.0.orig/Makefile 2013-10-23 10:10:46.000000000 +0200
++++ pptp-1.8.0/Makefile 2013-12-22 11:35:12.000000000 +0100
+@@ -14,12 +14,13 @@ BINDIR=$(DESTDIR)/usr/sbin
MANDIR=$(DESTDIR)/usr/share/man/man8
PPPDIR=$(DESTDIR)/etc/ppp
-CC = gcc
+CC ?= gcc
RM = rm -f
- OPTIMIZE= -O0
+ OPTIMIZE= -O -Wuninitialized
DEBUG = -g
INCLUDE =
-CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
--LIBS = -lutil
--LDFLAGS =
-+CPPFLAGS ?=
-+CFLAGS ?= -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
-+LIBS ?= -lutil
-+LDFLAGS ?=
-
- PPTP_BIN = pptp
-
++CFLAGS ?=
++CFLAGS += -Wall $(INCLUDE)
+ # Solaris
+ # CFLAGS += -D_XPG4_2 -D__EXTENSIONS__
+ LIBS = -lutil
diff --git a/package/pptp/patches/patch-pptp_c b/package/pptp/patches/patch-pptp_c
new file mode 100644
index 000000000..7a4cfb520
--- /dev/null
+++ b/package/pptp/patches/patch-pptp_c
@@ -0,0 +1,11 @@
+--- pptp-1.8.0.orig/pptp.c 2013-10-23 10:10:46.000000000 +0200
++++ pptp-1.8.0/pptp.c 2013-12-22 11:40:01.000000000 +0100
+@@ -447,7 +447,7 @@ struct in_addr get_ip_address(char *name
+ if (host == NULL) {
+ if (h_errno == HOST_NOT_FOUND)
+ fatal("gethostbyname '%s': HOST NOT FOUND", name);
+- else if (h_errno == NO_ADDRESS)
++ else if (h_errno == NO_DATA)
+ fatal("gethostbyname '%s': NO IP ADDRESS", name);
+ else
+ fatal("gethostbyname '%s': name server error", name);
diff --git a/package/pptp/patches/patch-pqueue_c b/package/pptp/patches/patch-pqueue_c
new file mode 100644
index 000000000..477f7692b
--- /dev/null
+++ b/package/pptp/patches/patch-pqueue_c
@@ -0,0 +1,10 @@
+--- pptp-1.8.0.orig/pqueue.c 2013-10-23 10:10:46.000000000 +0200
++++ pptp-1.8.0/pqueue.c 2013-12-22 11:35:52.000000000 +0100
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
++#include <sys/types.h>
+
+ #include "util.h" // for log()
+ #include "pqueue.h"
--
cgit v1.2.3