package/vtun: bump version to 3.0.4

deleted file mode 100644
index cb2ac67aa2..0000000000
@@ -1,92 +0,0 @@
-configure.in: minimal syntax fixup for autoreconf
-
-This is the strictly minimal syntax fixups to make autoreconf happy...
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
----
-Note: configure.in is still full of incorrect syntax, but fixing it is
-a task for another day, and would have to be upstreamed. But upstream
-looks to be moribund at best, if not dead... :-(
-
-So, keep it for ourselves for now... Too bad, vtun is really helpfull.
-
---- vtun-3.0.3.orig/configure.in	2013-02-16 23:54:52.582451817 +0100
-+++ vtun-3.0.3/configure.in	2013-02-17 00:03:13.640887353 +0100
-@@ -110,10 +110,10 @@
- AC_SEARCH_LIBS(nanosleep, rt posix4)
- 
- dnl Check for setproctitle in libutil
--AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE(HAVE_SETPROC_TITLE) )
-+AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE([HAVE_SETPROC_TITLE],[],[Define to set title in /proc]) )
- 
- if test "$SHAPER" = "yes"; then
--   AC_DEFINE(HAVE_SHAPER)
-+   AC_DEFINE([HAVE_SHAPER],[],[Define to use shapper])
- fi
- 
- if test "$ZLIB" = "yes"; then
-@@ -121,7 +121,7 @@
-    AC_CHECKING( for ZLIB Library and Header files ... )
-    AC_CHECK_LIB(z, deflate,
- 	LIBS="$LIBS -lz"
--	AC_DEFINE(HAVE_ZLIB),
-+	AC_DEFINE([HAVE_ZLIB],[],[Define to use ZLIB]),
- 	AC_MSG_ERROR( Zlib library not found.)
-    )
- fi
-@@ -148,7 +148,7 @@
- 	    AC_CHECK_LIB($I, lzo1x_decompress,
- 	    [
- 	          LIBS="$LIBS -l"$I
--	       AC_DEFINE(HAVE_LZO)
-+	       AC_DEFINE([HAVE_LZO],[],[Define to use LZO])
- 	          havelzo=1
- 	      ]
- 	    )
-@@ -180,8 +180,8 @@
- 	AC_CHECK_LIB(crypto, BF_set_key,
- 	    [
- 	       LIBS="$LIBS -lcrypto"
--	       AC_DEFINE(HAVE_SSL)
--	       AC_DEFINE(HAVE_SSL_BLOWFISH)
-+	       AC_DEFINE([HAVE_SSL],[],[Define to use SSL])
-+	       AC_DEFINE([HAVE_SSL_BLOWFISH],[],[Define to use blowfish])
- 	    ],
- 	    AC_MSG_ERROR( SSL library not found. )
- 	),
-@@ -196,7 +196,7 @@
-     $SSL_HDR_DIR ,
- 	AC_CHECK_LIB(crypto, AES_set_encrypt_key,
- 	    [
--	       AC_DEFINE(HAVE_SSL_AES)
-+	       AC_DEFINE([HAVE_SSL_AES],[],[Define to use AES])
- 	    ],
- 	    AC_MSG_ERROR( AES library not found. )
- 	),
-@@ -211,7 +211,7 @@
-     $SSL_HDR_DIR ,
- 	AC_CHECK_LIB(crypto, EVP_EncryptInit,
- 	    [
--	       AC_DEFINE(HAVE_SSL_EVP)
-+	       AC_DEFINE([HAVE_SSL_EVP],[],Define to use EVP)
- 	    ],
- 	    AC_MSG_ERROR( EVP library not found. )
- 	),
-@@ -220,7 +220,7 @@
- fi
- 
- if test "$NATHACK" = "yes"; then
--   AC_DEFINE(ENABLE_NAT_HACK)
-+   AC_DEFINE([ENABLE_NAT_HACK],[],[Define to use NAT hack])
- fi
- 
- if test "$SOCKS" = "yes"; then
-@@ -274,6 +274,6 @@
- REL=`echo 'BRANCH-3_X' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'`
- changequote([,])
- 
--AC_DEFINE_UNQUOTED(VTUN_VER, "$REL `date '+%m/%d/%Y'`")
-+AC_DEFINE_UNQUOTED([VTUN_VER], ["$REL `date '+%m/%d/%Y'`"], [vtun version])
- 
- AC_OUTPUT(Makefile)

294 lines not on this page · raw message

index baa6381f70..363c980987 100644
@@ -1,2 +1,6 @@
+# From https://sourceforge.net/projects/vtun/files/vtun/3.0.4/
+md5 f952c5895ae8f40235aaad9a8f41a4bd  vtun-3.0.4.tar.gz
+sha1 2335c21b56fadf9ce851dd7f342fb0ed4f522c47  vtun-3.0.4.tar.gz
 # Locally computed:
-sha256  69dcbe4f8c5ce7d91b4150a6309e536d03b61841169746ca5788413ac7edb9cb  vtun-3.0.3.tar.gz
+sha256 abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9  vtun-3.0.4.tar.gz
+sha256 5692a9a69dc5abc1aa9cbc54899d114b65c4cefbd9d7fcecc304316a2f26ced3  README.OpenSSL

index 9c46559fb8..86d452c0c2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VTUN_VERSION = 3.0.3
+VTUN_VERSION = 3.0.4
 VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
 VTUN_LICENSE = GPL-2.0+ with OpenSSL exception
 VTUN_LICENSE_FILES = README.OpenSSL