From 76a1eb5f0b2df3c3efabb3d71aac3e1546d475d7 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 08:15:56 +0100
Subject: [PATCH] update to 8.4p1 [release 8.4p1-1mamba;Mon Oct 05 2020]

---
 ...p1-ssh_config.patch => openssh-8.4p1-ssh_config.patch | 8 +++++---
 openssh.spec                                             | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)
 rename openssh-7.6p1-ssh_config.patch => openssh-8.4p1-ssh_config.patch (63%)

diff --git a/openssh-7.6p1-ssh_config.patch b/openssh-8.4p1-ssh_config.patch
similarity index 63%
rename from openssh-7.6p1-ssh_config.patch
rename to openssh-8.4p1-ssh_config.patch
index 1997150..fe779d6 100644
--- a/openssh-7.6p1-ssh_config.patch
+++ b/openssh-8.4p1-ssh_config.patch
@@ -1,5 +1,6 @@
---- openssh-7.6p1/ssh_config.orig	2017-10-02 21:34:26.000000000 +0200
-+++ openssh-7.6p1/ssh_config	2017-12-07 17:48:23.466967744 +0100
+diff -Nru openssh-8.4p1.orig/ssh_config openssh-8.4p1/ssh_config
+--- openssh-8.4p1.orig/ssh_config	2020-09-27 09:25:01.000000000 +0200
++++ openssh-8.4p1/ssh_config	2020-10-20 11:17:52.626000000 +0200
 @@ -17,9 +17,9 @@
  # list of available options, their meanings and defaults, please see the
  # ssh_config(5) man page.
@@ -12,9 +13,10 @@
  #   PasswordAuthentication yes
  #   HostbasedAuthentication no
  #   GSSAPIAuthentication no
-@@ -44,3 +44,5 @@
+@@ -43,4 +43,6 @@
  #   VisualHostKey no
  #   ProxyCommand ssh -q -W %h:%p gateway.example.com
  #   RekeyLimit 1G 1h
 +    SendEnv LANG LC_*
 +    ServerAliveInterval 60
+ #   UserKnownHostsFile ~/.ssh/known_hosts.d/%k
diff --git a/openssh.spec b/openssh.spec
index c97b19e..4b7f01e 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -6,7 +6,7 @@
 %define with_selinux  0
 
 Name:          openssh
-Version:       8.3p1
+Version:       8.4p1
 Release:       1mamba
 Summary:       OpenSSH free Secure Shell (SSH) implementation
 Group:         Network/Security
@@ -14,14 +14,14 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.openssh.com/
-Source0:       http://openbsd.mirror.garr.it/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
+Source0:       http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Source1:       openssh-pamdconf
 Source2:       openssh-sshd-makecerts
 Source3:       openssh-sshd.service
 Source4:       openssh-sshd@.service
 Source5:       openssh-sshd.socket
 Source6:       openssh-sshd.conf
-Patch0:        openssh-7.6p1-ssh_config.patch
+Patch0:        openssh-8.4p1-ssh_config.patch
 Patch1:        openssh-8.2p1-arm-glibc-2.31.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
@@ -300,6 +300,9 @@ exit 0
 %{_libexecdir}/openssh/ssh-askpass
 
 %changelog
+* Mon Oct 05 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 8.4p1-1mamba
+- update to 8.4p1
+
 * Thu May 28 2020 Automatic Build System <autodist@mambasoft.it> 8.3p1-1mamba
 - automatic version update by autodist