Update to poptop 1.3.4

Tested by loux.thefuture@gmail.com


Changes since 1.3.0:

1.3.4: released 2007-04-16

- fix two release critical packet reordering bugs [Oester]
- accept both types of domain delimiter [Cameron]
- deprecate PPP_WAIT workaround in favour of turning off pty echo [Brady]

1.3.3: released 2006-09-05

- add missing connections option in sample pptpd.conf [Cameron]
- add message to indicate when constrained by IP range [Cameron]
- fix segfault on -C option, Closes Gentoo Bug #132898 [Nastac]
- support mixed architecture build on x86_64 [Gorlov]
- fix configure --with and --without option processing again [Cameron]
- include libutil in logwtmp build [Gorlov]
- fix spec file [Howarth]

1.3.2: released 2006-04-18

- fix configure --with and --without option processing [Cameron]
- avoid reporting packet loss if debug option not set [Cameron]

1.3.1: released 2006-02-14

- make connections limit configurable at run-time [Cameron]
- migrate --with-pppd-ip-alloc to delegate option [Cameron]
- prevent initial unwanted GRE ACK [Barker]
- bcrelay, ignore ENOBUFS [Rajkumar]
- remove superfluous sigset [Cameron/Gono]
- compilation fixes for gcc 4.0.1 [Cameron]
- factorise argument processing in pptpctrl [Cameron/Visi]

5 files changed, 22 insertions, 31 deletions

diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index b7cbbcd47d1..fa79ea6498f 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2009/02/24 21:22:41 cube Exp $
+# $NetBSD: Makefile,v 1.18 2011/02/12 16:47:43 asau Exp $
 #
 
-DISTNAME=	pptpd-1.3.0
+DISTNAME=	pptpd-1.3.4
 PKGNAME=	${DISTNAME:S/pptpd/poptop/}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poptop/}
diff --git a/net/poptop/distinfo b/net/poptop/distinfo
index b17293ff4a6..b0c991f8759 100644
--- a/net/poptop/distinfo
+++ b/net/poptop/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.9 2009/02/24 21:22:41 cube Exp $
+$NetBSD: distinfo,v 1.10 2011/02/12 16:47:43 asau Exp $
 
-SHA1 (pptpd-1.3.0.tar.gz) = 9aa12346afa607651f16e1dd7df0356d717b63af
-RMD160 (pptpd-1.3.0.tar.gz) = 01bb976b56589d7fd264653c394abe3c883e055b
-Size (pptpd-1.3.0.tar.gz) = 204099 bytes
+SHA1 (pptpd-1.3.4.tar.gz) = 3d1faf99055e420bafa96c96e8871a888c50b4e8
+RMD160 (pptpd-1.3.4.tar.gz) = 1c6c748bf9e81d223087998ee0cca821814d19f9
+Size (pptpd-1.3.4.tar.gz) = 240942 bytes
 SHA1 (patch-aa) = 40e5873fc582040112e97477e3709e729245d4c9
 SHA1 (patch-ab) = f9c2ff75976a59da67de9b65d2261d29daec1865
-SHA1 (patch-ac) = d8ec7a772f2496fad220f8608fe0cfe474352765
+SHA1 (patch-ac) = d9ec5b2d23ac7d35c33a114d99575b25667f9bcb
 SHA1 (patch-ad) = 451e6811622114c4e99df3b9ff31238bfa6623ed
-SHA1 (patch-ae) = 3e84b13d4961e11e8c45ef81ae1dd44551da073f
+SHA1 (patch-ae) = d964e2a8138781c1434bc87081c19798ada9fc06
 SHA1 (patch-af) = f087f8b16566701ab51dbb967a126c710f785213
 SHA1 (patch-ag) = 7810baae4607113684a00bcdf13140242f8744b9
 SHA1 (patch-ah) = 54506391dfc52ce71550aec6225d96b069560581
 SHA1 (patch-ai) = c03b43e2d3c1df51df8ab030560a44949557046f
-SHA1 (patch-aj) = 3e3a2fbdd1f7e5ec2f3b76c9719e8d604ec8a958
+SHA1 (patch-aj) = 40f9e760f1812d05fa5a641f7da1325d8dbf7072
diff --git a/net/poptop/patches/patch-ac b/net/poptop/patches/patch-ac
index 972d2ca5830..7ccedc61583 100644
--- a/net/poptop/patches/patch-ac
+++ b/net/poptop/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2009/02/24 21:22:41 cube Exp $
+$NetBSD: patch-ac,v 1.5 2011/02/12 16:47:44 asau Exp $
 
---- pptpctrl.c.orig	2004-04-28 11:36:07.000000000 +0000
-+++ pptpctrl.c
+--- pptpctrl.c.orig	2006-12-08 03:01:40.000000000 +0300
++++ pptpctrl.c	2011-02-12 17:02:53.000000000 +0300
 @@ -32,6 +32,11 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
@@ -13,8 +13,8 @@ $NetBSD: patch-ac,v 1.4 2009/02/24 21:22:41 cube Exp $
 +#endif
  #ifdef HAVE_PTY_H
  #include <pty.h>
- #endif
-@@ -734,7 +739,7 @@ static void launch_pppd(char **pppaddrs,
+ #include <termios.h>
+@@ -773,7 +778,7 @@ static void launch_pppd(char **pppaddrs,
  
          if (pptp_logwtmp) {
                   pppd_argv[an++] = "plugin";
diff --git a/net/poptop/patches/patch-ae b/net/poptop/patches/patch-ae
index e941da7ff27..530dd519299 100644
--- a/net/poptop/patches/patch-ae
+++ b/net/poptop/patches/patch-ae
@@ -1,16 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2009/02/24 21:22:41 cube Exp $
+$NetBSD: patch-ae,v 1.3 2011/02/12 16:47:44 asau Exp $
 
 --- Makefile.in.orig	2005-08-03 07:47:42.000000000 +0000
 +++ Makefile.in
-@@ -14,7 +14,7 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
-+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
 @@ -37,7 +37,7 @@ NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
diff --git a/net/poptop/patches/patch-aj b/net/poptop/patches/patch-aj
index e5404cefcef..347ef12ac01 100644
--- a/net/poptop/patches/patch-aj
+++ b/net/poptop/patches/patch-aj
@@ -1,15 +1,15 @@
-$NetBSD: patch-aj,v 1.1 2009/02/24 21:22:41 cube Exp $
+$NetBSD: patch-aj,v 1.2 2011/02/12 16:47:44 asau Exp $
 
---- plugins/Makefile.orig	2004-05-21 09:26:37.000000000 +0000
-+++ plugins/Makefile
-@@ -20,8 +20,8 @@ all:	$(PLUGINS)
- LIBDIR	= $(DESTDIR)$(prefix)/lib/pptpd
+--- plugins/Makefile.orig	2006-08-03 06:02:01.000000000 +0400
++++ plugins/Makefile	2011-02-12 17:08:54.000000000 +0300
+@@ -21,8 +21,8 @@
+ LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
  
  install: $(PLUGINS)
 -	$(INSTALL) -d $(LIBDIR)
 -	$(INSTALL) $? $(LIBDIR)
-+	$(BSD_INSTALL_LIB_DIR) $(LIBDIR)
-+	$(BSD_INSTALL_LIB) $? $(LIBDIR)
++	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR)
++	$(BSD_INSTALL_LIB) $? $(DESTDIR)$(LIBDIR)
  
  uninstall:
  	rm -f $(LIBDIR)$(PLUGINS)