From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 30 15:50:19 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98E7D16A4CE for ; Sat, 30 Oct 2004 15:50:19 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5886443D1D for ; Sat, 30 Oct 2004 15:50:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9UFoJv3056577 for ; Sat, 30 Oct 2004 15:50:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9UFoJJh056574; Sat, 30 Oct 2004 15:50:19 GMT (envelope-from gnats) Resent-Date: Sat, 30 Oct 2004 15:50:19 GMT Resent-Message-Id: <200410301550.i9UFoJJh056574@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yen-Ming Lee Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B11A616A4CE; Sat, 30 Oct 2004 15:42:22 +0000 (GMT) Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52]) by mx1.FreeBSD.org (Postfix) with ESMTP id E77B743D1F; Sat, 30 Oct 2004 15:42:21 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from localhost (localhost [127.0.0.1]) by utopia.leeym.com (Postfix) with ESMTP id EA6453E9F74; Sat, 30 Oct 2004 23:42:20 +0800 (CST) Received: from utopia.leeym.com ([127.0.0.1]) by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 94005-04; Sat, 30 Oct 2004 23:42:16 +0800 (CST) Received: by utopia.leeym.com (Postfix, from userid 1000) id 923F53EA06A; Sat, 30 Oct 2004 16:29:12 +0800 (CST) Message-Id: <20041030082912.923F53EA06A@utopia.leeym.com> Date: Sat, 30 Oct 2004 16:29:12 +0800 (CST) From: Yen-Ming Lee To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: anders@FreeBSD.org Subject: ports/73317: [PATCH] security/vpnd: cosmetic fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Oct 2004 15:50:19 -0000 >Number: 73317 >Category: ports >Synopsis: [PATCH] security/vpnd: cosmetic fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 30 15:50:18 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 5.3-STABLE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD utopia.leeym.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Oct 25 01:17:22 CST 2004 >Description: - replace FILESDIR/patch-* with REINPLACE_CMD ... - replace pkg-plist with PORTDOCS and PLIST_FILES - add USE_RC_SUBR support - rndcontrol retired on 5.x already, so only show messages on 4.x Added file(s): - files/vpnd.sh Removed file(s): - pkg-plist - files/patch-Makefile.FreeBSD.in - files/patch-README - files/patch-globals.c - files/patch-vpnd.c - files/patch-vpnd.conf - files/patch-vpnd.h Port maintainer (anders@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- vpnd-1.1.0.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/security/vpnd/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile 7 Mar 2003 06:10:51 -0000 1.7 +++ Makefile 30 Oct 2004 08:24:42 -0000 @@ -17,33 +17,38 @@ WRKSRC= ${WRKDIR}/${PORTNAME} HAS_CONFIGURE= yes USE_REINPLACE= yes +USE_RC_SUBR= yes -DOCFILES= README FAQ.TXT SPEED.TXT VERSIONS +PLIST_FILES= sbin/vpnd etc/rc.d/vpnd.sh etc/vpnd.conf.sample etc/vpnd.chat.sample +PORTDOCS= README FAQ.TXT SPEED.TXT VERSIONS post-patch: - @${MV} ${WRKSRC}/Makefile.FreeBSD.in ${WRKSRC}/Makefile.FreeBSD.in_tmp - @${SED} -e "s:^ETC_DIR=:ETC_DIR= ${PREFIX}/etc:" \ - < ${WRKSRC}/Makefile.FreeBSD.in_tmp > ${WRKSRC}/Makefile.FreeBSD.in - -pre-configure: - ${REINPLACE_CMD} -e "s@-O3@${CFLAGS}@g; s@gcc@${CC}@g" \ - ${WRKSRC}/configure +.for f in README globals.c vpnd.c vpnd.conf + @${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,g' ${WRKSRC}/${f} +.endfor + @${REINPLACE_CMD} -e "s,machine/param.h,sys/param.h,g" ${WRKSRC}/vpnd.h + @${REINPLACE_CMD} -e "s@-O3@${CFLAGS}@g; s@gcc@${CC}@g" ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: @${INSTALL_PROGRAM} ${WRKSRC}/vpnd ${PREFIX}/sbin/vpnd + @${INSTALL_SCRIPT} ${FILESDIR}/vpnd.sh ${PREFIX}/etc/rc.d/vpnd.sh @${INSTALL_DATA} ${WRKSRC}/vpnd.conf ${PREFIX}/etc/vpnd.conf.sample @${INSTALL_DATA} ${WRKSRC}/vpnd.chat ${PREFIX}/etc/vpnd.chat.sample .if !defined(NOPORTDOCS) @${INSTALL} -d -m 0755 ${DOCSDIR} -.for i in ${DOCFILES} +.for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif +.include + post-install: +.if ${OSVERSION} < 500000 @${ECHO} "================================================================================" @${ECHO} "Make sure you set up a few IRQ's for random generation with rndcontrol before" @${ECHO} "trying to generate a master key file." @${ECHO} "================================================================================" +.endif -.include +.include Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- pkg-plist 24 Dec 2001 02:16:51 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ -sbin/vpnd -etc/vpnd.conf.sample -etc/vpnd.chat.sample -%%PORTDOCS%%share/doc/vpnd/README -%%PORTDOCS%%share/doc/vpnd/FAQ.TXT -%%PORTDOCS%%share/doc/vpnd/SPEED.TXT -%%PORTDOCS%%share/doc/vpnd/VERSIONS -%%PORTDOCS%%@dirrm share/doc/vpnd Index: files/patch-Makefile.FreeBSD.in =================================================================== RCS file: files/patch-Makefile.FreeBSD.in diff -N files/patch-Makefile.FreeBSD.in --- files/patch-Makefile.FreeBSD.in 31 Mar 2001 02:17:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- Makefile.FreeBSD.in.orig Fri Nov 19 17:50:24 1999 -+++ Makefile.FreeBSD.in Sun Mar 25 01:39:56 2001 -@@ -5,7 +5,9 @@ - CRYPTOFLG= - .endif - --CFLAGS=-c $(CBASE) $(DEBUG) $(CRYPTOFLG) -DMD5_HMAC_FAST -DSHA1_HMAC_FAST -DRMD160_HMAC_FAST -+ETC_DIR= -+ -+CFLAGS=-c $(CBASE) $(DEBUG) $(CRYPTOFLG) -DMD5_HMAC_FAST -DSHA1_HMAC_FAST -DRMD160_HMAC_FAST -DETC_DIR=\"$(ETC_DIR)\" - - OBJS1=vpnd.o globals.o parse.o slip.o route.o chatter.o serial.o die.o \ - signal.o tcp.o external.o syslog.o sequencer.o icmp.o rxtx.o crypto.o \ Index: files/patch-README =================================================================== RCS file: files/patch-README diff -N files/patch-README --- files/patch-README 31 Mar 2001 02:17:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- README.old Sun Mar 25 03:05:42 2001 -+++ README Sun Mar 25 03:06:04 2001 -@@ -370,8 +370,8 @@ - ======== - - Copy vpnd (and randomd if it is required) to any directory you like. --Copy vpnd.conf and vpnd.chat to /etc or copy those files to any other --directory when you use the -f option of vpnd (see later). Note that -+Copy vpnd.conf and vpnd.chat to /usr/local/etc or copy those files to any -+other directory when you use the -f option of vpnd (see later). Note that - vpnd.conf and vpnd.chat must be at least mode 644 and be owned by - root:root. Index: files/patch-globals.c =================================================================== RCS file: files/patch-globals.c diff -N files/patch-globals.c --- files/patch-globals.c 31 Mar 2001 02:17:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- globals.c.old Sun Mar 25 01:19:51 2001 -+++ globals.c Sun Mar 25 01:20:58 2001 -@@ -69,9 +69,9 @@ - anchor->pty=anchor->tty=anchor->peer=anchor->server=anchor->ping= - anchor->serial=anchor->lock=-1; - anchor->speed=B115200; -- anchor->conffile="/etc/vpnd.conf"; -+ anchor->conffile=ETC_DIR "/vpnd.conf"; - anchor->randomdev="/dev/random"; -- anchor->keyfile="/etc/vpnd.key"; -+ anchor->keyfile=ETC_DIR "/vpnd.key"; - anchor->lkeyfile="vpnd.lcl.key"; - anchor->rkeyfile="vpnd.rmt.key"; - anchor->cipher=BLOWFISH; Index: files/patch-vpnd.c =================================================================== RCS file: files/patch-vpnd.c diff -N files/patch-vpnd.c --- files/patch-vpnd.c 31 Mar 2001 02:17:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ ---- vpnd.c.old Sun Mar 25 01:58:06 2001 -+++ vpnd.c Sun Mar 25 03:02:26 2001 -@@ -41,7 +41,8 @@ - " vpnd -c \n" \ - USAGE1 \ - " -h prints this info\n" \ -- " -m creates master key file (default is /etc/vpnd.key),\n" \ -+ " -m creates master key file (default is " ETC_DIR \ -+ "/vpnd.key),\n" \ - " note that the file must not yet exist\n" \ - " -x creates extended master key files named vpnd.lcl.key\n" \ - " and vpnd.rmt.key in the given directory,\n" \ -@@ -65,7 +66,7 @@ - " -l allow dns lookups so host names can be used\n" \ - " -n do not become daemon\n" \ - " -t do modem init chat test\n" \ -- " -f use configfile instead of /etc/vpnd.conf\n" \ -+ " -f use configfile instead of " ETC_DIR "/vpnd.conf\n" \ - COMPRESSINFO - - /* Index: files/patch-vpnd.conf =================================================================== RCS file: files/patch-vpnd.conf diff -N files/patch-vpnd.conf --- files/patch-vpnd.conf 31 Mar 2001 02:17:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,56 +0,0 @@ ---- vpnd.conf.old Sun Mar 25 03:04:06 2001 -+++ vpnd.conf Sun Mar 25 03:04:43 2001 -@@ -121,7 +121,7 @@ - # which is called asynchonously when the vpn - # link is established - # --# example: linkup /etc/vpnd.linkup -+# example: linkup /usr/local/etc/vpnd.linkup - # - # linkdown - # -@@ -129,7 +129,7 @@ - # which is called asynchonously when the vpn - # link is terminated - # --# example: linkdown /etc/vpnd.linkdown -+# example: linkdown /usr/local/etc/vpnd.linkdown - # - # --------------------------------------------------- - # basic operation mode -@@ -170,7 +170,7 @@ - # - # optional, defines the pathname of the shared secret file which - # must be created with the -m option of vpnd, if not given default --# of /etc/vpnd.key is used -+# of /usr/local/etc/vpnd.key is used - # - # example: keyfile /var/adm/mysecret.key - # -@@ -285,7 +285,7 @@ - # interface is established, the SLIP interface - # name is the parameter for the process - # --# example: slipup /etc/vpnd.slipup -+# example: slipup /usr/local/etc/vpnd.slipup - # - # slipdown - # -@@ -294,7 +294,7 @@ - # link is terminated, the SLIP interface - # name is the parameter for the process - # --# example: slipdown /etc/vpnd.slipdown -+# example: slipdown /usr/local/etc/vpnd.slipdown - # - # - # --------------------------------------------------- -@@ -334,7 +334,7 @@ - # optional, pathname of file containing modem initialization - # chat sequence, default is not to perform init chat - # --# example: modemchat /etc/vpnd.chat -+# example: modemchat /usr/local/etc/vpnd.chat - # - # --------------------------------------------------- - # TCP/IP parameters (available with version 1.0.2) Index: files/patch-vpnd.h =================================================================== RCS file: files/patch-vpnd.h diff -N files/patch-vpnd.h --- files/patch-vpnd.h 20 Oct 2002 21:36:06 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- vpnd.h.orig Sun Oct 20 14:36:45 2002 -+++ vpnd.h Sun Oct 20 14:37:04 2002 -@@ -52,7 +52,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include Index: files/vpnd.sh =================================================================== RCS file: files/vpnd.sh diff -N files/vpnd.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/vpnd.sh 30 Oct 2004 08:24:42 -0000 @@ -0,0 +1,24 @@ +#!/bin/sh +# +# PROVIDE: vpnd +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: FreeBSD shutdown +# +# Note: +# Set "vpnd_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or +# /etc/rc.conf.d/vpnd to make this script actually do something. +# +# Please see rc.conf(5) and rc(8) for further details. +# + +vpnd_enable=${vpnd_enable:-"NO"} + +. /etc/rc.subr + +name=vpnd +command=/usr/local/sbin/vpnd +rcvar=`set_rcvar` +load_rc_config ${name} + +run_rc_command "$1" --- vpnd-1.1.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: