tinc: fetch ed25519 public keys from uci

Fetch Ed25519 public keys from UCI host sections.
Update options and syntax to current version.

Signed-off-by: Vladislav Grigoryev <redacted>

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 4f7018c5b26025aa6e6bce8558f51a8a3c67dcc4..3cfccd816205580ef8f2378e6d942ee46b6ba95d 100644 (file)
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
 PKG_VERSION:=1.1pre18
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://tinc-vpn.org/packages

diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
index 8823b97e74b604d1da325dfb4898f8375ce4075b..86c267472313d6a0f95157fff316c04f2d2270c8 100644 (file)
--- a/net/tinc/files/tinc.init
+++ b/net/tinc/files/tinc.init
@@ -91,11 +91,16 @@ prepare_host() {
        HOST_CONF_FILE="$TMP_TINC/$n/hosts/$s"
        MANDATORY_PARAM_IN_UCI=0
        [ ! -f "/etc/tinc/$n/hosts/$s" ] && {
-               config_get pk "$s" "PublicKey"
+               config_get pk_i "$s" "PublicKey"
+               config_get pk_f "$s" "PublicKeyFile"
+               config_get pked_i "$s" "Ed25519PublicKey"
+               config_get pked_f "$s" "Ed25519PublicKeyFile"
                config_get na "$s" "Name"
-               if [ -n "$pk" -a -n "$na" ] ; then
-                       HOST_CONF_FILE="$TMP_TINC/$n/hosts/$na"
-                       MANDATORY_PARAM_IN_UCI=1
+               if [ -n "$na" ] ; then
+                       HOST_CONF_FILE="$TMP_TINC/$n/hosts/$na"
+               fi
+               if [ -n "$pk_i$pk_f$pked_i$pked_f" ] ; then
+                       MANDATORY_PARAM_IN_UCI=1
                fi
        }
 
@@ -107,7 +112,7 @@ prepare_host() {
 
        [ ! -f "/etc/tinc/$n/hosts/$s" ] && {
                if [ "$MANDATORY_PARAM_IN_UCI" -eq 1 ] ; then
-                       touch "$HOST_CONF_FILE" ;
+                       touch "$HOST_CONF_FILE"
                else
                        echo -n "tinc: Warning, public key for $s for network $n "
                        echo -n "missing in /etc/tinc/$n/hosts/$s, "
@@ -118,12 +123,25 @@ prepare_host() {
 
        # append flags
        append_conf_bools "$s" "$HOST_CONF_FILE" \
-               ClampMSS IndirectData PMTUDiscovery TCPOnly
+               ClampMSS \
+               IndirectData \
+               PMTUDiscovery \
+               TCPOnly
 
        # append params
        append_conf_params "$s" "$HOST_CONF_FILE" \
-               Address Cipher Compression Digest Ed25519PublicKey MACLength Name PMTU \
-               Port PublicKey PublicKeyFile Subnet
+               Address \
+               Cipher \
+               Compression \
+               Digest \
+               Ed25519PublicKey \
+               Ed25519PublicKeyFile \
+               MACLength \
+               PMTU \
+               Port \
+               PublicKey \
+               PublicKeyFile \
+               Subnet
 }
 
 check_gen_own_key() {
@@ -139,9 +157,9 @@ check_gen_own_key() {
 
        config_get k "$s" key_size
        if [ -z "$k" ]; then
-               $BIN -c "$TMP_TINC/$s" --generate-keys </dev/null
+               $BIN -c "$TMP_TINC/$s" generate-keys </dev/null
        else
-               $BIN -c "$TMP_TINC/$s" "--generate-keys=$k" </dev/null
+               $BIN -c "$TMP_TINC/$s" generate-keys "$k" </dev/null
        fi
 
        [ ! -d "/etc/tinc/$s/hosts" ] && mkdir -p "/etc/tinc/$s/hosts"
@@ -187,7 +205,6 @@ prepare_net() {
                Device \
                DeviceType \
                Ed25519PrivateKeyFile \
-               ECDSAPublicKey \
                Forwarding \
                Interface \
                ListenAddress \