From 9ad7482ff93b89951fee46973baa48ecbf189770 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 23 Jan 2010 22:18:19 +0000
Subject: [PATCH] pptpd: update to v1.3.4 - patch by Edgar Soldin

SVN-Revision: 19301
---
 net/pptpd/Makefile                            |  6 ++--
 net/pptpd/patches/001-bad_pqueue_debug.patch  |  8 ++---
 net/pptpd/patches/002-makefile_fix.patch      | 11 ++++++
 .../002-pptpgre_use_debug_option.patch        | 35 -------------------
 4 files changed, 17 insertions(+), 43 deletions(-)
 create mode 100644 net/pptpd/patches/002-makefile_fix.patch
 delete mode 100644 net/pptpd/patches/002-pptpgre_use_debug_option.patch

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index 6793972c4..3e78e989e 100644
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -8,19 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.3.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/poptop
-PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67
+#PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67 #1.3.0
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pptpd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-ppp +kmod-gre
+  DEPENDS:=+kmod-ppp +kmod-gre +ppp
   TITLE:=PopTop pptp server
   URL:=http://www.poptop.org/
   SUBMENU:=VPN
diff --git a/net/pptpd/patches/001-bad_pqueue_debug.patch b/net/pptpd/patches/001-bad_pqueue_debug.patch
index 87e76648a..8e8f5a5eb 100644
--- a/net/pptpd/patches/001-bad_pqueue_debug.patch
+++ b/net/pptpd/patches/001-bad_pqueue_debug.patch
@@ -1,7 +1,6 @@
-diff -urN pptpd-1.3.0/pqueue.c.orig pptpd-1.3.0/pqueue.c
---- pptpd-1.3.0/pqueue.c.orig	2006-04-17 20:44:28.000000000 -0400
-+++ pptpd-1.3.0/pqueue.c	2006-04-17 20:44:58.000000000 -0400
-@@ -6,14 +6,11 @@
+--- pptpd-1.3.4.orig/pqueue.c	2005-08-03 10:53:22.000000000 +0200
++++ pptpd-1.3.4/pqueue.c	2009-12-03 17:47:26.976174000 +0100
+@@ -7,13 +7,11 @@
  #include "pqueue.h"
  
  #ifdef DEBUG_PQUEUE
@@ -13,7 +12,6 @@ diff -urN pptpd-1.3.0/pqueue.c.orig pptpd-1.3.0/pqueue.c
  #endif
  
 -#define DEBUG_CMD(_a) if (DEBUG_ON) { _a }
--
 -
  #define MIN_CAPACITY 128 /* min allocated buffer for a packet */
  
diff --git a/net/pptpd/patches/002-makefile_fix.patch b/net/pptpd/patches/002-makefile_fix.patch
new file mode 100644
index 000000000..554b0a1d2
--- /dev/null
+++ b/net/pptpd/patches/002-makefile_fix.patch
@@ -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	2009-12-03 21:18:09.678467590 +0100
+@@ -18,7 +18,7 @@ all:	$(PLUGINS)
+ %.so: %.c
+ 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
+ 
+-LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
++LIBDIR	= $(DESTDIR)$(prefix)/lib/pptpd
+ 
+ install: $(PLUGINS)
+ 	$(INSTALL) -d $(LIBDIR)
diff --git a/net/pptpd/patches/002-pptpgre_use_debug_option.patch b/net/pptpd/patches/002-pptpgre_use_debug_option.patch
deleted file mode 100644
index d4ffe5c2e..000000000
--- a/net/pptpd/patches/002-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/pptpgre.c.orig	2006-04-18 02:13:10.000000000 -0400
-+++ pptpd-1.3.0/pptpgre.c	2006-04-18 02:14:19.000000000 -0400
-@@ -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 @@
- 			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 @@
- 		}
- 		/* 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);
-- 
2.30.2