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

diff --git a/config/rootfiles/oldcore/94/update.sh b/config/rootfiles/oldcore/94/update.sh
index 6560662e3205d8c36f65e1f2af335519a5c999ce..a9c24a5f8344b712cbe35950cae6ea3bd90ab706 100644 (file)
--- a/config/rootfiles/oldcore/94/update.sh
+++ b/config/rootfiles/oldcore/94/update.sh
@@ -47,7 +47,10 @@ telinit u
 
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
-       -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/'
+       -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|' \
 
 # Move away old and unsupported keys
 mv -f /etc/ssh/ssh_host_dsa_key{,.old}
@@ -70,6 +73,17 @@ EOF
 
 fcrontab -z &>/dev/null
 
+# DMA - reconfigure Postfix if exists
+if [ -e /etc/postfix/main.cf ] && [ ! -e "/usr/sbin/sendmail.postfix" ]; then
+       mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
+       /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 15
+       sed -i 's/usr\/sbin\/sendmail/usr/sbin/sendmail.postfix/' /opt/pakfire/db/rootfiles/postfix
+fi
+# DMA - configure dma as default mta
+mkdir -p /etc/alternatives
+mkdir -p /var/lib/alternatives
+/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20
+
 # Start services
 /etc/init.d/dnsmasq start
 /etc/init.d/sshd start

diff --git a/lfs/openssh b/lfs/openssh
index 22d1de5bfdb4b2840938d1a5549cc4c605eb255c..1178d6ff06fcf4f7bb0f3b5a7242d8d82e54aff0 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -91,6 +91,9 @@ $(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|' \
            /etc/ssh/sshd_config
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)