From 62c95a10a8afb50277cd3d1edd45d256087229ca Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 28 Nov 2015 22:23:44 +0100 Subject: [PATCH] ocserv: updated to 0.10.10 Signed-off-by: Nikos Mavrogiannopoulos --- net/ocserv/Makefile | 9 +++++---- net/ocserv/files/ocserv.conf.template | 9 +++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index 4024e9bad..8a90a3627 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ocserv -PKG_VERSION:=0.10.9 -PKG_RELEASE:=4 +PKG_VERSION:=0.10.10 +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:=74834c59aa96beaa222c21ee6521adb2 +PKG_MD5SUM:=99c75719e02937deb03263f80d29ac1b PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:=COPYING @@ -39,7 +39,7 @@ define Package/ocserv TITLE:=OpenConnect VPN server URL:=http://www.infradead.org/ocserv/ MAINTAINER:=Nikos Mavrogiannopoulos - DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_HTTP_PARSER:libhttp-parser +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +kmod-tun + DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_HTTP_PARSER:libhttp-parser +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +kmod-tun +ip USERID:=ocserv=72:ocserv=72 endef @@ -56,6 +56,7 @@ EXTRA_CPPFLAGS+=-I$(STAGING_DIR)/usr/include/readline/ EXTRA_LDFLAGS+=-lncurses CONFIGURE_ARGS+= \ + --with-pager="" \ --enable-local-libopts \ --with-libreadline-prefix="$(STAGING_DIR)/" \ --without-libnl \ diff --git a/net/ocserv/files/ocserv.conf.template b/net/ocserv/files/ocserv.conf.template index d3a8860aa..69b295e06 100644 --- a/net/ocserv/files/ocserv.conf.template +++ b/net/ocserv/files/ocserv.conf.template @@ -343,8 +343,11 @@ config-per-group = /etc/ocserv/config-per-group/ # The following example is from linux systems. %{R} should be something # like 192.168.2.0/24 -route-add-cmd = "/sbin/route add -net %{R} dev %{D}" -route-del-cmd = "/sbin/route del -net %{R} dev %{D}" +route-add-cmd = "/usr/sbin/ip route add %{R} dev %{D}" +route-del-cmd = "/usr/sbin/ip route delete %{R} dev %{D}" + +#route-add-cmd = "/sbin/route add -net %{RI} dev %{D}" +#route-del-cmd = "/sbin/route del -net %{RI} dev %{D}" # This option allows to forward a proxy. The special strings '%{U}' # and '%{G}', if present will be replaced by the username and group name. @@ -376,3 +379,5 @@ cisco-client-compat = |CISCO_COMPAT| # Option to allow sending arbitrary custom headers to the client after # authentication and prior to VPN tunnel establishment. #custom-header = "X-My-Header: hi there" + +expose-iroutes = true