diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/vtun/Makefile | 5 | ||||
| -rw-r--r-- | net/vtun/distinfo | 11 | ||||
| -rw-r--r-- | net/vtun/patches/patch-aa | 14 | ||||
| -rw-r--r-- | net/vtun/patches/patch-vtun.h | 14 |
4 files changed, 28 insertions, 16 deletions
diff --git a/net/vtun/Makefile b/net/vtun/Makefile index c4edfc73924..44610398e2d 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2014/02/12 23:18:27 tron Exp $ +# $NetBSD: Makefile,v 1.50 2014/04/20 21:03:24 adam Exp $ -DISTNAME= vtun-3.0.2 -PKGREVISION= 2 +DISTNAME= vtun-3.0.3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vtun/} diff --git a/net/vtun/distinfo b/net/vtun/distinfo index e01db62c109..69b4c10a22e 100644 --- a/net/vtun/distinfo +++ b/net/vtun/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.11 2011/03/18 10:39:07 adam Exp $ +$NetBSD: distinfo,v 1.12 2014/04/20 21:03:24 adam Exp $ -SHA1 (vtun-3.0.2.tar.gz) = 6e2da196c70475e5d3750903b2dad032a7b1e8ac -RMD160 (vtun-3.0.2.tar.gz) = 6592251871f7e6b9a7e12b7e07ab0a700d816f57 -Size (vtun-3.0.2.tar.gz) = 125777 bytes -SHA1 (patch-aa) = eb5326966d76ae0ad36e3f3b85380e59875a121e +SHA1 (vtun-3.0.3.tar.gz) = 7937e46420b5c2323f36774ab22e75e11c12da6c +RMD160 (vtun-3.0.3.tar.gz) = 4df179b523798930927103a4d91b428f941e25ed +Size (vtun-3.0.3.tar.gz) = 130051 bytes +SHA1 (patch-aa) = 2f570c4599923edeef31c6a2e7153f1fe05887c9 SHA1 (patch-ab) = 0af65f6b6d061d8beb8b2ac6a676ca095c057ccf SHA1 (patch-ac) = 0f39700ab729d9481fe29e2d7e53566eff6add96 +SHA1 (patch-vtun.h) = 832d3b97094885c8a10e752c7c8f5c86e08de967 diff --git a/net/vtun/patches/patch-aa b/net/vtun/patches/patch-aa index d4d51dbcb95..502df54d407 100644 --- a/net/vtun/patches/patch-aa +++ b/net/vtun/patches/patch-aa @@ -1,24 +1,22 @@ -$NetBSD: patch-aa,v 1.5 2011/03/18 10:39:08 adam Exp $ +$NetBSD: patch-aa,v 1.6 2014/04/20 21:03:25 adam Exp $ ---- Makefile.in.orig 2008-01-07 22:35:55.000000000 +0000 +--- Makefile.in.orig 2012-07-09 04:55:38.000000000 +0000 +++ Makefile.in -@@ -19,6 +19,6 @@ +@@ -19,5 +19,5 @@ # CC = @CC@ -CFLAGS = @CFLAGS@ @CPPFLAGS@ --LDFLAGS = @LIBS@ +CFLAGS = @CFLAGS@ @CPPFLAGS@ ${DEFS} -+LDFLAGS = @LDFLAGS@ @LIBS@ + LDFLAGS = @LDFLAGS@ @LIBS@ - YACC = @YACC@ -@@ -42,5 +42,5 @@ PID_FILE = ${VAR_DIR}/run/vtund.pid +@@ -43,5 +43,5 @@ PID_FILE = ${VAR_DIR}/run/vtund.pid CFG_FILE = ${ETC_DIR}/vtund.conf STAT_DIR = ${VAR_DIR}/log/vtund -LOCK_DIR = ${VAR_DIR}/lock/vtund +LOCK_DIR = ${VAR_DIR}/run/vtund DEFS = -DVTUN_CONFIG_FILE=\"$(CFG_FILE)\" -DVTUN_PID_FILE=\"$(PID_FILE)\" \ -@@ -55,7 +55,4 @@ OBJS = main.o cfg_file.tab.o cfg_file.le +@@ -56,7 +56,4 @@ OBJS = main.o cfg_file.tab.o cfg_file.le CONFIGURE_FILES = Makefile config.status config.cache config.h config.log -%.o: %.c vtun.h lib.h diff --git a/net/vtun/patches/patch-vtun.h b/net/vtun/patches/patch-vtun.h new file mode 100644 index 00000000000..0ddf631632e --- /dev/null +++ b/net/vtun/patches/patch-vtun.h @@ -0,0 +1,14 @@ +$NetBSD: patch-vtun.h,v 1.1 2014/04/20 21:03:25 adam Exp $ + +Fix for C99 standard. + +--- vtun.h.orig 2014-04-20 20:52:19.000000000 +0000 ++++ vtun.h +@@ -231,6 +231,6 @@ void client(struct vtun_host *host); + int tunnel(struct vtun_host *host); + int read_config(char *file); + struct vtun_host * find_host(char *host); +-inline void clear_nat_hack_flags(int svr); ++void clear_nat_hack_flags(int svr); + + #endif |