openssh: Remove deprecated configuration options

This was used for SSH version 1 which is not supported
any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
index 84e0ddf142b240ceea09129bd03315f7608dafa7..2011d4d9d874f01d494f185a000ac0c0783d5758 100644 (file)
--- a/config/rootfiles/core/110/update.sh
+++ b/config/rootfiles/core/110/update.sh
@@ -44,6 +44,9 @@ ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Remove deprecated options
+sed -e "/^RSAAuthentication/d" -i /etc/ssh/sshd_config
+
 # Start services
 /etc/init.d/unbound start
 /etc/init.d/sshd restart

diff --git a/lfs/openssh b/lfs/openssh
index 005e4dffafb5b71a3a500e749913988d47bc375f..56ac55a9602480eb0b19d8fa364315c29344d45f 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        sed -i -e 's/^#\?Port .*$$/Port 222/' \
            -e 's/^#\?Protocol .*$$/Protocol 2/' \
            -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-           -e 's/^#\?RSAAuthentication .*$$/RSAAuthentication yes/' \
            -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
            -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
            -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \