This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via a14e8d0256919b75612a67f2c6ceaffb979a4428 (commit) via 3a6784c065ca6513444f81d073874ff8118c6380 (commit) via b4dd976c20b5556e2f6d87bd9f7c8834b1204a8c (commit) from 038169b894f1914b3cbd6513fea5f307bcc4ab12 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit a14e8d0256919b75612a67f2c6ceaffb979a4428 Merge: 038169b 3a6784c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 25 09:21:12 2015 +0100
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/oldcore/94/filelists/files | 1 + config/rootfiles/oldcore/94/update.sh | 7 ++++--- lfs/openssh | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-)
Difference in files: diff --git a/config/rootfiles/oldcore/94/filelists/files b/config/rootfiles/oldcore/94/filelists/files index e63a611..9ef227b 100644 --- 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 a9c24a5..99aa046 100644 --- 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 1178d6f..0bba1ec 100644 --- 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)
hooks/post-receive -- IPFire 2.x development tree