From e12a2712b770eac231060db1d9f6a47812ea2840 Mon Sep 17 00:00:00 2001
From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:03:44 -0800
Subject: [PATCH 1/2] [CLIENT-2217] CI/CD: Verify we are linking the wheel with
 the correct OpenSSL version (#700)

---
 .github/workflows/build-wheels.yml                 | 13 +++++++++++--
 .github/workflows/manylinux2014-openssl.Dockerfile |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index b48bfe597..37f8b7ae0 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -263,8 +263,17 @@ jobs:
           yum install python-setuptools -y
         # delvewheel is not enabled by default but we do need to repair the wheel
         CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel==1.*"
-        # We want to check that our new openssl 3 install is used, not the system default
-        CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair -w {dest_dir} {wheel} && auditwheel show {dest_dir}/*
+        # We want to check that our wheel links to the new openssl 3 install, not the system default
+        # This assumes that ldd prints out the "soname" for the libraries
+        # We can also manually verify the repair worked by checking the repaired wheel's compatibility tag
+        CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
+          WHEEL_DIR=wheel-contents &&
+          unzip {wheel} -d $WHEEL_DIR &&
+          ldd $WHEEL_DIR/*.so | awk '{print $1}' | grep libssl.so.3 &&
+          ldd $WHEEL_DIR/*.so | awk '{print $1}' | grep libcrypto.so.3 &&
+          auditwheel repair -w {dest_dir} {wheel} &&
+          auditwheel show {dest_dir}/* &&
+          rm -rf $WHEEL_DIR
         CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path ./aerospike-client-c/vs/x64/Release -w {dest_dir} {wheel}"
         CIBW_TEST_COMMAND: ${{ env.TEST_COMMAND }}
 
diff --git a/.github/workflows/manylinux2014-openssl.Dockerfile b/.github/workflows/manylinux2014-openssl.Dockerfile
index a807685ff..00db671fd 100644
--- a/.github/workflows/manylinux2014-openssl.Dockerfile
+++ b/.github/workflows/manylinux2014-openssl.Dockerfile
@@ -5,6 +5,7 @@ LABEL com.aerospike.clients.openssl-version=$OPENSSL_VERSION
 
 RUN yum install -y perl-core wget
 
+WORKDIR /
 ARG OPENSSL_TAR_NAME=openssl-$OPENSSL_VERSION
 RUN wget https://www.openssl.org/source/$OPENSSL_TAR_NAME.tar.gz
 RUN tar xzvf $OPENSSL_TAR_NAME.tar.gz

From 0ab340b0f3981707abcd0dab1c6585b99543d89b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:04:29 +0000
Subject: [PATCH 2/2] Auto-bump version to 16.0.0rc3.dev1 [skip ci]

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 361af3256..0a903f20d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.0rc2
+16.0.0rc3.dev1