From 6d7713572f35e804fbd04b486902bf535fddb6e0 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 8 Jul 2024 10:32:08 +0100
Subject: chore(3p/gerrit): downgrade mina SSHd again

This breaks it with "ssh_dispatch_run_fatal: Connection to
2a01:4f8:242:5b21:0:feed:edef:beef port 29418: incorrect signature"

Change-Id: I9bafc5fb6d4743ce4f097158ec14fecc791366ca
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11965
Tested-by: BuildkiteCI
Autosubmit: lukegb <lukegb@tvl.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: lukegb <lukegb@tvl.fyi>
---
 third_party/gerrit/default.nix                     |  4 +--
 .../gerrit/gerrit-cl-431977-bump-sshd.patch        | 40 ----------------------
 third_party/gerrit_plugins/oauth/default.nix       |  2 +-
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 third_party/gerrit/gerrit-cl-431977-bump-sshd.patch

(limited to 'third_party')

diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix
index 94d68a1dcc04..fdf4a8d9d460 100644
--- a/third_party/gerrit/default.nix
+++ b/third_party/gerrit/default.nix
@@ -27,14 +27,12 @@ pkgs.lib.makeOverridable depot.nix.buildBazelPackageNG rec {
       find "$dir" -name .git -print0 | xargs -0 rm -rf
     '';
   });
-  depsHash = "sha256-Z6pvnL8bv09K4wKaatUCsnXAtSno+BJO6rTKhDsHYv4=";
+  depsHash = "sha256-OS2kLXjtuWf+XRyQO2qGvEaAOvxqu20+gXR+fsCvpMc=";
 
   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
   ];
 
   nativeBuildInputs = with pkgs; [
diff --git a/third_party/gerrit/gerrit-cl-431977-bump-sshd.patch b/third_party/gerrit/gerrit-cl-431977-bump-sshd.patch
deleted file mode 100644
index 3a08df21ba7c..000000000000
--- a/third_party/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(
diff --git a/third_party/gerrit_plugins/oauth/default.nix b/third_party/gerrit_plugins/oauth/default.nix
index a949596b0b1f..811614d66a18 100644
--- a/third_party/gerrit_plugins/oauth/default.nix
+++ b/third_party/gerrit_plugins/oauth/default.nix
@@ -11,7 +11,7 @@ buildGerritBazelPlugin rec {
     rev = "98231604d60788bb43490f1a301d792817ac8008";
     hash = "sha256-AuVO1Yys8BYqGHZI/adszCUg0JM2v4Td4fe26LdOPLM=";
   };
-  depsHash = "sha256-qEeKQPyt3uIS+BStrputBUnE3ft5c4oeazgsWd+lbN8=";
+  depsHash = "sha256-7SC4NXm4zGeJrYBqtEvcrLmsZmXEX8P21J0kwHBDBZ4=";
   postOverlayPlugin = ''
     cp "${src}/external_plugin_deps.bzl" "$out/plugins/external_plugin_deps.bzl"
   '';
-- 
cgit 1.4.1