From 7cadde87554d120c9a284b9aa2fbe83a60f2fc5a Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Date: Mon, 21 Sep 2020 21:33:49 +0200
Subject: [PATCH] ocserv: updated to 1.1.1

---
 net/ocserv/Makefile                   |  7 +++++--
 net/ocserv/files/ocserv.conf.template | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 20d6dd3b8..3adefb489 100644
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.1.1
 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_HASH:=59d9ef7a1aeb95ff6e762e2a0f231b3fae2ea420f68a1cf09d39a26395040f4b
+PKG_HASH:=9c7aaf46e53e28cfa7be329b18f3951e7e851153ff6a27e946496fd4e8e5765a
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
@@ -55,6 +55,9 @@ endef
 EXTRA_CPPFLAGS+=-I$(STAGING_DIR)/usr/include/readline/
 EXTRA_LDFLAGS+=-lncurses
 
+CONFIGURE_VARS += \
+	ac_cv_file__proc_self_exe=yes
+
 CONFIGURE_ARGS+= \
 	--with-pager="" \
 	--with-libreadline-prefix="$(STAGING_DIR)/" \
diff --git a/net/ocserv/files/ocserv.conf.template b/net/ocserv/files/ocserv.conf.template
index 7b3ad33ec..b42f2e0a9 100644
--- a/net/ocserv/files/ocserv.conf.template
+++ b/net/ocserv/files/ocserv.conf.template
@@ -22,9 +22,12 @@
 # to generate password entries.
 auth = "|AUTH|"
 
-# A banner to be displayed on clients
+# A banner to be displayed on clients after connection
 banner = "Welcome to OpenWRT"
 
+# A banner to be displayed on clients before connection
+#pre-login-banner = "Welcome"
+
 #isolate-workers = true
 
 # When the server has a dynamic DNS address (that may change),
@@ -40,8 +43,10 @@ listen-host-is-dyndns = |DYNDNS|
 #max-clients = 1024
 max-clients = |MAX_CLIENTS|
 
-# Limit the number of client connections to one every X milliseconds 
-# (X is the provided value). Set to zero for no limit.
+# Rate limit the number of incoming connections to one every X milliseconds
+# (X is the provided value), as the secmod backlog grows. This
+# makes the server more resilient (and prevents connection failures) on
+# multiple concurrent connections. Set to zero for no limit.
 rate-limit-ms = 100
 
 # Limit the number of identical clients (i.e., users connecting