owsd: update to latest, modify initscript to pass listen label

Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
This commit is contained in:
Denis Osvald 2016-09-14 16:54:11 +02:00 committed by Sukru Senli
parent 9986a37299
commit 3419b149b8
2 changed files with 8 additions and 6 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=owsd
PKG_VERSION:=1.0.2
PKG_VERSION:=1.0.3
PKG_RELEASE:=1
PKG_SOURCE_PROTO=git
PKG_SOURCE_URL:=git@public.inteno.se:owsd.git
PKG_SOURCE_VERSION:=6dd142943bc68e0e4b1f4a002ce7f281c1678813
PKG_SOURCE_VERSION:=d0392c30b6903938da642825ab8faa037773dce3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>

View file

@ -80,10 +80,12 @@ parse_owsd_iface() {
new_listen_socket() {
procd_append_param command -p "${port}"
procd_append_param command -L"$1"
[ -n "${cert}" ] && procd_append_param command -c"${cert}"
[ -n "${key}" ] && procd_append_param command -k"${key}"
[ -n "$1" ] && procd_append_param command -i"$1"
[ -n "$2" ] && procd_append_param command -i"$2"
}
append_whitelists () {
@ -112,7 +114,7 @@ parse_owsd_iface() {
network_get_ipaddrs ip4addrs "${interface}";
fi
for addr in ${ip4addrs}; do
new_listen_socket "${addr}"
new_listen_socket "$1" "${addr}"
append_whitelists "$1"
done
@ -121,13 +123,13 @@ parse_owsd_iface() {
network_get_ipaddrs6 ip6addrs "${interface}"
fi
for addr in ${ip6addrs}; do
new_listen_socket "${addr}"
new_listen_socket "$1" "${addr}"
addr="\\[${addr}]"
append_whitelists "$1"
procd_append_param command -66
done
else
new_listen_socket
new_listen_socket "$1"
if [ "${ipv6}" -eq 1 ]; then procd_append_param command -6; fi
if [ "${ipv6}" -eq 1 -a "${ipv6only}" -eq 1 ]; then procd_append_param command -6; fi