diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/zebedee/Makefile | 23 | ||||
| -rw-r--r-- | security/zebedee/PLIST | 3 | ||||
| -rw-r--r-- | security/zebedee/distinfo | 8 | ||||
| -rw-r--r-- | security/zebedee/patches/patch-aa | 49 |
4 files changed, 45 insertions, 38 deletions
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 9f633ef4ddd..b70a05a0196 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,21 +1,18 @@ -# $NetBSD: Makefile,v 1.17 2004/10/03 00:18:14 tv Exp $ -# +# $NetBSD: Makefile,v 1.18 2005/02/22 16:26:57 adam Exp $ -DISTNAME= zebedee-2.3.1 -PKGREVISION= 3 -CATEGORIES= security -MASTER_SITES= http://www.winton.org.uk/zebedee/ \ - ${MASTER_SITE_SOURCEFORGE:=zebedee/} +DISTNAME= zebedee-2.5.2 +CATEGORIES= security +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zebedee/} -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.winton.org.uk/zebedee/ -COMMENT= Simple tunneling program for TCP or UDP with encryption +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.winton.org.uk/zebedee/ +COMMENT= Simple tunneling program for TCP or UDP with encryption -DEPENDS+= tcl-[0-9]*:../../lang/tcl +DEPENDS+= tcl-[0-9]*:../../lang/tcl -USE_PERL5= build -USE_GNU_TOOLS+= make USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make +USE_PERL5= build MAKE_ENV+= PERL5=${PERL5} MAKE_FLAGS= OS=${LOWER_OPSYS} diff --git a/security/zebedee/PLIST b/security/zebedee/PLIST index 81c3b7104d9..a8018f80cc5 100644 --- a/security/zebedee/PLIST +++ b/security/zebedee/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:18:05 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/02/22 16:26:58 adam Exp $ bin/ftpgw.tcl bin/zebedee man/man1/ftpgw.tcl.1 @@ -6,6 +6,7 @@ man/man1/zebedee.1 share/doc/zebedee/CHANGES.txt share/doc/zebedee/GPL2.txt share/doc/zebedee/LICENCE.txt +share/doc/zebedee/NOTICE.txt share/doc/zebedee/README.txt share/doc/zebedee/client1.key share/doc/zebedee/client2.key diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo index c5a0d04a34f..07b8d41ef54 100644 --- a/security/zebedee/distinfo +++ b/security/zebedee/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/03/20 15:16:30 taca Exp $ +$NetBSD: distinfo,v 1.5 2005/02/22 16:26:58 adam Exp $ -SHA1 (zebedee-2.3.1.tar.gz) = c0b7b753adc94a6ff123ea5663f4398f9c2a95d7 -Size (zebedee-2.3.1.tar.gz) = 149856 bytes -SHA1 (patch-aa) = 95006d7f7ad1246270a480f609dc98ffbd2f34c7 +SHA1 (zebedee-2.5.2.tar.gz) = fcb01f358f1b7166df60191ad8c507e1dbe58c8a +Size (zebedee-2.5.2.tar.gz) = 175463 bytes +SHA1 (patch-aa) = 57defd640f2a2d313f83b80bd3e860da1a79eedd SHA1 (patch-ab) = 8fb781f2c6fe5807a196ceb2f0f0eb0a09053288 diff --git a/security/zebedee/patches/patch-aa b/security/zebedee/patches/patch-aa index d72309e8938..046f7bcafbd 100644 --- a/security/zebedee/patches/patch-aa +++ b/security/zebedee/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ +$NetBSD: patch-aa,v 1.5 2005/02/22 16:26:58 adam Exp $ ---- Makefile.orig Fri Mar 15 19:47:06 2002 +--- Makefile.orig 2003-09-23 12:37:56.000000000 +0000 +++ Makefile -@@ -20,6 +20,7 @@ +@@ -20,6 +20,7 @@ CC_win32 = gcc -mno-cygwin CC_linux = gcc -pthread CC_solaris = gcc CC_freebsd = gcc -pthread @@ -10,18 +10,18 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ CC_tru64 = cc CC_irix = cc -n32 -woff 1110 CC_hpux = cc -Ae +DAportable -@@ -28,7 +29,7 @@ +@@ -30,7 +31,7 @@ CC = $(CC_$(OS)) # Optimise/debug compilation #OPTIM = -Wall -g --OPTIM = -O3 -+OPTIM = -O +-OPTIM = -Wall -O3 ++OPTIM = -Wall # Location of gmp include and library # -@@ -40,19 +41,19 @@ - - # Location of Blowfish include and library +@@ -45,19 +46,19 @@ OPTIM = -Wall -O3 + # BFINC = /usr/include/openssl + # BFLIB = -lcrypto -BFINC = -I../blowfish-0.9.5a -BFLIB = ../blowfish-0.9.5a/libblowfish.a @@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ # # Tools needed for Perl "POD"-format documentation conversion. -@@ -68,9 +69,9 @@ +@@ -73,9 +74,9 @@ POD2MAN = $(PERL) -S pod2man$(BAT_$(OS)) # Installation directories for the Linux/Solaris/*NIX World @@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ MANDIR = $(ROOTDIR)/man/man1 # This is a BSD-style install -@@ -80,6 +81,7 @@ +@@ -85,6 +86,7 @@ INSTALL_$(OS) = install -c INSTALL_linux = install -c INSTALL_solaris = /usr/ucb/install -c INSTALL_freebsd = install -c @@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ INSTALL_tru64 = installbsd -c INSTALL_irix = install -c INSTALL_hpux = install -c -@@ -118,6 +120,7 @@ +@@ -145,6 +147,7 @@ DEFINES_win32 = -DFD_SETSIZE=512 DEFINES_linux = -DHAVE_PTHREADS DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS DEFINES_freebsd = -DHAVE_PTHREADS -DBUGGY_FORK_WITH_THREADS @@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ DEFINES_tru64 = -D_REENTRANT -DHAVE_PTHREADS DEFINES_irix = -D_REENTRANT -DHAVE_PTHREADS -Dinline= DEFINES_hpux = -D_REENTRANT -DHAVE_PTHREADS -DDONT_HAVE_SELECT_H -Dinline= -@@ -134,6 +137,7 @@ +@@ -163,6 +166,7 @@ OSLIBS_win32 = -lwsock32 -lwinmm OSLIBS_linux = -lpthread OSLIBS_solaris = -lsocket -lnsl -lthread OSLIBS_freebsd = @@ -81,10 +81,19 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ OSLIBS_tru64 = -lpthread OSLIBS_irix = -lpthread OSLIBS_hpux = -lpthread -lnsl -@@ -161,17 +165,17 @@ +@@ -182,7 +186,7 @@ SERVICEOBJ = $(SERVICEOBJ_$(OS)) + #### You REALLY shouldn't have to modify anything beyond here ... + #### + +-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) ++CFLAGS += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) + + LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) + +@@ -192,17 +196,17 @@ ZBDFILES = server.zbd vncviewer.zbd vncs client1.key client2.key clients.id - TXTFILES = README.txt LICENCE.txt GPL2.txt CHANGES.txt \ + TXTFILES = README.txt LICENCE.txt GPL2.txt CHANGES.txt NOTICE.txt \ - zebedee.html ftpgw.tcl.html zebedee.ja_JP.html zebedee.iss + zebedee.html ftpgw.tcl.html zebedee.ja_JP.html @@ -93,8 +102,8 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ 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, 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 +- @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi ++ @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd, netbsd, openbsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi zebedee$(EXE) : $(OBJS) - $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) @@ -102,7 +111,7 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ huge.o : huge.h -@@ -201,12 +205,12 @@ +@@ -232,12 +236,12 @@ ftpgw.tcl.html : ftpgw.tcl.pod install : precheck zebedee$(EXE) zebedee.1 ftpgw.tcl.1 $(ZBDFILES) $(TXTFILES) -mkdir -p $(BINDIR) $(MANDIR) $(ZBDDIR) @@ -118,5 +127,5 @@ $NetBSD: patch-aa,v 1.4 2002/03/20 15:16:31 taca Exp $ + $(INSTALL) -m 0444 $(ZBDFILES) $(ZBDDIR) + $(INSTALL) -m 0444 $(TXTFILES) $(ZBDDIR) - clean : precheck - rm -f zebedee$(EXE) *.o core *.1 *.html *.tmp *.bak + clean : + rm -f zebedee zebedee.exe *.o core *.1 *.html *.tmp *.bak |