Land #948

2 files changed, 9 insertions, 13 deletions

diff --git a/.github/rust-openssl.patch b/.github/rust-openssl.patch
deleted file mode 100644
index 4a8dd3f..0000000
--- a/.github/rust-openssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
-index bbee7c5c..57033b2d 100644
---- a/openssl-sys/build/main.rs
-+++ b/openssl-sys/build/main.rs
-@@ -293,6 +293,7 @@ See rust-openssl documentation for more information:
-             (3, 8, 0) => ('3', '8', '0'),
-             (3, 8, 1) => ('3', '8', '1'),
-             (3, 8, _) => ('3', '8', 'x'),
-+            (3, 9, _) => ('3', '8', 'x'),
-             _ => version_error(),
-         };
- 
diff --git a/.github/workflows/rust-openssl.yml b/.github/workflows/rust-openssl.yml
index cec2de0..ef5a7b1 100644
--- a/.github/workflows/rust-openssl.yml
+++ b/.github/workflows/rust-openssl.yml
@@ -29,6 +29,14 @@ jobs:
       - name: "Run rust-openssl tests"
         run: |
           cd rust-openssl
-          patch -p1 < ../.github/rust-openssl.patch
+          # instead of erroring use the last supported version
+          ed -s openssl-sys/build/main.rs <<-EOF
+          /_ => version_error/-1
+          .t.
+          s/(.*=/_ =
+          +1d
+          w
+          q
+          EOF
           export OPENSSL_DIR=${HOME}/opt LD_LIBRARY_PATH=${HOME}/opt/lib
           cargo test --verbose