fix: downgrade mina sshd due to broken PQC algorithm
https://cl.tvl.fyi/c/depot/+/11965 This breaks it with "ssh_dispatch_run_fatal: Connection to 2a01:4f8:242:5b21:0:feed:edef:beef port 29418: incorrect signature" Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
This commit is contained in:
parent
82395ec8ce
commit
512cfdb43e
|
@ -35,14 +35,12 @@ in
|
|||
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 = [
|
||||
|
|
|
@ -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(
|
|
@ -8,7 +8,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"
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue