diff options
Diffstat (limited to 'community/gitea/fix-tests-ssh-hostkeys.patch')
-rw-r--r-- | community/gitea/fix-tests-ssh-hostkeys.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/community/gitea/fix-tests-ssh-hostkeys.patch b/community/gitea/fix-tests-ssh-hostkeys.patch deleted file mode 100644 index 90faba4e6b4..00000000000 --- a/community/gitea/fix-tests-ssh-hostkeys.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/integrations/git_helper_for_declarative_test.go b/integrations/git_helper_for_declarative_test.go -index 5a5b1314c6..7fb9bb26f4 100644 ---- a/integrations/git_helper_for_declarative_test.go -+++ b/integrations/git_helper_for_declarative_test.go -@@ -40,13 +40,13 @@ func withKeyFile(t *testing.T, keyname string, callback func(string)) { - assert.NoError(t, err) - - err = ioutil.WriteFile(path.Join(tmpDir, "ssh"), []byte("#!/bin/bash\n"+ -- "ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0700) -+ "ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"HostkeyAlgorithms=+ssh-rsa\" -o \"PubkeyAcceptedAlgorithms=+ssh-rsa\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0700) - assert.NoError(t, err) - - //Setup ssh wrapper - os.Setenv("GIT_SSH", path.Join(tmpDir, "ssh")) - os.Setenv("GIT_SSH_COMMAND", -- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i \""+keyFile+"\"") -+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o HostkeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -i \""+keyFile+"\"") - os.Setenv("GIT_SSH_VARIANT", "ssh") - - callback(keyFile) |