ocserv: use a more neutral character for sed

This resolves a startup issue.

Resolves: #24203

Signed-off-by: Nikos Mavrogiannopoulos <redacted>

diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 520aaa19a05f9b3b30e91fe3e38f47054caad1f9..cd09dde14a91d675624f554db05e182211d2f0c4 100644 (file)
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
 PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_BUILD_FLAGS:=no-mips16
 
 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

diff --git a/net/ocserv/files/ocserv.init b/net/ocserv/files/ocserv.init
index 2cd16c08480094035033ea9d67a8dd59447fbe39..63b0b4f179db9421082501a334a3b65e42a1aa52 100755 (executable)
--- a/net/ocserv/files/ocserv.init
+++ b/net/ocserv/files/ocserv.init
@@ -84,25 +84,25 @@ setup_config() {
        [ -n "$hostname" ] && dyndns="true"
 
        mkdir -p /var/etc
-       sed -e "s#|PORT|#$port#g" \
-           -e "s#|UDP_PORT|#$udp_port#g" \
-           -e "s#|MAX_CLIENTS|#$max_clients#g" \
-           -e "s#|MAX_SAME|#$max_same#g" \
-           -e "s#|DPD|#$dpd#g" \
-           -e "s#|AUTH|#$auth$authsuffix#g" \
-           -e "s#|DYNDNS|#$dyndns#g" \
-           -e "s#|PREDICTABLE_IPS|#$predictable_ips#g" \
-           -e "s#|DEFAULT_DOMAIN|#$default_domain#g" \
-           -e "s#|ENABLE_DEFAULT_DOMAIN|#$enable_default_domain#g" \
-           -e "s#|ENABLE_SPLIT_DNS|#$enable_split_dns#g" \
-           -e "s#|CISCO_COMPAT|#$cisco_compat#g" \
-           -e "s#|PING_LEASES|#$ping_leases#g" \
-           -e "s#|UDP|#$enable_udp#g" \
-           -e "s#|COMPRESSION|#$enable_compression#g" \
-           -e "s#|IPV4ADDR|#$ipaddr#g" \
-           -e "s#|NETMASK|#$netmask#g" \
-           -e "s#|IPV6ADDR|#$ip6addr#g" \
-           -e "s#|ENABLE_IPV6|#$enable_ipv6#g" \
+       sed -e "s~|PORT|~$port~g" \
+           -e "s~|UDP_PORT|~$udp_port~g" \
+           -e "s~|MAX_CLIENTS|~$max_clients~g" \
+           -e "s~|MAX_SAME|~$max_same~g" \
+           -e "s~|DPD|~$dpd~g" \
+           -e "s~|AUTH|~$auth$authsuffix~g" \
+           -e "s~|DYNDNS|~$dyndns~g" \
+           -e "s~|PREDICTABLE_IPS|~$predictable_ips~g" \
+           -e "s~|DEFAULT_DOMAIN|~$default_domain~g" \
+           -e "s~|ENABLE_DEFAULT_DOMAIN|~$enable_default_domain~g" \
+           -e "s~|ENABLE_SPLIT_DNS|~$enable_split_dns~g" \
+           -e "s~|CISCO_COMPAT|~$cisco_compat~g" \
+           -e "s~|PING_LEASES|~$ping_leases~g" \
+           -e "s~|UDP|~$enable_udp~g" \
+           -e "s~|COMPRESSION|~$enable_compression~g" \
+           -e "s~|IPV4ADDR|~$ipaddr~g" \
+           -e "s~|NETMASK|~$netmask~g" \
+           -e "s~|IPV6ADDR|~$ip6addr~g" \
+           -e "s~|ENABLE_IPV6|~$enable_ipv6~g" \
            /etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf
 
        test -f /etc/ocserv/ocserv.conf.local && cat /etc/ocserv/ocserv.conf.local >> /var/etc/ocserv.conf
@@ -210,7 +210,7 @@ start_service() {
        config_foreach setup_users ocservusers
 
        procd_open_instance
-       procd_set_param command /usr/sbin/ocserv -f -c /var/etc/ocserv.conf
+       procd_set_param command /usr/sbin/ocserv -s -f -c /var/etc/ocserv.conf
        procd_set_param respawn
        procd_close_instance
 }