ocserv: updated to 1.3.0

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>

diff --git a/net/ocserv/Config.in b/net/ocserv/Config.in
index 36533dfae1005ed8328c45aeb6e6cb60f11683a2..ff8a58a65bb1cf405b259fa53e03a0ea1c2e223c 100644 (file)
--- a/net/ocserv/Config.in
+++ b/net/ocserv/Config.in
@@ -24,8 +24,4 @@ config OCSERV_PROTOBUF
        bool "use external libprotobuf"
        default y
 
-config OCSERV_HTTP_PARSER
-       bool "use external libhttp-parser"
-       default y
-
 endmenu

diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 63f5921ac53f5ef94813f479caca5fbecd839361..520aaa19a05f9b3b30e91fe3e38f47054caad1f9 100644 (file)
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
-PKG_VERSION:=1.2.4
+PKG_VERSION:=1.3.0
 PKG_RELEASE:=1
 PKG_BUILD_FLAGS:=no-mips16
 
 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:=d30f29c5967715f7b118e89bba496011b2be2af0f49bb9e332f12be7fbf693d7
+PKG_SOURCE_URL:=https://www.infradead.org/ocserv/download/
+PKG_HASH:=5c562c3ea1032065ef43d6075e5722f94ce6a7a780d6a2b4c6d54c1ce3921965
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
@@ -39,7 +39,7 @@ define Package/ocserv
   TITLE:=OpenConnect VPN server
   URL:=http://www.infradead.org/ocserv/
   MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-  DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_HTTP_PARSER:libhttp-parser +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +OCSERV_LIBOATH:liboath +libev +kmod-tun
+  DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +OCSERV_LIBOATH:liboath +libev +kmod-tun
   USERID:=ocserv=72:ocserv=72
 endef
 
@@ -56,7 +56,8 @@ EXTRA_CPPFLAGS+=-I$(STAGING_DIR)/usr/include/readline/
 EXTRA_LDFLAGS+=-lncurses
 
 CONFIGURE_VARS += \
-       ac_cv_file__proc_self_exe=yes
+       ac_cv_file__proc_self_exe=yes \
+       ac_cv_prog_IPCALC=/bin/true
 
 CONFIGURE_ARGS+= \
        --with-pager="" \
@@ -85,10 +86,6 @@ ifneq ($(CONFIG_OCSERV_PROTOBUF),y)
 CONFIGURE_ARGS += --without-protobuf
 endif
 
-ifneq ($(CONFIG_OCSERV_HTTP_PARSER),y)
-CONFIGURE_ARGS += --without-http-parser
-endif
-
 ifndef CONFIG_OCSERV_LIBOATH
 CONFIGURE_ARGS += --without-liboath
 endif