Update zebedee package to 2.3.1.

- USE_GMAKE.
- use tcl's buildlink.mk.

* Release 2.3.1 (2002/03/15)

Changed any potentially unsafe sprintf/vsprintf instances to
snprintf/vsnprintf. There should never have been a remote exploit possible,
this just eliminates any theoretical local ones in case someone has a reason
to run this as root ... (Note that use of these functions may be an issue
on some platforms although they do appear in the UNIX98 spec and exist
on Windows).

Allowed CIDR address specifications for target (and server name in listenmode).

Added IP address checking with the "checkaddress" keyword.

Finally caved in and added "httpproxy" to allow connection via a web proxy
server using "CONNECT".

Added "transparent" keyword to attempt to act as a transparent proxy and
forward on the client IP address. It may work on Linux 2.0/2.2. But then
again, it might not ...

* Release 2.3.0 (2002/03/07)

New functionality (at last!).

Added "listenip" and -b option to set listening address.

Added "tcptimeout" and "idletimeout" to allow inactive TCP tunnels to be
closed.

Added "ipmode" and -U option to support mixed traffic mode for a single
client or server.

Makefile changes for Irix and HPUX from Kyle Dent. Others to use latest
version of mingw gcc and force use of "native" perl.

Note that Zebedee will now be linked with MSVCRT.DLL. That should only
be a problem on an old Win95 machine.

Japanese documentation NOT YET updated.

3 files changed, 45 insertions, 35 deletions

diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 80e9257c6bf..1e739b27dc5 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/07/15 16:52:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/20 15:16:30 taca Exp $
 #
 
-DISTNAME=		zebedee-2.2.2
+DISTNAME=		zebedee-2.3.1
 CATEGORIES=		security
 MASTER_SITES=		http://www.winton.org.uk/zebedee/ \
 			http://prdownloads.sourceforge.net/zebedee/
@@ -10,15 +10,16 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.winton.org.uk/zebedee/
 COMMENT=		Simple tunneling program for TCP or UDP with encryption
 
-BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
-DEPENDS+=		tcl>=8.3.2:../../lang/tcl
+BUILD_DEPSNDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 
+USE_GMAKE=		# defined
 USE_BUILDLINK_ONLY=	# defined
 
-MAKE_ENV+=		OPTIM="${CFLAGS}"
+MAKE_ENV+=		PERL5=${PERL5}
 MAKE_FLAGS=		OS=${LOWER_OPSYS}
 
 .include "../../archivers/bzip2/buildlink.mk"
 .include "../../devel/zlib/buildlink.mk"
+.include "../../lang/tcl/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo
index 98681f4a3a6..c5a0d04a34f 100644
--- a/security/zebedee/distinfo
+++ b/security/zebedee/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/15 16:52:02 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/03/20 15:16:30 taca Exp $
 
-SHA1 (zebedee-2.2.2.tar.gz) = 7068141a1449016076b84335db2e889803d85719
-Size (zebedee-2.2.2.tar.gz) = 141259 bytes
-SHA1 (patch-aa) = 227a182d275a9b92f12b06619f65a7725dfbe023
+SHA1 (zebedee-2.3.1.tar.gz) = c0b7b753adc94a6ff123ea5663f4398f9c2a95d7
+Size (zebedee-2.3.1.tar.gz) = 149856 bytes
+SHA1 (patch-aa) = 95006d7f7ad1246270a480f609dc98ffbd2f34c7
 SHA1 (patch-ab) = 8fb781f2c6fe5807a196ceb2f0f0eb0a09053288
diff --git a/security/zebedee/patches/patch-aa b/security/zebedee/patches/patch-aa
index 9a969a3e635..d72309e8938 100644
--- a/security/zebedee/patches/patch-aa
+++ b/security/zebedee/patches/patch-aa
@@ -1,24 +1,25 @@
-$NetBSD: patch-aa,v 1.3 2001/07/15 16:52:02 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $
 
---- Makefile.orig	Fri Apr 13 13:41:22 2001
+--- Makefile.orig	Fri Mar 15 19:47:06 2002
 +++ Makefile
-@@ -18,13 +18,14 @@
+@@ -20,6 +20,7 @@
  CC_linux = gcc -pthread
  CC_solaris = gcc
  CC_freebsd = gcc -pthread
 +CC_netbsd = cc
  CC_tru64 = cc
- CC = $(CC_$(OS))
- 
+ CC_irix = cc -n32 -woff 1110
+ CC_hpux = cc -Ae +DAportable
+@@ -28,7 +29,7 @@
  # Optimise/debug compilation
  
  #OPTIM = -Wall -g
 -OPTIM = -O3
-+#OPTIM = -O3
++OPTIM = -O
  
  # Location of gmp include and library
  #
-@@ -36,19 +37,19 @@
+@@ -40,19 +41,19 @@
  
  # Location of Blowfish include and library
  
