From 201306cc0713f3b1ffffa660344210a5ca4d2959 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Sat, 18 Sep 1999 17:48:16 +0000
Subject: Update to version 0.20.

PR:		13347
Submitted by:	maintainer
---
 net/tund/Makefile       |  8 +++++++-
 net/tund/distinfo       |  2 +-
 net/tund/files/patch-aa | 19 +++++++++++++++++++
 net/tund/pkg-comment    |  2 +-
 net/tund/pkg-descr      | 10 ++++++----
 net/tund/pkg-plist      |  5 +++++
 6 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 net/tund/files/patch-aa

(limited to 'net')

diff --git a/net/tund/Makefile b/net/tund/Makefile
index f1ca2b834517..366b63f7823a 100644
--- a/net/tund/Makefile
+++ b/net/tund/Makefile
@@ -6,12 +6,18 @@
 # $FreeBSD$
 #
 
-DISTNAME=	tund-0.11
+DISTNAME=	tund-0.20
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.chg.ru/pub/networking/freebsd/
 
 MAINTAINER=	ks@itp.ac.ru
 
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcrypto.a:${PORTSDIR}/security/openssl
+
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+MAKE_ENV+=	EXTRA_SSL_LIBS="-lRSAglue -lrsaref"
+.endif
+
 MAN8=		tund.8
 MANCOMPRESSED=	yes
 
diff --git a/net/tund/distinfo b/net/tund/distinfo
index 4d8106150265..315e8ee3a47c 100644
--- a/net/tund/distinfo
+++ b/net/tund/distinfo
@@ -1 +1 @@
-MD5 (tund-0.11.tar.gz) = 06c5017390e58a2bd47783cf5ebdd86d
+MD5 (tund-0.20.tar.gz) = b5027241938f60033c103b3b44769bbf
diff --git a/net/tund/files/patch-aa b/net/tund/files/patch-aa
new file mode 100644
index 000000000000..cb11aab93c87
--- /dev/null
+++ b/net/tund/files/patch-aa
@@ -0,0 +1,19 @@
+--- Makefile.orig	Fri Sep 17 14:20:52 1999
++++ Makefile	Fri Sep 17 14:21:05 1999
+@@ -10,13 +10,13 @@
+ all: rsa_kg pkey_gen tund keygen
+ 
+ rsa_kg: rsa_kg.c tund.h
+-	$(CC) -o rsa_kg rsa_kg.c $(INC) $(LIB) -lcrypto
++	$(CC) -o rsa_kg rsa_kg.c $(INC) $(LIB) -lcrypto $(EXTRA_SSL_LIBS)
+ 
+ pkey_gen: pkey_gen.c tund.h
+-	$(CC) -o pkey_gen pkey_gen.c $(INC) $(LIB) -lcrypto
++	$(CC) -o pkey_gen pkey_gen.c $(INC) $(LIB) -lcrypto $(EXTRA_SSL_LIBS)
+ 
+ tund: main.o tund.o secur.o scb.o utils.o md5.o alarm.o cipher.o search.o
+-	$(CC) -static -o tund main.o tund.o secur.o scb.o utils.o md5.o alarm.o cipher.o search.o $(LIB) -lmd -lcrypto
++	$(CC) -static -o tund main.o tund.o secur.o scb.o utils.o md5.o alarm.o cipher.o search.o $(LIB) -lmd -lcrypto $(EXTRA_SSL_LIBS)
+ 
+ main.o: main.c tund.h
+ 	$(CC) -c main.c $(INC)
diff --git a/net/tund/pkg-comment b/net/tund/pkg-comment
index be15ff3691b6..be1bc9862489 100644
--- a/net/tund/pkg-comment
+++ b/net/tund/pkg-comment
@@ -1 +1 @@
-IP over UDP tunnel assistant
+IP over UDP tunnel with encryption
diff --git a/net/tund/pkg-descr b/net/tund/pkg-descr
index 7ac1d2c54727..816ba1923d04 100644
--- a/net/tund/pkg-descr
+++ b/net/tund/pkg-descr
@@ -1,8 +1,10 @@
-TUND allows one to organize an IP over IP tunnel (IP packets are incapsulated
-into UDP ones). It works together with FreeBSD ipfw(8). It can be used
-for tunneling private networks behind NATD.
+TUND allows to organize IP over IP tunnel (IP packets are incapsulated
+into UDP one). It works together with FreeBSD ipfw(8). Can be used
+for tunneling private networks behinf NATD. Supports encryption with various
+ciphers, RSA authentication, multiple and parallel tunnels (up to 65534
+tunnels) with single UDP port.
 
-WWW: http://www.chg.ru/~ks/tund/
+WWW: http://www.chg.ru/~ks/tund
 
 Sergey Kosyakov
 ks@itp.ac.ru
diff --git a/net/tund/pkg-plist b/net/tund/pkg-plist
index 05ad07a924aa..cd486a1f5c34 100644
--- a/net/tund/pkg-plist
+++ b/net/tund/pkg-plist
@@ -1 +1,6 @@
+etc/tund.conf
+etc/tund.hosts.key
+etc/tund.rsa.key
+etc/tund.seed.rng
+sbin/pkey_gen
 sbin/tund
-- 
cgit v1.2.3