From d02e37c43a7d7fc745d320e65e5b5d40b654912a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 17 Oct 2024 17:34:52 +0200
Subject: [PATCH] bump sshd to 2.14.0 rather than 2.13.1

There were apparently some problems with 2.13.1:

https://gerrit-review.googlesource.com/c/gerrit/+/438881
---
 gerrit/default.nix                      |  9 ++++--
 gerrit/gerrit-cl-431977-bump-sshd.patch | 40 -------------------------
 2 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 gerrit/gerrit-cl-431977-bump-sshd.patch

diff --git a/gerrit/default.nix b/gerrit/default.nix
index 855d077..19dba17 100644
--- a/gerrit/default.nix
+++ b/gerrit/default.nix
@@ -4,6 +4,7 @@
 { buildBazelPackageNG
 , lib
 , fetchgit
+, fetchpatch2
 , bazel_7
 , python3
 , openjdk21_headless
@@ -38,14 +39,18 @@ in
       find "$dir" -name .git -print0 | xargs -0 rm -rf
     '';
   });
-  depsHash = "sha256-ADzH4kj/tfaLHxzASzJjjkNulVbeopMIrH36Me4dtvU=";
+  depsHash = "sha256-oiOucsKRvhms+AwMy6VZF/zWCVmSScuyc3T2Gg2Qz7w=";
 
   patches = [
     ./0001-Syntax-highlight-nix.patch
     ./0002-Syntax-highlight-rules.pl.patch
     ./0003-Add-titles-to-CLs-over-HTTP.patch
 
-    ./gerrit-cl-431977-bump-sshd.patch
+    (fetchpatch2 {
+      url = "https://gerrit-review.googlesource.com/changes/gerrit~438881/revisions/2/patch?download";
+      decode = "base64 -d";
+      hash = "sha256-x0j/bPuDTQ/eVd2YleSVREp0DBSd+9SFcvFlucp7fXg=";
+    })
     ./gerrit-cl-431977-part-2-bump-bouncycastle.patch
   ];
 
diff --git a/gerrit/gerrit-cl-431977-bump-sshd.patch b/gerrit/gerrit-cl-431977-bump-sshd.patch
deleted file mode 100644
index 3a08df2..0000000
--- a/gerrit/gerrit-cl-431977-bump-sshd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Bump SSHD version to 2.13.1
-
-Release-Notes: Update SSHD version to 2.13.1
-Change-Id: Ib7bc185bfd9e7eda0cc04230da8bd87ee1bb2358
-
-diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
-index 91caf31..d9b90d8 100644
---- a/tools/nongoogle.bzl
-+++ b/tools/nongoogle.bzl
-@@ -137,18 +137,18 @@
-         sha1 = "cb2f351bf4463751201f43bb99865235d5ba07ca",
-     )
- 
--    SSHD_VERS = "2.12.0"
-+    SSHD_VERS = "2.13.1"
- 
-     maven_jar(
-         name = "sshd-osgi",
-         artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
--        sha1 = "32b8de1cbb722ba75bdf9898e0c41d42af00ce57",
-+        sha1 = "50958cc44076749e790d7332021cff546707624c",
-     )
- 
-     maven_jar(
-         name = "sshd-sftp",
-         artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
--        sha1 = "0f96f00a07b186ea62838a6a4122e8f4cad44df6",
-+        sha1 = "e1b6da4ef604718e32cad59ef32618610da7a170",
-     )
- 
-     maven_jar(
-@@ -166,7 +166,7 @@
-     maven_jar(
-         name = "sshd-mina",
-         artifact = "org.apache.sshd:sshd-mina:" + SSHD_VERS,
--        sha1 = "8b202f7d4c0d7b714fd0c93a1352af52aa031149",
-+        sha1 = "ff4a9fac41a111d806f6a058d23278b0819da7ce",
-     )
- 
-     maven_jar(