Merge remote-tracking branch 'origin/master' into next

diff --git a/config/rootfiles/oldcore/94/filelists/files b/config/rootfiles/oldcore/94/filelists/files
index e63a611fcd50b8630728b5ff9d9d8e3951cfafed..9ef227bb640aee6bcaf9259d4e0af8d7d856c951 100644 (file)
--- a/config/rootfiles/oldcore/94/filelists/files
+++ b/config/rootfiles/oldcore/94/filelists/files
@@ -22,5 +22,6 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/cgi-bin/wakeonlan.cgi
 srv/web/ipfire/cgi-bin/wireless.cgi
 var/ipfire/langs
+var/ipfire/menu.d/10-system.menu
 var/ipfire/menu.d/40-services.menu
 var/ipfire/network-functions.pl

diff --git a/config/rootfiles/oldcore/94/update.sh b/config/rootfiles/oldcore/94/update.sh
index a9c24a5f8344b712cbe35950cae6ea3bd90ab706..99aa04659c11526998f689c0322056ff55bf05e9 100644 (file)
--- a/config/rootfiles/oldcore/94/update.sh
+++ b/config/rootfiles/oldcore/94/update.sh
@@ -48,9 +48,10 @@ telinit u
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
        -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
 
 # Move away old and unsupported keys
 mv -f /etc/ssh/ssh_host_dsa_key{,.old}

diff --git a/lfs/openssh b/lfs/openssh
index 1178d6ff06fcf4f7bb0f3b5a7242d8d82e54aff0..0bba1ecd9c712ab21e88f93380ded9a6192c0360 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -91,9 +91,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
            -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
            -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+           -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
            /etc/ssh/sshd_config
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)