Date: Tue, 2 Aug 2005 20:50:59 +0200 (CEST) From: Daniel Roethlisberger <daniel@roe.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Christian Lackas <delta@lackas.net>, Daniel Roethlisberger <daniel@roe.ch> Subject: ports/84491: [PATCH] security/vpnc - unbreak vpnc-disconnect and cleanups Message-ID: <200508021850.j72IoxY9027185@marvin.roe> Resent-Message-ID: <200508021930.j72JU67f069919@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84491 >Category: ports >Synopsis: [PATCH] security/vpnc - unbreak vpnc-disconnect and cleanups >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: Tue Aug 02 19:30:06 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 5.4-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD marvin.roe 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #3: Sat Jul 30 19:53:45 CEST 2005 root@marvin.roe:/usr/obj/usr/src/sys/IBMTPX40 i386 >Description: Removed file: pkg-plist Changes: - Unbreak vpnc-disconnect by fixing the config.c patch - Remove obsolete vpnc-wrapper leftovers to make portlint happy - Use PLIST_FILES and PORTDOCS instead of pkg-plist - Bump PORTREVISION >How-To-Repeat: >Fix: --- vpnc-0.3.3_1-0.3.3_2.diff begins here --- diff -ruN vpnc.orig/Makefile vpnc/Makefile --- vpnc.orig/Makefile Fri May 27 20:21:51 2005 +++ vpnc/Makefile Tue Aug 2 20:27:46 2005 @@ -7,22 +7,26 @@ PORTNAME= vpnc PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= delta@lackas.net COMMENT= Client for Cisco 3000 VPN Concentrator LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt -STARTSCRIPT= vpnc-wrapper-1.25 USE_GMAKE= yes USE_REINPLACE= yes ALL_TARGET= vpnc +PLIST_FILES= sbin/vpnc \ + sbin/vpnc-script \ + sbin/vpnc-disconnect \ + etc/vpnc.conf.sample \ + etc/rc.d/vpnc.sh.sample + +PORTDOCS= README ChangeLog TODO MAN8= vpnc.8 .include <bsd.port.pre.mk> @@ -48,9 +52,7 @@ .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif post-install: diff -ruN vpnc.orig/files/patch-config.c vpnc/files/patch-config.c --- vpnc.orig/files/patch-config.c Fri May 27 20:21:51 2005 +++ vpnc/files/patch-config.c Tue Aug 2 20:18:59 2005 @@ -1,6 +1,6 @@ ---- config.c.bak Sun May 15 15:06:20 2005 -+++ config.c Sun May 15 15:06:52 2005 -@@ -125,7 +125,7 @@ +--- config.c.orig Sun May 1 22:06:36 2005 ++++ config.c Tue Aug 2 20:18:29 2005 +@@ -125,12 +125,12 @@ static const char *config_def_script(void) { @@ -9,6 +9,12 @@ } static const char *config_def_pid_file(void) + { +- return "/var/run/vpnc/pid"; ++ return "/var/run/vpnc.pid"; + } + + static const struct config_names_s { @@ -520,8 +520,8 @@ } diff -ruN vpnc.orig/pkg-plist vpnc/pkg-plist --- vpnc.orig/pkg-plist Fri May 27 20:21:51 2005 +++ vpnc/pkg-plist Thu Jan 1 01:00:00 1970 @@ -1,9 +0,0 @@ -sbin/vpnc -sbin/vpnc-script -sbin/vpnc-disconnect -etc/vpnc.conf.sample -etc/rc.d/vpnc.sh.sample -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- vpnc-0.3.3_1-0.3.3_2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508021850.j72IoxY9027185>