diff options
author | taca <taca@pkgsrc.org> | 2005-09-18 13:51:09 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2005-09-18 13:51:09 +0000 |
commit | 39290a3818fd771245c3ad88249c20256da825fd (patch) | |
tree | b86dc729533535b66cb895d976cd253c2a84513a /security | |
parent | 18e0da6dcca7983b4014decd97534ea672a455c7 (diff) | |
download | pkgsrc-39290a3818fd771245c3ad88249c20256da825fd.tar.gz |
Update zebedee package to 2.5.3 which includes security fix (possible DoS).
* Release 2.5.3
Fix file descriptor leak when IP address lookup fails.
Fix problem with running a server in "reverse" mode and detached -- only
apparent on Windows.
Add "maxconnections" to alleviate DoS attack.
Check for target port 0 to avoid DoS.
Linux 64-bit port (a result of the "Linux on POWER" contest) courtesy of
Stew Benedict <stewb@linuxcontrol.net>. Use the "linux64" OS target.
Upgraded version of bzip2 and zlib.
Diffstat (limited to 'security')
-rw-r--r-- | security/zebedee/Makefile | 10 | ||||
-rw-r--r-- | security/zebedee/distinfo | 12 | ||||
-rw-r--r-- | security/zebedee/patches/patch-aa | 57 | ||||
-rw-r--r-- | security/zebedee/patches/patch-ab | 6 |
4 files changed, 51 insertions, 34 deletions
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 885f24c287c..d3e670939e4 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:19 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/09/18 13:51:09 taca Exp $ -DISTNAME= zebedee-2.5.2 +DISTNAME= zebedee-2.5.3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zebedee/} @@ -15,6 +15,12 @@ USE_TOOLS+= gmake perl MAKE_ENV+= PERL5=${PERL5} MAKE_FLAGS= OS=${LOWER_OPSYS} +.include "../../mk/pthread.buildlink3.mk" + +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" +PTHREAD_CFLAGS+= -DHAVE_PTHREADS +.endif + .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo index 882b423d8b6..eb850930c69 100644 --- a/security/zebedee/distinfo +++ b/security/zebedee/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 13:10:14 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/09/18 13:51:09 taca Exp $ -SHA1 (zebedee-2.5.2.tar.gz) = fcb01f358f1b7166df60191ad8c507e1dbe58c8a -RMD160 (zebedee-2.5.2.tar.gz) = 0d3f688c118c061dc0115e1c26b152c550e9b8d9 -Size (zebedee-2.5.2.tar.gz) = 175463 bytes -SHA1 (patch-aa) = 57defd640f2a2d313f83b80bd3e860da1a79eedd -SHA1 (patch-ab) = 8fb781f2c6fe5807a196ceb2f0f0eb0a09053288 +SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986 +RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30 +Size (zebedee-2.5.3.tar.gz) = 176088 bytes +SHA1 (patch-aa) = e3ee5aa0fb4364c2edcdfc0e171fd232f8d60073 +SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b diff --git a/security/zebedee/patches/patch-aa b/security/zebedee/patches/patch-aa index 046f7bcafbd..72a9256196c 100644 --- a/security/zebedee/patches/patch-aa +++ b/security/zebedee/patches/patch-aa @@ -1,16 +1,16 @@ -$NetBSD: patch-aa,v 1.5 2005/02/22 16:26:58 adam Exp $ +$NetBSD: patch-aa,v 1.6 2005/09/18 13:51:09 taca Exp $ ---- Makefile.orig 2003-09-23 12:37:56.000000000 +0000 +--- Makefile.orig 2005-09-06 14:59:53.000000000 +0900 +++ Makefile -@@ -20,6 +20,7 @@ CC_win32 = gcc -mno-cygwin - CC_linux = gcc -pthread +@@ -21,6 +21,7 @@ CC_linux = gcc -pthread + CC_linux64 = $(CC_linux) -m64 CC_solaris = gcc CC_freebsd = gcc -pthread +CC_netbsd = cc CC_tru64 = cc CC_irix = cc -n32 -woff 1110 CC_hpux = cc -Ae +DAportable -@@ -30,7 +31,7 @@ CC = $(CC_$(OS)) +@@ -31,7 +32,7 @@ CC = $(CC_$(OS)) # Optimise/debug compilation #OPTIM = -Wall -g @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.5 2005/02/22 16:26:58 adam Exp $ # Location of gmp include and library # -@@ -45,19 +46,19 @@ OPTIM = -Wall -O3 +@@ -46,19 +47,19 @@ OPTIM = -Wall -O3 # BFINC = /usr/include/openssl # BFLIB = -lcrypto @@ -30,22 +30,22 @@ $NetBSD: patch-aa,v 1.5 2005/02/22 16:26:58 adam Exp $ # Location of zlib include and library --ZINC = -I../zlib-1.1.4 --ZLIB = ../zlib-1.1.4/libz.a +-ZINC = -I../zlib-1.2.3 +-ZLIB = ../zlib-1.2.3/libz.a +ZINC = +ZLIB = # Location of bzlib include and library # Set these empty if you don't want bzib2 support --BZINC = -I../bzip2-1.0.1 --BZLIB = ../bzip2-1.0.1/libbz2.a +-BZINC = -I../bzip2-1.0.3 +-BZLIB = ../bzip2-1.0.3/libbz2.a +BZINC = +BZLIB = # # Tools needed for Perl "POD"-format documentation conversion. -@@ -73,9 +74,9 @@ POD2MAN = $(PERL) -S pod2man$(BAT_$(OS)) +@@ -74,9 +75,9 @@ POD2MAN = $(PERL) -S pod2man$(BAT_$(OS)) # Installation directories for the Linux/Solaris/*NIX World @@ -57,40 +57,51 @@ $NetBSD: patch-aa,v 1.5 2005/02/22 16:26:58 adam Exp $ MANDIR = $(ROOTDIR)/man/man1 # This is a BSD-style install -@@ -85,6 +86,7 @@ INSTALL_$(OS) = install -c - INSTALL_linux = install -c +@@ -87,6 +88,7 @@ INSTALL_linux = install -c + INSTALL_linux64 = $(INSTALL_linux) INSTALL_solaris = /usr/ucb/install -c INSTALL_freebsd = install -c +INSTALL_netbsd = install -c INSTALL_tru64 = installbsd -c INSTALL_irix = install -c INSTALL_hpux = install -c -@@ -145,6 +147,7 @@ DEFINES_win32 = -DFD_SETSIZE=512 - DEFINES_linux = -DHAVE_PTHREADS +@@ -148,12 +150,13 @@ DEFINES_linux = -DHAVE_PTHREADS + DEFINES_linux64 = $(DEFINES_linux) DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS DEFINES_freebsd = -DHAVE_PTHREADS -DBUGGY_FORK_WITH_THREADS +DEFINES_netbsd = DEFINES_tru64 = -D_REENTRANT -DHAVE_PTHREADS DEFINES_irix = -D_REENTRANT -DHAVE_PTHREADS -Dinline= DEFINES_hpux = -D_REENTRANT -DHAVE_PTHREADS -DDONT_HAVE_SELECT_H -Dinline= -@@ -163,6 +166,7 @@ OSLIBS_win32 = -lwsock32 -lwinmm - OSLIBS_linux = -lpthread + DEFINES_macosx = -D_REENTRANT -DHAVE_PTHREADS -DTHREAD_STACK_SIZE=49152 + DEFINES_bsdi = +-DEFINES = $(DEFINES_$(OS)) ++DEFINES = $(DEFINES_$(OS)) $(PTHREAD_CFLAGS) + + # Suffix for executables + +@@ -167,6 +170,7 @@ OSLIBS_linux = -lpthread + OSLIBS_linux64 = $(OSLIBS_linux) OSLIBS_solaris = -lsocket -lnsl -lthread OSLIBS_freebsd = +OSLIBS_netbsd = -lcrypto -lbz2 -lz OSLIBS_tru64 = -lpthread OSLIBS_irix = -lpthread OSLIBS_hpux = -lpthread -lnsl -@@ -182,7 +186,7 @@ SERVICEOBJ = $(SERVICEOBJ_$(OS)) +@@ -186,9 +190,10 @@ 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) +-LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) ++LDFLAGS= $(PTHREAD_LDFLAGS) ++LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) $(PTHREAD_LIBS) + + OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ) -@@ -192,17 +196,17 @@ ZBDFILES = server.zbd vncviewer.zbd vncs +@@ -196,17 +201,17 @@ ZBDFILES = server.zbd vncviewer.zbd vncs client1.key client2.key clients.id TXTFILES = README.txt LICENCE.txt GPL2.txt CHANGES.txt NOTICE.txt \ @@ -102,8 +113,8 @@ $NetBSD: patch-aa,v 1.5 2005/02/22 16:26:58 adam 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, 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 +- @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, linux64, 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, linux64, solaris, freebsd, netbsd, openbsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi zebedee$(EXE) : $(OBJS) - $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) @@ -111,7 +122,7 @@ $NetBSD: patch-aa,v 1.5 2005/02/22 16:26:58 adam Exp $ huge.o : huge.h -@@ -232,12 +236,12 @@ ftpgw.tcl.html : ftpgw.tcl.pod +@@ -236,12 +241,12 @@ ftpgw.tcl.html : ftpgw.tcl.pod install : precheck zebedee$(EXE) zebedee.1 ftpgw.tcl.1 $(ZBDFILES) $(TXTFILES) -mkdir -p $(BINDIR) $(MANDIR) $(ZBDDIR) diff --git a/security/zebedee/patches/patch-ab b/security/zebedee/patches/patch-ab index 66595c867bc..5594f10d442 100644 --- a/security/zebedee/patches/patch-ab +++ b/security/zebedee/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/06/24 05:48:51 taca Exp $ +$NetBSD: patch-ab,v 1.2 2005/09/18 13:51:09 taca Exp $ ---- zebedee.c.orig Sat Feb 10 05:47:55 2001 +--- zebedee.c.orig 2005-09-03 07:20:23.000000000 +0900 +++ zebedee.c -@@ -59,8 +59,8 @@ +@@ -59,8 +59,8 @@ typedef Huge *mpz_t; #define mpz_clear(z) huge_free(z) #endif |