From 3fd3f4de44df53d631937ec137078eb8c0328bd4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org>
Date: Sat, 21 Mar 2020 20:08:00 +0000
Subject: [PATCH] OpenSSH: update to 8.2p1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Please refer to https://www.openssh.com/txt/release-8.2 for release
announcements. Since glibc < 2.31 is used, no additional patching was
required in order to restore correct login functionality.

Cc: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/rootfiles/common/openssh | 2 ++
 lfs/openssh                     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh
index b41190a474..f2f8ea6c5e 100644
--- a/config/rootfiles/common/openssh
+++ b/config/rootfiles/common/openssh
@@ -21,6 +21,7 @@ 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
@@ -35,4 +36,5 @@ 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 64e72d6547..68a7d63cdd 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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.1p1
+VER        = 8.2p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 513694343631a99841e815306806edf0
+$(DL_FILE)_MD5 = 3076e6413e8dbe56d33848c1054ac091
 
 install : $(TARGET)
 
-- 
2.39.2