diff options
Diffstat (limited to 'security/fwtk/files')
| -rw-r--r-- | security/fwtk/files/patch-aa | 18 | ||||
| -rw-r--r-- | security/fwtk/files/patch-ak | 11 | ||||
| -rw-r--r-- | security/fwtk/files/patch-al | 46 | ||||
| -rw-r--r-- | security/fwtk/files/patch-http-gw_error.c | 24 |
4 files changed, 79 insertions, 20 deletions
diff --git a/security/fwtk/files/patch-aa b/security/fwtk/files/patch-aa index 912068e8421f..a4d04246abde 100644 --- a/security/fwtk/files/patch-aa +++ b/security/fwtk/files/patch-aa @@ -1,11 +1,13 @@ ---- Makefile.config.orig Tue Mar 4 20:17:46 1997 -+++ Makefile.config Sat Apr 18 00:51:14 1998 -@@ -24,13 +24,13 @@ +--- Makefile.config.orig Tue Mar 4 22:17:46 1997 ++++ Makefile.config Sun May 21 18:01:05 2006 +@@ -24,13 +24,15 @@ # Defines for your operating system # -DEFINES= ++.if defined(WITH_SKEY) +DEFINES= -D_SKEY_INTERNAL ++.endif #DEFINES=-DSYSV -DSOLARIS # Options for your compiler (eg, "-g" for debugging, "-O" for @@ -16,7 +18,7 @@ #COPT= -O $(DEFINES) # Version of "make" you want to use -@@ -44,16 +44,16 @@ +@@ -44,16 +46,20 @@ # Destination directory for installation of binaries @@ -32,11 +34,15 @@ # Names of any auxiliary libraries your system may require (e.g., -lsocket) # If you want to link against a resolver library, specify it here. -AUXLIB= ++.if defined(WITH_SKEY) +AUXLIB= -lcrypt -lskey -lmd ++.else ++AUXLIB= -lcrypt -lmd ++.endif #AUXLIB= -lsocket #AUXLIB= -lresolv # For Solaris: -@@ -72,23 +72,23 @@ +@@ -72,23 +78,23 @@ # or -Bstatic for static binaries under SunOS 4.1.x) #LDFL= -Bstatic #LDFL= @@ -64,7 +70,7 @@ #XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 # for Linux: #XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 -lc -@@ -98,8 +98,8 @@ +@@ -98,8 +104,8 @@ #XLIBS = -L$(XLIBDIR) -lXaw -lXmu -lXt -lXext -lX11 # Location of X include files diff --git a/security/fwtk/files/patch-ak b/security/fwtk/files/patch-ak deleted file mode 100644 index 5b3e40ef4f45..000000000000 --- a/security/fwtk/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- auth.h.orig Fri Nov 4 15:31:26 1994 -+++ auth.h Sat Apr 18 00:37:48 1998 -@@ -69,7 +69,7 @@ - #define AUTHPROTO_PASSWORD - - /* define this if you want to use bellcore's S/Key */ --/* #define AUTHPROTO_SKEY */ -+#define AUTHPROTO_SKEY - - /* define this if you want to use Security Dynamics' SecurID */ - /* #define AUTHPROTO_SECURID */ diff --git a/security/fwtk/files/patch-al b/security/fwtk/files/patch-al index a441370d79ea..62bde4e877ea 100644 --- a/security/fwtk/files/patch-al +++ b/security/fwtk/files/patch-al @@ -1,11 +1,51 @@ ---- auth/Makefile.orig Fri Apr 5 09:49:21 1996 -+++ auth/Makefile Sat Apr 18 00:38:57 1998 -@@ -20,7 +20,7 @@ +--- auth/Makefile.orig Fri Apr 5 11:49:21 1996 ++++ auth/Makefile Sun May 21 22:42:13 2006 +@@ -12,7 +12,7 @@ + # RcsId: "$Header: /usr/home/rick/fwtk2.0/fwtk/auth/RCS/Makefile,v 1.1 1996/03/27 03:29:55 rick Exp rick $" + + +-include ../Makefile.config ++.include "../Makefile.config" + + + #if you are using the SKEY modules, define SKEYDIR to be the source +@@ -20,7 +20,9 @@ #SKEYDIR=../../skey #SKEYINC= -I$(SKEYDIR) #SKEYLIB= $(SKEYDIR)/libskey.a -#SKEYOBJ= skey.o ++.if defined(WITH_SKEY) +SKEYOBJ= skey.o ++.endif #if you are using the SecurID module, define SECURDIR to be the source +@@ -41,20 +43,24 @@ + + #if you are using the Digital Pathways SNK module, include this: + #this also requires DES routines below +-#SNKOBJ= snk.o ++.if defined(WITH_SNK) ++SNKOBJ= snk.o ++.endif + + + #if you are using link-level encryption code, this should be the path + #to a library that contains DES routines (NOT SUPPLIED!) + #you will need to replace srvio.c and cliio.c +-#DESLIB= ../../libdes/libdes.a +-#DESINC= -I../../libdes ++.if defined(WITH_SNK) ++DESLIB= -lcrypto ++DESINC= -I/usr/include/openssl ++.endif + + + #security protocol modules + MODULES= $(SKEYLIB) $(SECURLIB) $(DESLIB) + +-CFLAGS= -I.. $(COPT) ++CFLAGS+= -I.. $(COPT) + LIB= ../libauth.a + FWLIB= ../libfwall.a + diff --git a/security/fwtk/files/patch-http-gw_error.c b/security/fwtk/files/patch-http-gw_error.c new file mode 100644 index 000000000000..8aefffd65421 --- /dev/null +++ b/security/fwtk/files/patch-http-gw_error.c @@ -0,0 +1,24 @@ +--- http-gw/error.c.orig Tue Jan 13 20:21:28 1998 ++++ http-gw/error.c Sun May 21 22:09:19 2006 +@@ -174,11 +174,7 @@ + return 0; + } + +-int go_error(sockfd, errorno, msg, va_alist) +-int sockfd; +-int errorno; +-char *msg; +-va_dcl ++int go_error(int sockfd, int errorno, char *msg, ...) + { static int last_errno = 0; + va_list marker; + +@@ -192,7 +188,7 @@ + } + } + if( msg != NULL){ +- va_start(marker); ++ va_start(marker, msg); + vsprintf(errbuf, msg, marker); + va_end(marker); + if( (rem_type & (TYPE_HTTP|TYPE_DIR)) == (TYPE_DIR)){ |