From 8dd2a6edf2e32a2b9fb4c3df10380525fcf620ee Mon Sep 17 00:00:00 2001 From: Thlv Alivs Date: Sat, 20 May 2023 12:21:57 +0800 Subject: [PATCH] ocserv: add otp config option and also fix build error: Package ocserv is missing dependencies for the following libraries: liboath.so.0 Signed-off-by: Thlv Alivs --- net/ocserv/Config.in | 4 ++++ net/ocserv/Makefile | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net/ocserv/Config.in b/net/ocserv/Config.in index cf86bef172..36533dfae1 100644 --- a/net/ocserv/Config.in +++ b/net/ocserv/Config.in @@ -16,6 +16,10 @@ config OCSERV_RADIUS bool "enable radius authentication" default n +config OCSERV_LIBOATH + bool "enable OTP" + default n + config OCSERV_PROTOBUF bool "use external libprotobuf" default y diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index 7db36a6e1e..0bbe4f3b2b 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ocserv PKG_VERSION:=1.1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_FLAGS:=no-mips16 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -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 +libev +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 +OCSERV_LIBOATH:liboath +libev +kmod-tun USERID:=ocserv=72:ocserv=72 endef @@ -89,6 +89,10 @@ ifneq ($(CONFIG_OCSERV_HTTP_PARSER),y) CONFIGURE_ARGS += --without-http-parser endif +ifndef CONFIG_OCSERV_LIBOATH +CONFIGURE_ARGS += --without-liboath +endif + define Package/ocserv/conffiles /etc/config/ocserv endef