From e9482e558a19dc7b6bb7833437b3b3ca4247c58e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Tue, 14 Mar 2023 10:47:44 +0100
Subject: [PATCH 1/5] vendor: bump libgit2 to 8f8e805e3f

---
 vendor/libgit2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/libgit2 b/vendor/libgit2
index 036fe1afb..8f8e805e3 160000
--- a/vendor/libgit2
+++ b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 036fe1afba37d9b20509671d3048c6088f018134
+Subproject commit 8f8e805e3f37e49563c33a0c67fcf7f0d2e9101c

From 67e1ff5b738b60938f6107046a49fde92fdd7117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Fri, 17 Mar 2023 09:44:42 +0100
Subject: [PATCH 2/5] ext: correct pc filename

---
 ext/rugged/extconf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/rugged/extconf.rb b/ext/rugged/extconf.rb
index 76e71edeb..7dbd2b3b9 100644
--- a/ext/rugged/extconf.rb
+++ b/ext/rugged/extconf.rb
@@ -116,7 +116,7 @@ def self.run_cmake(timeout, args)
         $LDFLAGS << " " + "-L#{Dir.pwd}/deps/winhttp"
         $LIBS << " -lwinhttp -lcrypt32 -lrpcrt4 -lole32 -lz -lssh2"
       else
-        pcfile = File.join(LIBGIT2_DIR, "build", "git2.pc")
+        pcfile = File.join(LIBGIT2_DIR, "build", "libgit2.pc")
         $LDFLAGS << " " + `pkg-config --libs --static #{pcfile}`.strip
       end
     end

From 53054ac180562a1156111520cd6d1d1c0d14924e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Fri, 17 Mar 2023 09:56:15 +0100
Subject: [PATCH 3/5] ci: run on ubuntu-20.04

The `ruby/ruby-setup` action no longer officially supports 18.04 and trying to
run against 3.2 fails. Let's update to still a somewhat older Ubuntu version to
make sure we're not breaking things too much.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c625e830..b77e79871 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ]
-        os: [ ubuntu-18.04 ]
+        os: [ ubuntu-20.04 ]
     runs-on: ${{ matrix.os }}
 
     name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}

From c43f8aded09a034d7198b268ff533239f431dd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Fri, 17 Mar 2023 10:22:13 +0100
Subject: [PATCH 4/5] ci: maybe 22.04 works better

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b77e79871..99bb82e59 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ]
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
     runs-on: ${{ matrix.os }}
 
     name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }}

From 8afac4bb6b59431cccf7f503217de0a42aa0ab11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Fri, 17 Mar 2023 11:15:44 +0100
Subject: [PATCH 5/5] ci: tell sshd that we want ssh-rsa still

---
 script/travisbuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/script/travisbuild b/script/travisbuild
index a82bb8314..7a02d1aff 100755
--- a/script/travisbuild
+++ b/script/travisbuild
@@ -15,7 +15,10 @@ HostKey ${SSHD_DIR}/id_rsa
 PidFile ${SSHD_DIR}/pid
 AuthorizedKeysFile ${HOME}/.ssh/authorized_keys
 LogLevel DEBUG
+# For now let's accept ssh-rsa so the rest of the setup works
 RSAAuthentication yes
+HostKeyAlgorithms ssh-rsa
+PubkeyAcceptedAlgorithms ssh-rsa
 PasswordAuthentication yes
 PubkeyAuthentication yes
 ChallengeResponseAuthentication no