Date: Mon, 22 May 2006 18:12:17 -0300 From: Renato Botelho <garga@FreeBSD.org> To: Jim Pirzyk <pirzyk@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/97633: Update port: security/fwtk Message-ID: <20060522211217.GA84536@galle.com.br> In-Reply-To: <D0BA118F-3147-4903-947D-F010F1FED180@FreeBSD.org> References: <200605221726.k4MHQv07061678@freefall.freebsd.org> <20060522193506.GA78268@galle.com.br> <D0BA118F-3147-4903-947D-F010F1FED180@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, May 22, 2006 at 03:03:38PM -0500, Jim Pirzyk wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > > On May 22, 2006, at 2:35 PM, Renato Botelho wrote: > > >I made a lot of changes to try to fix this port on >= 5.x, but it > >still have > >problems, like you can see here: > > > >http://srvmix.galle.com.br/tb/errors/5-STABLE/fwtk-2.1_1.log > >http://srvmix.galle.com.br/tb/errors/6-STABLE/fwtk-2.1_1.log > > > >Following is my patch, please, run a checkout on fwtk, apply my > >patch, and > >make your changes after that, when it's ok, send me a new patch. > > You did not send me the patch.... Sorry, here it is: ------------------------------------------------------ Index: Makefile =================================================================== RCS file: /home/pcvs/ports/security/fwtk/Makefile,v retrieving revision 1.31 diff -u -r1.31 Makefile --- Makefile 7 Sep 2005 13:55:19 -0000 1.31 +++ Makefile 22 May 2006 19:26:14 -0000 @@ -1,4 +1,3 @@ -# ex:ts=8 # Ports collection makefile for: fwtk # Date created: 15th June 1996 # Whom: gpalmer @@ -8,22 +7,22 @@ PORTNAME= fwtk PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= security DISTNAME= ${PORTNAME}${PORTVERSION} EXTRACT_SUFX= .tar.Z DISTFILES= fwtk2.1${EXTRACT_SUFX} fwtk-doc-only${EXTRACT_SUFX} DIST_SUBDIR= fwtk -.if defined(WITH_JUMBO_PATCH) -PATCHFILES= trg-jumbo-20001114.diff -PATCH_SITES= http://www.fwtk.org/fwtk/patches/ -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= ports@FreeBSD.org COMMENT= A toolkit used for building firewalls based on proxy services -RESTRICTED= "No form of redistribution is allowed" +RESTRICTED= No form of redistribution is allowed + +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 WRKSRC= ${WRKDIR}/fwtk HAS_CONFIGURE= YES @@ -32,22 +31,31 @@ MAN3= auth.3 MAN5= netperm-table.5 MAN8= authmgr.8 authsrv.8 ftp-gw.8 http-gw.8 login-sh.8 netacl.8 \ - plug-gw.8 rlogin-gw.8 smap.8 smapd.8 tn-gw.8 + plug-gw.8 rlogin-gw.8 smap.8 smapd.8 tn-gw.8 x-gw.8 DOCS= sample-report.txt manpages.ps admin_guide.ps user_guide.ps \ overview.ps presentation.ps SBIN_BINS= authdump authload authmgr LIBEXEC_BINS= authsrv ftp-gw http-gw netacl plug-gw rlogin-gw smap smapd \ - tn-gw + tn-gw x-gw + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500000 +.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 !defined(WITHOUT_X11) -LIBEXEC_BINS+= x-gw MAN8+= x-gw.8 +LIBEXEC_BINS+= x-gw +USE_XLIB= yes .endif -.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_JUMBO_PATCH) +PATCHFILES= trg-jumbo-20001114.diff +PATCH_SITES= http://www.fwtk.org/fwtk/patches/ +PATCH_DIST_STRIP= -p1 .endif .if !exists(${DISTDIR}/${DIST_SUBDIR}/fwtk2.1${EXTRACT_SUFX}) \ @@ -55,12 +63,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: @@ -74,7 +82,7 @@ ${WRKSRC}/firewall.h.in > ${WRKSRC}/firewall.h post-install: - cd ${PREFIX}/libexec ; strip ${SBIN_BINS} ${LIBEXEC_BINS} + cd ${PREFIX}/libexec ; ${STRIP_CMD} ${SBIN_BINS} ${LIBEXEC_BINS} cd ${PREFIX}/libexec ; ${MV} ${SBIN_BINS} mqueue ../sbin ${INSTALL_DATA} ${WRKSRC}/config/netperm-table \ ${PREFIX}/etc/netperm-table.sample Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/security/fwtk/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 31 Mar 2002 01:00:39 -0000 1.7 +++ pkg-plist 22 May 2006 19:26:14 -0000 @@ -14,11 +14,11 @@ sbin/authload sbin/authmgr sbin/mqueue -%%PORTDOCS%%share/doc/fwtk/LICENSE -%%PORTDOCS%%share/doc/fwtk/admin_guide.ps -%%PORTDOCS%%share/doc/fwtk/manpages.ps -%%PORTDOCS%%share/doc/fwtk/overview.ps -%%PORTDOCS%%share/doc/fwtk/presentation.ps -%%PORTDOCS%%share/doc/fwtk/sample-report.txt -%%PORTDOCS%%share/doc/fwtk/user_guide.ps -%%PORTDOCS%%@dirrm share/doc/fwtk +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/admin_guide.ps +%%PORTDOCS%%%%DOCSDIR%%/manpages.ps +%%PORTDOCS%%%%DOCSDIR%%/overview.ps +%%PORTDOCS%%%%DOCSDIR%%/presentation.ps +%%PORTDOCS%%%%DOCSDIR%%/sample-report.txt +%%PORTDOCS%%%%DOCSDIR%%/user_guide.ps +%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-aa =================================================================== RCS file: /home/pcvs/ports/security/fwtk/files/patch-aa,v retrieving revision 1.4 diff -u -r1.4 patch-aa --- files/patch-aa 10 Oct 1998 09:50:36 -0000 1.4 +++ files/patch-aa 22 May 2006 19:26:14 -0000 @@ -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 Index: files/patch-ak =================================================================== RCS file: files/patch-ak diff -N files/patch-ak --- files/patch-ak 18 Apr 1998 08:57:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 */ Index: files/patch-al =================================================================== RCS file: /home/pcvs/ports/security/fwtk/files/patch-al,v retrieving revision 1.1 diff -u -r1.1 patch-al --- files/patch-al 18 Apr 1998 08:57:36 -0000 1.1 +++ files/patch-al 22 May 2006 19:26:14 -0000 @@ -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 + Index: files/patch-http-gw_error.c =================================================================== RCS file: files/patch-http-gw_error.c diff -N files/patch-http-gw_error.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-http-gw_error.c 22 May 2006 19:26:14 -0000 @@ -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)){ Index: files/patch-http-gw_http-gw.h =================================================================== RCS file: files/patch-http-gw_http-gw.h diff -N files/patch-http-gw_http-gw.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-http-gw_http-gw.h 22 May 2006 19:26:14 -0000 @@ -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> + + ------------------------------------------------------ -- Renato Botelho <garga @ FreeBSD.org> <freebsd @ galle.com.br> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc Eat, drink, and be merry, for tomorrow you may work.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060522211217.GA84536>