@@ -29,10 +30,10 @@ $NetBSD: patch-aa,v 1.3 2001/07/15 16:52:02 jlam Exp $
  
  # Location of zlib include and library
  
--ZINC = -I../zlib-1.1.3
--ZLIB = ../zlib-1.1.3/libz.a
+-ZINC = -I../zlib-1.1.4
+-ZLIB = ../zlib-1.1.4/libz.a
 +ZINC =
-+ZLIB = -lz
++ZLIB =
  
  # Location of bzlib include and library
  # Set these empty if you don't want bzib2 support
@@ -40,52 +41,60 @@ $NetBSD: patch-aa,v 1.3 2001/07/15 16:52:02 jlam Exp $
 -BZINC = -I../bzip2-1.0.1
 -BZLIB = ../bzip2-1.0.1/libbz2.a
 +BZINC =
-+BZLIB = -lbz2
++BZLIB =
  
  #
  # Tools needed for Perl "POD"-format documentation conversion.
-@@ -62,9 +63,9 @@
+@@ -68,9 +69,9 @@
  
  # Installation directories for the Linux/Solaris/*NIX World
  
 -ROOTDIR = /usr
-+ROOTDIR = $(LOCALBASE)
++ROOTDIR =$(LOCALBASE)
  BINDIR = $(ROOTDIR)/bin
 -ZBDDIR = $(ROOTDIR)/lib/zebedee
 +ZBDDIR = $(ROOTDIR)/share/doc/zebedee
  MANDIR = $(ROOTDIR)/man/man1
  
  # This is a BSD-style install
-@@ -74,6 +75,7 @@
+@@ -80,6 +81,7 @@
  INSTALL_linux = install -c
  INSTALL_solaris = /usr/ucb/install -c
  INSTALL_freebsd = install -c
 +INSTALL_netbsd = install -c
  INSTALL_tru64 = installbsd -c
- INSTALL = $(INSTALL_$(OS))
- 
-@@ -104,6 +106,7 @@
+ INSTALL_irix = install -c
+ INSTALL_hpux = install -c
+@@ -118,6 +120,7 @@
  DEFINES_linux = -DHAVE_PTHREADS
  DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS
  DEFINES_freebsd = -DHAVE_PTHREADS -DBUGGY_FORK_WITH_THREADS
 +DEFINES_netbsd =
  DEFINES_tru64 = -D_REENTRANT -DHAVE_PTHREADS
- DEFINES = $(DEFINES_$(OS))
- 
-@@ -118,6 +121,7 @@
+ DEFINES_irix = -D_REENTRANT -DHAVE_PTHREADS -Dinline=
+ DEFINES_hpux = -D_REENTRANT -DHAVE_PTHREADS -DDONT_HAVE_SELECT_H -Dinline=
+@@ -134,6 +137,7 @@
  OSLIBS_linux = -lpthread
  OSLIBS_solaris = -lsocket -lnsl -lthread
  OSLIBS_freebsd =
-+OSLIBS_netbsd = -lcrypto
++OSLIBS_netbsd = -lcrypto -lbz2 -lz
  OSLIBS_tru64 = -lpthread
- OSLIBS = $(OSLIBS_$(OS))
+ OSLIBS_irix = -lpthread
+ OSLIBS_hpux = -lpthread -lnsl
+@@ -161,17 +165,17 @@
+ 	client1.key client2.key clients.id
+ 
+ TXTFILES = README.txt LICENCE.txt GPL2.txt CHANGES.txt \
+-	zebedee.html ftpgw.tcl.html zebedee.ja_JP.html zebedee.iss
++	zebedee.html ftpgw.tcl.html zebedee.ja_JP.html
+ 
+ EXTRAFILES = $(ZBDFILES) $(TXTFILES)
  
-@@ -150,10 +154,10 @@
  all : precheck zebedee$(EXE) zebedee.1 zebedee.html ftpgw.tcl.1 ftpgw.tcl.html zebedee.ja_JP.html
  
  precheck :
--	@ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd or tru64"; exit 1; fi
-+	@ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd, netbsd or tru64"; exit 1; fi
+-	@ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd, tru64, irix or hpux"; exit 1; fi
++	@ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd, netbsd, tru64, irix or hpux"; exit 1; fi
  
  zebedee$(EXE) : $(OBJS)
 -	$(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
@@ -93,7 +102,7 @@ $NetBSD: patch-aa,v 1.3 2001/07/15 16:52:02 jlam Exp $
  
  huge.o : huge.h
  
-@@ -182,12 +186,12 @@
+@@ -201,12 +205,12 @@
  
  install : precheck zebedee$(EXE) zebedee.1 ftpgw.tcl.1 $(ZBDFILES) $(TXTFILES)
  	-mkdir -p $(BINDIR) $(MANDIR) $(ZBDDIR)