From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 16 Nov 2016 17:42:42 +0000 (+0100)
Subject: ocserv: updated to 0.11.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=022d8a4dc284b72b19c2056ede2dc6e29141d533;p=feed%2Fpackages.git

ocserv: updated to 0.11.6

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 4906f9a83b..0b6a84aaed 100644
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
-PKG_VERSION:=0.11.5
+PKG_VERSION:=0.11.6
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/ocserv/
-PKG_MD5SUM:=fbda999ce0b528d001bb46b3db6f5d49
+PKG_MD5SUM:=0e4f82d267d27f2f9d3fcba58ac6cf5a
 
 PKG_LICENSE:=GPLv2+
 PKG_LICENSE_FILES:=COPYING
diff --git a/net/ocserv/files/ocserv.conf.template b/net/ocserv/files/ocserv.conf.template
index 41dec99faa..a46c21c63c 100644
--- a/net/ocserv/files/ocserv.conf.template
+++ b/net/ocserv/files/ocserv.conf.template
@@ -61,7 +61,15 @@ dpd = |DPD|
 # be much higher to prevent such clients being awaken too 
 # often by the DPD messages, and save battery.
 # (clients that send the X-AnyConnect-Identifier-DeviceType)
-#mobile-dpd = 1800
+mobile-dpd = 1800
+
+# If using DTLS, and no UDP traffic is received for this
+# many seconds, attempt to send future traffic over the TCP
+# connection instead, in an attempt to wake up the client
+# in the case that there is a NAT and the UDP translation
+# was deleted. If this is unset, do not attempt to use this
+# recovery mechanism.
+switch-to-tcp-timeout = 25
 
 # MTU discovery (DPD must be enabled)
 try-mtu-discovery = false
diff --git a/net/ocserv/patches/001-makefile-fix.patch b/net/ocserv/patches/001-makefile-fix.patch
new file mode 100644
index 0000000000..0d482829af
--- /dev/null
+++ b/net/ocserv/patches/001-makefile-fix.patch
@@ -0,0 +1,47 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5943a50..4b2c77c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -23,18 +23,7 @@ noinst_LIBRARIES = libcmd-ocserv.a libipc.a
+ libcmd_ocserv_a_SOURCES = ocserv-args.def ocserv-args.c ocserv-args.h
+ 
+ ocserv-args.c: $(srcdir)/ocserv-args.def $(builddir)/version.inc
+-	if test "$(AUTOGEN)" = ":";then \
+-		rm -f $(builddir)/ocserv-args.c; \
+-		rm -f $(builddir)/ocserv-args.h; \
+-		cp $(srcdir)/autogen/ocserv-args.c $(builddir)/; \
+-		cp $(srcdir)/autogen/ocserv-args.h $(builddir)/; \
+-	else \
+-		$(AUTOGEN) $<; \
+-		if test -d $(srcdir)/autogen;then \
+-			cp $(builddir)/ocserv-args.c $(srcdir)/autogen; \
+-			cp $(builddir)/ocserv-args.h $(srcdir)/autogen; \
+-		fi; \
+-	fi
++	$(AUTOGEN) $<
+ ocserv-args.h: ocserv-args.c
+ 
+ # Authentication module sources
+diff --git a/src/ocpasswd/Makefile.am b/src/ocpasswd/Makefile.am
+index 97e2491..6304607 100644
+--- a/src/ocpasswd/Makefile.am
++++ b/src/ocpasswd/Makefile.am
+@@ -21,17 +21,6 @@ ocpasswd_LDADD += $(LIBGNUTLS_LIBS) $(LIBCRYPT) $(CODE_COVERAGE_LDFLAGS) \
+ 	$(LIBNETTLE_LIBS)
+ 
+ args.c: $(srcdir)/args.def $(builddir)/../version.inc
+-	if test "$(AUTOGEN)" = ":";then \
+-		rm -f $(builddir)/args.c; \
+-		rm -f $(builddir)/args.h; \
+-		cp $(srcdir)/../autogen/ocpasswd-args.c $(builddir)/args.c; \
+-		cp $(srcdir)/../autogen/ocpasswd-args.h $(builddir)/args.h; \
+-	else \
+-		$(AUTOGEN) $<; \
+-		if test -d $(srcdir)/autogen;then \
+-			cp $(builddir)/args.c $(srcdir)/../autogen/ocpasswd-args.c; \
+-			cp $(builddir)/args.h $(srcdir)/../autogen/ocpasswd-args.h; \
+-		fi; \
+-	fi
++	$(AUTOGEN) $<
+ args.h: args.c
+