Date: Thu, 14 Nov 2019 13:52:05 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517565 - in head/net/vtun: . files Message-ID: <201911141352.xAEDq5wN057893@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Nov 14 13:52:05 2019 New Revision: 517565 URL: https://svnweb.freebsd.org/changeset/ports/517565 Log: Make fetchable again. The distfile was rerolled years ago. The difference between the old and the new distfiles are a lot of CVS ids in comments, and the config.in.h being regenerated with a newer version of autoheader. (Which we do not care about here because we use autoreconf anyway.) While there, also put up a copy in MASTER_SITE_LOCAL. - Remove expiration, I'll fix it up as best as I can if it breaks. - General cleanup of the Makefile - Fix of a manpage symlink (reason for PORTREVISION bump) - Document what the patches are for. (and regen when needed.) Modified: head/net/vtun/Makefile (contents, props changed) head/net/vtun/distinfo (contents, props changed) head/net/vtun/files/patch-Makefile.in (contents, props changed) head/net/vtun/files/patch-freebsd__tun_dev.c (contents, props changed) head/net/vtun/files/patch-main.c (contents, props changed) head/net/vtun/files/patch-vtund.8 (contents, props changed) Modified: head/net/vtun/Makefile ============================================================================== --- head/net/vtun/Makefile Thu Nov 14 13:35:48 2019 (r517564) +++ head/net/vtun/Makefile Thu Nov 14 13:52:05 2019 (r517565) @@ -3,33 +3,30 @@ PORTNAME= vtun PORTVERSION= 3.0.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net -MASTER_SITES= SF +MASTER_SITES= SF LOCAL/mat/vtun MAINTAINER= mat@FreeBSD.org COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping -BROKEN= unfetchable - LICENSE= GPLv2 -DEPRECATED= No longer supported by upline -EXPIRATION_DATE= 2021-09-30 - LIB_DEPENDS= liblzo2.so:archivers/lzo2 -CFLAGS+= -ansi -Wno-pointer-sign USES= autoreconf localbase ssl +USE_RC_SUBR= vtunclient vtund GNU_CONFIGURE= yes + CONFIGURE_ARGS= --localstatedir=/var \ --with-ssl-headers=${OPENSSLINC} \ --with-ssl-lib=${OPENSSLLIB} \ --with-lzo-headers=${LOCALBASE}/include/lzo \ --with-lzo-lib=${LOCALBASE}/lib CONFIGURE_ENV= YACC=${YACC} -USE_RC_SUBR= vtunclient vtund +CFLAGS+= -ansi -Wno-pointer-sign + ALL_TARGET= vtund DOCS= ChangeLog Credits FAQ README README.LZO README.Setup \ @@ -48,13 +45,12 @@ post-patch: ${WRKSRC}/configure post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund - @${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.sample - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund + ${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor - @cd ${STAGEDIR}${PREFIX}/man/man1/ && \ - ${LN} -s vtund.8 ../man1/vtun.1 + ${RLN} ${STAGEDIR}${PREFIX}/man/man8/vtund.8 ${STAGEDIR}${PREFIX}/man/man1/vtun.1 .include <bsd.port.mk> Modified: head/net/vtun/distinfo ============================================================================== --- head/net/vtun/distinfo Thu Nov 14 13:35:48 2019 (r517564) +++ head/net/vtun/distinfo Thu Nov 14 13:52:05 2019 (r517565) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474289088 -SHA256 (vtun-3.0.4.tar.gz) = 79d9ccfec98bb13b19523c483f2192e6db7d0c24af8382506f80cc335c643085 -SIZE (vtun-3.0.4.tar.gz) = 130877 +TIMESTAMP = 1573738292 +SHA256 (vtun-3.0.4.tar.gz) = abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9 +SIZE (vtun-3.0.4.tar.gz) = 132691 Modified: head/net/vtun/files/patch-Makefile.in ============================================================================== --- head/net/vtun/files/patch-Makefile.in Thu Nov 14 13:35:48 2019 (r517564) +++ head/net/vtun/files/patch-Makefile.in Thu Nov 14 13:52:05 2019 (r517565) @@ -1,6 +1,8 @@ ---- Makefile.in.orig 2012-07-08 21:55:38.000000000 -0700 -+++ Makefile.in 2014-06-09 23:06:38.000000000 -0700 -@@ -28,7 +28,7 @@ +Cleanup install procedure. + +--- Makefile.in.orig 2016-10-01 21:46:00 UTC ++++ Makefile.in +@@ -28,7 +28,7 @@ LEX = @LEX@ LEXFLAGS = -t INSTALL = @INSTALL@ @@ -9,7 +11,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ OBJS = main.o cfg_file.tab.o cfg_file.lex.o server.o c CONFIGURE_FILES = Makefile config.status config.cache config.h config.log @@ -18,7 +20,7 @@ $(CC) $(CFLAGS) $(DEFS) -c $< vtund: $(OBJS) -@@ -80,25 +80,25 @@ +@@ -80,25 +80,25 @@ distclean: clean rm -f `cat vtun.drivers` install_man: Modified: head/net/vtun/files/patch-freebsd__tun_dev.c ============================================================================== --- head/net/vtun/files/patch-freebsd__tun_dev.c Thu Nov 14 13:35:48 2019 (r517564) +++ head/net/vtun/files/patch-freebsd__tun_dev.c Thu Nov 14 13:52:05 2019 (r517565) @@ -1,5 +1,7 @@ ---- freebsd/tun_dev.c.orig 2008-01-07 14:36:10.000000000 -0800 -+++ freebsd/tun_dev.c 2016-09-19 20:06:49.919502000 -0700 +Part of extended mode being an argument and not a compile time decision. + +--- freebsd/tun_dev.c.orig 2016-10-01 21:46:01 UTC ++++ freebsd/tun_dev.c @@ -35,6 +35,8 @@ #include "vtun.h" #include "lib.h" @@ -9,7 +11,7 @@ /* * Allocate TUN device, returns opened fd. * Stores dev name in the first arg(must be large enough). -@@ -58,10 +60,8 @@ +@@ -58,10 +60,8 @@ int tun_open(char *dev) } } if( fd > -1 ){ Modified: head/net/vtun/files/patch-main.c ============================================================================== --- head/net/vtun/files/patch-main.c Thu Nov 14 13:35:48 2019 (r517564) +++ head/net/vtun/files/patch-main.c Thu Nov 14 13:52:05 2019 (r517565) @@ -1,3 +1,6 @@ +Part of extended mode being an argument and not a compile time decision. +Some bits about using vfork, or not, and pidfile as an argument. + --- main.c.orig 2013-07-07 20:31:22 UTC +++ main.c @@ -39,9 +39,9 @@ Modified: head/net/vtun/files/patch-vtund.8 ============================================================================== --- head/net/vtun/files/patch-vtund.8 Thu Nov 14 13:35:48 2019 (r517564) +++ head/net/vtun/files/patch-vtund.8 Thu Nov 14 13:52:05 2019 (r517565) @@ -1,6 +1,9 @@ ---- vtund.8.orig 2016-09-17 13:01:21.000000000 -0700 -+++ vtund.8 2016-09-19 20:38:04.531515000 -0700 -@@ -48,6 +48,12 @@ +Part of extended mode being an argument and not a compile time decision. +Some bits about using vfork, or not, and pidfile as an argument. + +--- vtund.8.orig 2016-09-17 20:01:21 UTC ++++ vtund.8 +@@ -48,6 +48,12 @@ vtund \- VTun(Virtual Tunnel) daemon. [ .I -n ] @@ -13,10 +16,11 @@ < .I session > -@@ -116,6 +122,14 @@ +@@ -115,6 +121,14 @@ Connect + .I timeout Default is 30 seconds. This options is equivalent to the 'timeout' option of config file. - .TP ++.TP +.I -e +Use vtun-v6 extended mode. +.TP @@ -24,7 +28,6 @@ +Connect +.I z pid_file +The full pathname of the file containing the PID of the daemon in server mode. -+.TP + .TP .I session Session name from the config file. - .TP
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911141352.xAEDq5wN057893>