Merge pull request #1 from royalapplications/versions-include-openssl

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: macos-14
 
     env: # use tag version, if available, falling back to 1.21.3 (stable)
-      MITKERBEROS_VERSION: "${{ startsWith(github.ref, 'refs/tags/1.') && github.ref_name || '1.21.3' }}"
+      MITKERBEROS_VERSION: "${{ startsWith(github.ref, 'refs/tags/1.') && github.ref_name || '1.21.3_openssl-3.3.1' }}"
       PUBLISH_RELEASE: "${{ startsWith(github.ref, 'refs/tags/1.') && '1' || '0' }}"
 
     steps:

scripts/build.sh

@@ -2,9 +2,7 @@
 
 set -e
 
-MITKERBEROS_VERSION_STABLE="1.21.3" # https://kerberos.org/dist/
-
-OPENSSL_VERSION="3.3.1"
+MITKERBEROS_VERSION_STABLE="1.21.3_openssl-3.3.1" # https://kerberos.org/dist/
 
 IOS_VERSION_MIN="13.4"
 MACOS_VERSION_MIN="11.0"
@@ -22,6 +20,16 @@ if [[ -z $MITKERBEROS_VERSION ]]; then
   MITKERBEROS_VERSION="${MITKERBEROS_VERSION_STABLE}"
 fi
 
+if [[ "${MITKERBEROS_VERSION}" =~ ^([^_]+)_openssl-(.*)$ ]]; then
+  MITKERBEROS_VERSION="${BASH_REMATCH[1]}"
+  OPENSSL_VERSION="${BASH_REMATCH[2]}"
+  echo "MITKERBEROS_VERSION extracted: ${MITKERBEROS_VERSION}"
+  echo "OPENSSL_VERSION extracted: ${OPENSSL_VERSION}"
+else
+  echo "Cannot parse MITKERBEROS_VERSION: ${MITKERBEROS_VERSION}"
+  exit 1
+fi
+
 if [[ -z $MITKERBEROS_VERSION_SHORT ]]; then
   short_version_length=${#MITKERBEROS_VERSION}
   short_version_endindex=$(expr $short_version_length - 2)
@@ -44,7 +52,7 @@ if [[ ! -d "${BUILD_DIR}" ]]; then
   tar xzf "${BUILD_ROOT_DIR}/krb5-${MITKERBEROS_VERSION}.tar.gz" -C "${BUILD_DIR}" --strip-components=1
 fi
 
-TARGET_DIR="${BUILD_ROOT_DIR}/mitkerberos-${MITKERBEROS_VERSION}"
+TARGET_DIR="${BUILD_ROOT_DIR}/mitkerberos-${MITKERBEROS_VERSION}_openssl-${OPENSSL_VERSION}"
 
 if [[ -d "${TARGET_DIR}" ]]; then
   rm -rf "${TARGET_DIR}"
@@ -68,16 +76,17 @@ NO_URI_LOOKUP_PATCH_FILENAME="no_uri_lookup.patch"
 echo "Applying ${NO_URI_LOOKUP_PATCH_FILENAME} patch to git"
 git -C "${BUILD_DIR}" apply "${SCRIPT_PATH}/${NO_URI_LOOKUP_PATCH_FILENAME}"
 
-OPENSSL_BASE_DIR="${BUILD_ROOT_DIR}/openssl"
+OPENSSL_BASE_DIR="${BUILD_ROOT_DIR}/openssl-${OPENSSL_VERSION}"
 
 if [[ -d "${OPENSSL_BASE_DIR}" ]]; then
   rm -rf "${OPENSSL_BASE_DIR}"
 fi
 
 mkdir "${OPENSSL_BASE_DIR}"
 
-OPENSSL_DL_FILENAME="openssl.tar.gz"
-OPENSSL_URL="https://github.com/royalapplications/openssl/releases/download/${OPENSSL_VERSION}/${OPENSSL_DL_FILENAME}"
+OPENSSL_URL="https://github.com/royalapplications/openssl/releases/download/${OPENSSL_VERSION}/openssl.tar.gz"
+
+OPENSSL_DL_FILENAME="openssl-${OPENSSL_VERSION}.tar.gz"
 
 echo "Downloading OpenSSL release from ${OPENSSL_URL}"
 curl -fL "${OPENSSL_URL}" -o "${BUILD_ROOT_DIR}/${OPENSSL_DL_FILENAME}"