diff options
Diffstat (limited to 'security/zebedee/patches/patch-aa')
| -rw-r--r-- | security/zebedee/patches/patch-aa | 49 |
1 files changed, 29 insertions, 20 deletions
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 |