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, master has been updated via e7fcf874e7f36d82e5e8c5fd54d8ea321b852186 (commit) via 5947f92a5ace259bf517d597fa21e4c912574651 (commit) from 551bc489408c1efc0d0899ead3894c3d04a0f300 (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 e7fcf874e7f36d82e5e8c5fd54d8ea321b852186 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Apr 9 20:26:33 2020 +0000
Revert "OpenSSH: update to 8.2p1"
ssh skips login before asking for credentials at i586.
This reverts commit 3fd3f4de44df53d631937ec137078eb8c0328bd4.
commit 5947f92a5ace259bf517d597fa21e4c912574651 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 9 20:24:42 2020 +0000
unbound: skip empty domains at local-data import
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/openssh | 2 -- lfs/openssh | 6 +++--- src/initscripts/system/unbound | 7 ++++--- 3 files changed, 7 insertions(+), 8 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index f2f8ea6c5..b41190a47 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -21,7 +21,6 @@ usr/bin/ssh-keyscan usr/lib/openssh/sftp-server usr/lib/openssh/ssh-keysign usr/lib/openssh/ssh-pkcs11-helper -usr/lib/openssh/ssh-sk-helper usr/sbin/sshd #usr/share/man/man1/scp.1 #usr/share/man/man1/sftp.1 @@ -36,5 +35,4 @@ usr/sbin/sshd #usr/share/man/man8/sftp-server.8 #usr/share/man/man8/ssh-keysign.8 #usr/share/man/man8/ssh-pkcs11-helper.8 -#usr/share/man/man8/ssh-sk-helper.8 #usr/share/man/man8/sshd.8 diff --git a/lfs/openssh b/lfs/openssh index 68a7d63cd..64e72d654 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2019 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 # @@ -24,7 +24,7 @@
include Config
-VER = 8.2p1 +VER = 8.1p1
THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3076e6413e8dbe56d33848c1054ac091 +$(DL_FILE)_MD5 = 513694343631a99841e815306806edf0
install : $(TARGET)
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index 35477ae28..acbf6f5b5 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -78,10 +78,11 @@ write_hosts_conf() { while IFS="," read -r enabled address hostname domainname generateptr; do [ "${enabled}" = "on" ] || continue
- echo "${domainname}" - done < /var/ipfire/main/hosts | sort -u | while read -r domainname; do + # Skip empty domainnames + [ "${domainname}" = "" ] && continue + echo "local-zone: ${domainname} typetransparent" - done + done < /var/ipfire/main/hosts | sort -u
# Add all hosts while IFS="," read -r enabled address hostname domainname generateptr; do
hooks/post-receive -- IPFire 2.x development tree