update to latest upstream and fix cross-compile on Cygwin

6 files changed, 30 insertions, 64 deletions

diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 01e1147c0..13ea21a66 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pptpd
-PKG_VERSION:=		1.3.0
-PKG_RELEASE:=		9
-PKG_MD5SUM:=		75d494e881f7027f4e60b114163f6b67
+PKG_VERSION:=		1.3.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b38df9c431041922c997c1148bedf591
 PKG_DESCR:=		a Point-to-Point Tunneling Protocol (PPTP) server
 PKG_SECTION:=		net
 PKG_DEPENDS:=	 	ppp kmod-crypto kmod-mppe kmod-ppp
diff --git a/package/pptpd/patches/bad-pqueue-debug.patch b/package/pptpd/patches/bad-pqueue-debug.patch
deleted file mode 100644
index bfd185d41..000000000
--- a/package/pptpd/patches/bad-pqueue-debug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN pptpd-1.3.0/pqueue.c.orig pptpd-1.3.0/pqueue.c
---- pptpd-1.3.0.orig/pqueue.c	2005-03-31 06:55:53.000000000 +0200
-+++ pptpd-1.3.0/pqueue.c	2008-10-14 13:30:20.000000000 +0200
-@@ -6,14 +6,11 @@
- #include "pqueue.h"
- 
- #ifdef DEBUG_PQUEUE
--#define DEBUG_ON 1
-+#define DEBUG_CMD(_a) { _a }
- #else
--#define DEBUG_ON 0
-+#define DEBUG_CMD(_a)
- #endif
- 
--#define DEBUG_CMD(_a) if (DEBUG_ON) { _a }
--
--
- #define MIN_CAPACITY 128 /* min allocated buffer for a packet */
- 
- static int pqueue_alloc (int seq, unsigned char *packet, int packlen, pqueue_t **new);
diff --git a/package/pptpd/patches/patch-Makefile_in b/package/pptpd/patches/patch-Makefile_in
new file mode 100644
index 000000000..23a5b8420
--- /dev/null
+++ b/package/pptpd/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- pptpd-1.3.4.orig/Makefile.in	2007-04-16 03:10:27.000000000 +0200
++++ pptpd-1.3.4/Makefile.in	2010-05-29 18:48:12.250000000 +0200
+@@ -104,7 +104,7 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
++CFLAGS = -Wall -DSBINDIR='"$(sbindir)"'
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
diff --git a/package/pptpd/patches/patch-ctrlpacket_c b/package/pptpd/patches/patch-ctrlpacket_c
index f1a456de0..bd4e3dfea 100644
--- a/package/pptpd/patches/patch-ctrlpacket_c
+++ b/package/pptpd/patches/patch-ctrlpacket_c
@@ -1,15 +1,14 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- pptpd-1.3.0.orig/ctrlpacket.c	2004-04-29 08:58:45.000000000 +0200
-+++ pptpd-1.3.0/ctrlpacket.c	2008-10-14 13:43:14.000000000 +0200
-@@ -376,9 +376,9 @@ void deal_start_ctrl_conn(unsigned char 
+--- pptpd-1.3.4.orig/ctrlpacket.c	2005-08-03 11:10:59.000000000 +0200
++++ pptpd-1.3.4/ctrlpacket.c	2010-05-30 00:33:57.437500000 +0200
+@@ -377,9 +377,9 @@ void deal_start_ctrl_conn(unsigned char
  	start_ctrl_conn_rply.bearer_cap = htons(OUR_BEARER);
  	start_ctrl_conn_rply.max_channels = htons(MAX_CHANNELS);
  	start_ctrl_conn_rply.firmware_rev = htons(PPTP_FIRMWARE_VERSION);
 -	bzero(start_ctrl_conn_rply.hostname, MAX_HOSTNAME_SIZE);
 +	memset(start_ctrl_conn_rply.hostname, 0, MAX_HOSTNAME_SIZE);
- 	strncpy(start_ctrl_conn_rply.hostname, PPTP_HOSTNAME, MAX_HOSTNAME_SIZE);
+ 	strncpy((char *)start_ctrl_conn_rply.hostname, PPTP_HOSTNAME, MAX_HOSTNAME_SIZE);
 -	bzero(start_ctrl_conn_rply.vendor, MAX_VENDOR_SIZE);
 +	memset(start_ctrl_conn_rply.vendor, 0, MAX_VENDOR_SIZE);
- 	strncpy(start_ctrl_conn_rply.vendor, PPTP_VENDOR, MAX_VENDOR_SIZE);
+ 	strncpy((char *)start_ctrl_conn_rply.vendor, PPTP_VENDOR, MAX_VENDOR_SIZE);
  	COPY_CTRL_PACKET(start_ctrl_conn_rply, rply_packet, rply_size);
  	DEBUG_PACKET("START CTRL CONN RPLY");
diff --git a/package/pptpd/patches/patch-plugins_Makefile b/package/pptpd/patches/patch-plugins_Makefile
new file mode 100644
index 000000000..cb32dd4ce
--- /dev/null
+++ b/package/pptpd/patches/patch-plugins_Makefile
@@ -0,0 +1,11 @@
+--- pptpd-1.3.4.orig/plugins/Makefile	2006-08-03 04:02:01.000000000 +0200
++++ pptpd-1.3.4/plugins/Makefile	2010-05-30 00:31:31.390625000 +0200
+@@ -1,6 +1,6 @@
+-CC	= gcc
++CC	?= gcc
+ COPTS	= -O2 -g
+-CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
++CFLAGS	?= $(COPTS) -I.. -I../../include -fPIC
+ LDFLAGS	= -shared
+ LDADD   = -lutil
+ INSTALL	= install -o root
diff --git a/package/pptpd/patches/pptpgre-use-debug-option.patch b/package/pptpd/patches/pptpgre-use-debug-option.patch
deleted file mode 100644
index cd1df7703..000000000
--- a/package/pptpd/patches/pptpgre-use-debug-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Nur pptpd-1.3.0/pptpgre.c.orig pptpd-1.3.0/pptpgre.c
---- pptpd-1.3.0.orig/pptpgre.c	2005-08-02 13:33:31.000000000 +0200
-+++ pptpd-1.3.0/pptpgre.c	2008-10-14 13:30:20.000000000 +0200
-@@ -46,6 +46,9 @@
- 
- #define PACKET_MAX 8196
- 
-+/* Command Line Variable Args */
-+extern int pptpctrl_debug;
-+
- typedef int (*callback_t)(int cl, void *pack, unsigned int len);
- 
- /* test for a 32 bit counter overflow */
-@@ -319,7 +322,9 @@ static int dequeue_gre (callback_t callb
- 			stats.rx_lost += head->seq - gre.seq_recv - 1;
- 			syslog(LOG_DEBUG, "GRE: timeout waiting for %d packets", head->seq - gre.seq_recv - 1);        
- 		}
--		syslog(LOG_DEBUG, "GRE: accepting #%d from queue", head->seq);
-+		if (pptpctrl_debug) {
-+			syslog(LOG_DEBUG, "GRE: accepting #%d from queue", head->seq);
-+		}
- 		gre.seq_recv = head->seq;
- 		status = callback(cl, head->packet, head->packlen);
- 		pqueue_del(head);
-@@ -399,7 +404,9 @@ int decaps_gre(int fd, int (*cb) (int cl
- 		}
- 		/* check for out-of-order sequence number */
- 		if (seq_greater(seq, gre.seq_recv)) {
--			syslog(LOG_DEBUG, "GRE: accepting packet #%d", seq);
-+			if (pptpctrl_debug) {
-+				syslog(LOG_DEBUG, "GRE: accepting packet #%d", seq);
-+			}
- 			stats.rx_accepted++;
- 			gre.seq_recv = seq;
- 			return cb(cl, buffer + ip_len + headersize, payload_len);