Initial import of rp-l2tp-0.3 into the NetBSD Packages Collection.

l2tpd is a user-space L2TP daemon.  L2TP is the Layer Two Tunneling
Protocol described in RFC 2661.  It allows you to tunnel PPP sessions
over a network or transport protocol (in this case, UDP.)

Part of the l2tp code is implemented in the l2tpd program, and part of
it is implemented as "handlers".  A handler is a shared-object library
which is dynamically linked into l2tpd at run-time using the
"load-handler" configuration directive.

Although the handlers included with this package (sync-pppd and cmd)
are licensed under the GPL, as a special exception, you may write your
own handlers which link to code in this package and not release them
under the GPL.  There may be other reasons why your handlers must
be released under the GPL (for example, they may link with other GPL'd
code), but in the absence of other reasons, you may keep your handlers
proprietary.

12 files changed, 231 insertions, 0 deletions

diff --git a/net/rp-l2tp/DESCR b/net/rp-l2tp/DESCR
new file mode 100644
index 00000000000..5353d8d6fc4
--- /dev/null
+++ b/net/rp-l2tp/DESCR
@@ -0,0 +1,16 @@
+l2tpd is a user-space L2TP daemon.  L2TP is the Layer Two Tunneling
+Protocol described in RFC 2661.  It allows you to tunnel PPP sessions
+over a network or transport protocol (in this case, UDP.)
+
+Part of the l2tp code is implemented in the l2tpd program, and part of
+it is implemented as "handlers".  A handler is a shared-object library
+which is dynamically linked into l2tpd at run-time using the
+"load-handler" configuration directive.
+
+Although the handlers included with this package (sync-pppd and cmd)
+are licensed under the GPL, as a special exception, you may write your
+own handlers which link to code in this package and not release them
+under the GPL.  There may be other reasons why your handlers must
+be released under the GPL (for example, they may link with other GPL'd
+code), but in the absence of other reasons, you may keep your handlers
+proprietary.
diff --git a/net/rp-l2tp/MESSAGE b/net/rp-l2tp/MESSAGE
new file mode 100644
index 00000000000..f605b88ed43
--- /dev/null
+++ b/net/rp-l2tp/MESSAGE
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+l2tpd needs to be configured to manage the tunnelling - it cannot
+reasonably be set up to use default settings.  To configure rp-l2tpd
+this, please make sure the file
+
+	${PKG_SYSCONFDIR}/l2tp.conf
+
+reflects your network and security settings.  An example configuration
+file is provided as:
+
+	${PREFIX}/share/examples/l2tp.conf
+
+===========================================================================
diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
new file mode 100644
index 00000000000..5deab82beea
--- /dev/null
+++ b/net/rp-l2tp/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+#
+
+DISTNAME=	rp-l2tp-0.3
+CATEGORIES=	net security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rp-l2tp/}
+
+MAINTAINER=	tech-pkg@netbsd.org
+HOMEPAGE=	http://sourceforge.net/projects/rp-l2tp/
+COMMENT=	User-space implementation of layer 2 tunnelling protocol
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+USE_GMAKE=	yes
+
+post-patch:
+	for f in l2tp.conf.5 l2tpd.8; do				\
+		${MV} ${WRKSRC}/man/$$f ${WRKSRC}/man/$$f.in &&		\
+		${SED} -e 's|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g'		\
+			${WRKSRC}/man/$$f.in > ${WRKSRC}/man/$$f;	\
+	done
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/rp-l2tp/PLIST b/net/rp-l2tp/PLIST
new file mode 100644
index 00000000000..01f3ff07f98
--- /dev/null
+++ b/net/rp-l2tp/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+lib/l2tp/plugins/cmd.so
+lib/l2tp/plugins/sync-pppd.so
+man/man5/l2tp.conf.5
+man/man8/l2tpd.8
+sbin/l2tp-control
+sbin/l2tpd
+share/examples/l2tp.conf
+@dirrm lib/l2tp/plugins
+@dirrm lib/l2tp
diff --git a/net/rp-l2tp/distinfo b/net/rp-l2tp/distinfo
new file mode 100644
index 00000000000..8b0b3ab5530
--- /dev/null
+++ b/net/rp-l2tp/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+SHA1 (rp-l2tp-0.3.tar.gz) = 3f4f08a5271f0adf1dd90567851f1a8e223ecb72
+Size (rp-l2tp-0.3.tar.gz) = 191418 bytes
+SHA1 (patch-aa) = a351d8bcea431bc47a0a375c770d07e059103841
+SHA1 (patch-ab) = 9013297a1e6fede036894be04413feb0cc1bb803
+SHA1 (patch-ac) = 8225dd6f2290b6e66e04f0b1ce67be293d89783c
+SHA1 (patch-ad) = 943de75b5928bca92ec739106f3c5679189557c3
+SHA1 (patch-ae) = 62c6d5fb9ddd69467fbb6ed6b502add0ae646a29
+SHA1 (patch-af) = 3fa6c660ca06ddf3ea49e33e31506f714f7ef9b5
+SHA1 (patch-ag) = 5dc50f2ace17bb97717d628e9fdfe689443966c0
diff --git a/net/rp-l2tp/patches/patch-aa b/net/rp-l2tp/patches/patch-aa
new file mode 100644
index 00000000000..5b3af588752
--- /dev/null
+++ b/net/rp-l2tp/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+--- peer.c	2003/12/17 22:51:14	1.1
++++ peer.c	2003/12/17 22:52:35
+@@ -20,6 +20,8 @@
+ #include <stddef.h>
+ #include <string.h>
+ 
++#include <sys/socket.h>
++
+ static hash_table all_peers;
+ static int peer_process_option(EventSelector *es,
+ 			       char const *name,
diff --git a/net/rp-l2tp/patches/patch-ab b/net/rp-l2tp/patches/patch-ab
new file mode 100644
index 00000000000..e81189192e6
--- /dev/null
+++ b/net/rp-l2tp/patches/patch-ab
@@ -0,0 +1,46 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+--- Makefile.in.orig	2002-09-30 21:33:55.000000000 +0100
++++ Makefile.in	2003-12-18 10:24:07.000000000 +0000
+@@ -26,11 +26,20 @@
+ install_dir=@INSTALL@ -d
+ sbindir=@sbindir@
+ 
++OPSYS= $(shell uname -s)
++
+ OBJS=auth.o debug.o dgram.o main.o md5.o network.o options.o peer.o session.o tunnel.o utils.o
+-EXTRA_LIBS=@LIBEVENT@/*.o -ldl
++
++ifeq (${OPSYS}, Linux)
++EXTRA_LIBS=-ldl
++DYNAMIC_FLAGS= -rdynamic
++endif
++
++ifeq (${OPSYS}, NetBSD)
++endif
+ 
+ SRCS=$(OBJS:.o=.c)
+-CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\"
++CFLAGS=-g -I.. -I@LIBEVENT@ -Wall -Wstrict-prototypes -ansi -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(prefix)\" -DSYSCONFDIR=\""@sysconfdir@"\"
+ 
+ TARGETS=l2tpd libl2tp.a handlers
+ 
+@@ -43,7 +52,7 @@
+ 
+ l2tpd: libl2tp.a libevent/libevent.a
+ 	$(MAKE) -C handlers
+-	@CC@ -o l2tpd -rdynamic $(OBJS) $(EXTRA_LIBS)
++	@CC@ -o l2tpd $(DYNAMIC_FLAGS) $(OBJS) @LIBEVENT@/*.o $(EXTRA_LIBS)
+ 
+ libevent/libevent.a:
+ 	test -d libevent || ln -s ../libevent .
+@@ -82,8 +91,7 @@
+ install: all
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(sbindir)
+ 	$(install) -m 755 -s l2tpd $(RPM_INSTALL_ROOT)$(sbindir)
+-	-mkdir -p $(RPM_INSTALL_ROOT)/etc/l2tp
+-	$(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example
++	$(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)${PREFIX}/share/examples/l2tp.conf
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man8
+ 	-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5
+ 	$(install) -m 644 man/l2tpd.8 $(RPM_INSTALL_ROOT)$(mandir)/man8
diff --git a/net/rp-l2tp/patches/patch-ac b/net/rp-l2tp/patches/patch-ac
new file mode 100644
index 00000000000..a389b72056a
--- /dev/null
+++ b/net/rp-l2tp/patches/patch-ac
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+--- handlers/pty.c	2003/12/18 09:47:10	1.1
++++ handlers/pty.c	2003/12/18 09:49:36
+@@ -21,7 +21,10 @@
+ #include <termios.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+-#ifndef N_HDLC
++#ifdef __NetBSD__
++#include <util.h>
++#endif
++#if defined(__linux__) && !defined(N_HDLC)
+ #include <linux/termios.h>
+ #endif
+ 
+@@ -39,6 +42,9 @@
+ int
+ pty_get(int *mfp, int *sfp)
+ {
++#ifdef __NetBSD__
++	return openpty(mfp, sfp, NULL, NULL, NULL);
++#else
+     char pty_name[24];
+     struct termios tios;
+     int mfd, sfd;
+@@ -92,5 +98,6 @@
+ 	return -1;
+     }
+     return 0;
++#endif
+ }
+ 
diff --git a/net/rp-l2tp/patches/patch-ad b/net/rp-l2tp/patches/patch-ad
new file mode 100644
index 00000000000..b19c1af2814
--- /dev/null
+++ b/net/rp-l2tp/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+*** handlers/cmd-control.c	2002/09/30 19:45:00	1.2
+--- handlers/cmd-control.c	2003/12/18 09:55:45
+***************
+*** 18,22 ****
+  #include <stdio.h>
+  #include <sys/socket.h>
+  #include <sys/un.h>
+- #include <sys/types.h>
+  #include <sys/stat.h>
+--- 18,22 ----
+  #include <stdio.h>
++ #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <sys/un.h>
+  #include <sys/stat.h>
diff --git a/net/rp-l2tp/patches/patch-ae b/net/rp-l2tp/patches/patch-ae
new file mode 100644
index 00000000000..7ca940c50dc
--- /dev/null
+++ b/net/rp-l2tp/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+--- main.c	2003/12/18 16:02:21	1.1
++++ main.c	2003/12/18 16:02:56
+@@ -68,7 +68,7 @@
+     l2tp_peer_init();
+     l2tp_debug_set_bitmask(debugmask);
+ 
+-    if (l2tp_parse_config_file(es, "/etc/l2tp/l2tp.conf") < 0) {
++    if (l2tp_parse_config_file(es, SYSCONFDIR "/l2tp.conf") < 0) {
+ 	l2tp_die();
+     }
+ 
diff --git a/net/rp-l2tp/patches/patch-af b/net/rp-l2tp/patches/patch-af
new file mode 100644
index 00000000000..01911db1ea6
--- /dev/null
+++ b/net/rp-l2tp/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+--- man/l2tp.conf.5	2003/12/18 16:13:33	1.1
++++ man/l2tp.conf.5	2003/12/18 16:14:27
+@@ -10,7 +10,7 @@
+ \fBl2tpd\fR is a user-space L2TP daemon.  L2TP is the Layer Two
+ Tunneling Protocol described in RFC 2661.  It allows you to tunnel
+ PPP sessions over a network or transport protocol (in this case, UDP.)
+-The file \fB/etc/l2tp/l2tp.conf\fR is the configuration file for the
++The file \fB@SYSCONFDIR@/l2tp.conf\fR is the configuration file for the
+ daemon.
+ 
+ Each line in the file takes one of the following forms:
diff --git a/net/rp-l2tp/patches/patch-ag b/net/rp-l2tp/patches/patch-ag
new file mode 100644
index 00000000000..2143a2c90a3
--- /dev/null
+++ b/net/rp-l2tp/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+
+--- man/l2tpd.8	2003/12/18 16:13:33	1.1
++++ man/l2tpd.8	2003/12/18 16:14:53
+@@ -47,14 +47,14 @@
+ fairly lightweight and efficient.
+ 
+ .SH L2TPD CONFIGURATION
+-On startup, \fBl2tpd\fR reads the configuration file \fB/etc/l2tp/l2tp.conf\fR.
++On startup, \fBl2tpd\fR reads the configuration file \fB@SYSCONFDIR@/l2tp.conf\fR.
+ This configuration file sets operating parameters, describes peers and loads
+ and configures handlers.  See \fBl2tp.conf\fR(5) for configuration
+ file details.
+ 
+ .SH FILES
+ .TP
+-.B /etc/l2tp/l2tp.conf
++.B @SYSCONFDIR@/l2tp.conf
+ Main configuration file.
+ .TP
+ .B /var/run/l2tpctrl