ocserv: updated to 0.8.9
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
parent
32da468cde
commit
93119a4573
3 changed files with 15 additions and 4 deletions
|
@ -8,15 +8,15 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=ocserv
|
PKG_NAME:=ocserv
|
||||||
PKG_VERSION:=0.8.4
|
PKG_VERSION:=0.8.9
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL :=ftp://ftp.infradead.org/pub/ocserv/
|
PKG_SOURCE_URL :=ftp://ftp.infradead.org/pub/ocserv/
|
||||||
PKG_MD5SUM:=3eb452fddebda887eaa5f6412dab634c
|
PKG_MD5SUM:=cd935cc89bffac75c825e66ef71f6a73
|
||||||
|
|
||||||
PKG_LICENSE:=GPLv3
|
PKG_LICENSE:=GPLv2
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
PKG_FIXUP:=autoreconf
|
PKG_FIXUP:=autoreconf
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ EXTRA_LDFLAGS+=-lncurses
|
||||||
CONFIGURE_ARGS+= \
|
CONFIGURE_ARGS+= \
|
||||||
--enable-local-libopts \
|
--enable-local-libopts \
|
||||||
--with-libreadline-prefix="$(STAGING_DIR)/" \
|
--with-libreadline-prefix="$(STAGING_DIR)/" \
|
||||||
|
--without-http-parser \
|
||||||
--without-libnl \
|
--without-libnl \
|
||||||
|
|
||||||
ifneq ($(CONFIG_OCSERV_PAM),y)
|
ifneq ($(CONFIG_OCSERV_PAM),y)
|
||||||
|
|
|
@ -18,6 +18,11 @@ auth = "|AUTH|"
|
||||||
# A banner to be displayed on clients
|
# A banner to be displayed on clients
|
||||||
banner = "Welcome to OpenWRT"
|
banner = "Welcome to OpenWRT"
|
||||||
|
|
||||||
|
# When the server has a dynamic DNS address (that may change),
|
||||||
|
# should set that to true to ask the client to resolve again on
|
||||||
|
# reconnects.
|
||||||
|
listen-host-is-dyndns = |DYNDNS|
|
||||||
|
|
||||||
# Use listen-host to limit to specific IPs or to the IPs of a provided
|
# Use listen-host to limit to specific IPs or to the IPs of a provided
|
||||||
# hostname.
|
# hostname.
|
||||||
#listen-host = [IP|HOSTNAME]
|
#listen-host = [IP|HOSTNAME]
|
||||||
|
|
|
@ -30,12 +30,17 @@ setup_config() {
|
||||||
|
|
||||||
test $auth = "plain" && authsuffix="\[/var/etc/ocpasswd\]"
|
test $auth = "plain" && authsuffix="\[/var/etc/ocpasswd\]"
|
||||||
|
|
||||||
|
dyndns="false"
|
||||||
|
hostname=`uci show ddns|grep domain|head -1|cut -d '=' -f 2`
|
||||||
|
[ -n "$hostname" ] && dyndns="true"
|
||||||
|
|
||||||
mkdir -p /var/etc
|
mkdir -p /var/etc
|
||||||
sed -e "s/|PORT|/$port/g" \
|
sed -e "s/|PORT|/$port/g" \
|
||||||
-e "s/|MAX_CLIENTS|/$max_clients/g" \
|
-e "s/|MAX_CLIENTS|/$max_clients/g" \
|
||||||
-e "s/|MAX_SAME|/$max_same/g" \
|
-e "s/|MAX_SAME|/$max_same/g" \
|
||||||
-e "s/|DPD|/$dpd/g" \
|
-e "s/|DPD|/$dpd/g" \
|
||||||
-e "s#|AUTH|#$auth$authsuffix#g" \
|
-e "s#|AUTH|#$auth$authsuffix#g" \
|
||||||
|
-e "s#|DYNDNS|#$dyndns#g" \
|
||||||
-e "s/|PREDICTABLE_IPS|/$predictable_ips/g" \
|
-e "s/|PREDICTABLE_IPS|/$predictable_ips/g" \
|
||||||
-e "s/|CISCO_COMPAT|/$cisco_compat/g" \
|
-e "s/|CISCO_COMPAT|/$cisco_compat/g" \
|
||||||
-e "s/|UDP|/$udp/g" \
|
-e "s/|UDP|/$udp/g" \
|
||||||
|
@ -89,7 +94,7 @@ start() {
|
||||||
user_exists ocserv 72 || user_add ocserv 72 72 /var/lib/ocserv
|
user_exists ocserv 72 || user_add ocserv 72 72 /var/lib/ocserv
|
||||||
group_exists ocserv 72 || group_add ocserv 72
|
group_exists ocserv 72 || group_add ocserv 72
|
||||||
|
|
||||||
hostname=`uci get ddns.myddns.domain`
|
hostname=`uci show ddns|grep domain|head -1|cut -d '=' -f 2`
|
||||||
[ -z "$hostname" ] && hostname=`uci get system.@system[0].hostname`
|
[ -z "$hostname" ] && hostname=`uci get system.@system[0].hostname`
|
||||||
|
|
||||||
[ ! -f /etc/ocserv/ca-key.pem ] && [ -x /usr/bin/certtool ] && {
|
[ ! -f /etc/ocserv/ca-key.pem ] && [ -x /usr/bin/certtool ] && {
|
||||||
|
|
Loading…
Reference in a new issue