Date: Mon, 22 May 2006 12:00:34 -0500 (CDT) From: Jim Pirzyk <pirzyk@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/97633: Update port: security/fwtk Message-ID: <200605221700.k4MH0Y4K024422@lilo.ci.uiuc.edu> Resent-Message-ID: <200605221710.k4MHAKYT060553@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97633
>Category: ports
>Synopsis: Update port: security/fwtk
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon May 22 17:10:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jim Pirzyk
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD lilo.ci.uiuc.edu 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue May 9 20:02:52 CDT 2006 supirzyk@lilo.ci.uiuc.edu:/services/scratch/usr/src/sys/VMWARE_KERNEL i386
>Description:
The current fwtk port will not build on FreeBSD => 5.x, this is
because of the S/Key library requirements. Moved the S/Key support
behind the WITH_SKEY knob and added a WITH_SNK knob as well. Now
the system will build on FreeBSD 6.1 systems if WITH_SKEY is NOT
set.
Also included a patch to covert varargs.h to stdarg.h, to build with
the newer version of gcc.
The patch that used to be contained in fwtk/files/patch-ak is now
needed to be wrapped in the WITH_SKEY knob, and has been put into
the Makefile itself. This means there needs to be a cvs delete of
that patch file.
>How-To-Repeat:
>Fix:
cvs delete fwtk/files/patch-ak
diff -Nru fwtk.orig/Makefile fwtk/Makefile
--- fwtk.orig/Makefile Sun May 21 17:40:25 2006
+++ fwtk/Makefile Mon May 22 11:28:43 2006
@@ -14,6 +14,11 @@
DISTFILES= fwtk2.1${EXTRACT_SUFX} fwtk-doc-only${EXTRACT_SUFX}
DIST_SUBDIR= fwtk
+OPTIONS= X11 "Build X11 programs" On \
+ JUMBO_PATCH "Build with the \"Jumbo\" patch kit" Off \
+ SKEY "Build this package with S/Key support" Off \
+ SNK "Buil this package with DigiPath SNK support" Off
+
.if defined(WITH_JUMBO_PATCH)
PATCHFILES= trg-jumbo-20001114.diff
PATCH_SITES= http://www.fwtk.org/fwtk/patches/
@@ -47,7 +52,9 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000
-IGNORE= does not build on 5.x and above, requires S/Key libraries and headers
+.if defined(WITH_SKEY)
+IGNORE= does not build on 5.x and above with WITH_SKEY set because it requires S/Key libraries and headers
+.endif
.endif
.if !exists(${DISTDIR}/${DIST_SUBDIR}/fwtk2.1${EXTRACT_SUFX}) \
@@ -55,12 +62,12 @@
IGNORE='Please read ftp://ftp.tislabs.com/pub/firewalls/toolkit/dist/README for details of how to obtain the FTWK source. Put the files fwtk2.1${EXTRACT_SUFX} and fwtk-doc-only${EXTRACT_SUFX} into the directory ${DISTDIR}/${DIST_SUBDIR} and run make again'
.endif
-pre-patch:
-.if !defined(WITH_JUMBO_PATCH)
- @${ECHO} "*****************************************************************************"
- @${ECHO} "**** To enable the \"Jumbo\" patch kit, run 'make -DWITH_JUMBO_PATCH'"
- @${ECHO} "**** For information about patches, read http://www.fwtk.org/fwtk/patches/"
- @${ECHO} "*****************************************************************************"
+post-patch:
+.if defined(WITH_SKEY)
+ @${REINPLACE_CMD} -e 's|^/\* #define AUTHPROTO_SKEY \*/|#define AUTHPROTO_SKEY|' ${WRKSRC}/auth.h
+.endif
+.if defined(WITH_SNK)
+ @${REINPLACE_CMD} -e 's|^/\* #define AUTHPROTO_SNK \*/|#define AUTHPROTO_SNK|' ${WRKSRC}/auth.h
.endif
pre-configure:
diff -Nru fwtk.orig/files/patch-aa fwtk/files/patch-aa
--- fwtk.orig/files/patch-aa Thu May 11 15:02:13 2006
+++ fwtk/files/patch-aa Sun May 21 18:01:14 2006
@@ -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 -Nru fwtk.orig/files/patch-ak fwtk/files/patch-ak
--- fwtk.orig/files/patch-ak Thu May 11 15:02:13 2006
+++ fwtk/files/patch-ak Wed Dec 31 18:00:00 1969
@@ -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 -Nru fwtk.orig/files/patch-al fwtk/files/patch-al
--- fwtk.orig/files/patch-al Thu May 11 15:02:13 2006
+++ fwtk/files/patch-al Mon May 22 11:38:36 2006
@@ -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 -Nru fwtk.orig/files/patch-bb fwtk/files/patch-bb
--- fwtk.orig/files/patch-bb Wed Dec 31 18:00:00 1969
+++ fwtk/files/patch-bb Sun May 21 22:11:13 2006
@@ -0,0 +1,11 @@
+--- http-gw/http-gw.h.orig Thu Feb 5 18:06:23 1998
++++ http-gw/http-gw.h Sun May 21 18:12:51 2006
+@@ -34,7 +34,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <string.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <syslog.h>
+
+
diff -Nru fwtk.orig/files/patch-bc fwtk/files/patch-bc
--- fwtk.orig/files/patch-bc Wed Dec 31 18:00:00 1969
+++ fwtk/files/patch-bc Sun May 21 22:11:31 2006
@@ -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)){
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605221700.k4MH0Y4K024422>