Openssl

recipes/libs/openssl.yaml

@@ -2,7 +2,7 @@ inherit: [cpackage, make, install, patch]
 
 metaEnvironment:
     PKG_LICENSE: "Apache-2.0"
-    PKG_VERSION: "3.3.1"
+    PKG_VERSION: "3.5.4"
 
 depends:
     - libs::zlib-dev
@@ -14,33 +14,48 @@ depends:
 checkoutSCM:
     scm: url
     url: https://www.openssl.org/source/openssl-${PKG_VERSION}.tar.gz
-    digestSHA256: 777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e
+    digestSHA256: 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99
     stripComponents: 1
 
 checkoutDeterministic: True
 checkoutScript: |
     patchApplySeries $<@openssl/*.patch@>
 
+Config:
+    OPENSSL_ADDITIONAL_OPTIONS:
+        help: additional configure options
+    OPENSSL_LINK_MODE:
+        help: overrides the automatically determined link mode
+        type: choice
+        choice:
+            "-static":
+            "shared":
+
 buildTools: [target-toolchain]
 buildToolsWeak: [perl]
-buildVars: [CC, AR, RANLIB, ARCH, AUTOCONF_HOST]
+buildVars: [CC, AR, RANLIB, ARCH, AUTOCONF_HOST, OPENSSL_ADDITIONAL_OPTIONS,
+            OPENSSL_LINK_MODE]
 buildScript: |
     mkdir -p install build
     pushd build
 
     SHARED_ONLY="false"
-    case $(cpackageLibraryType) in
-        static)
-            SHARED_STATIC=( "-static" "zlib" )
-            ;;
-        shared)
-            SHARED_STATIC=( "shared" "zlib" )
-            SHARED_ONLY="true"
-            ;;
-        both)
-            SHARED_STATIC=( "shared" "zlib" )
-            ;;
-    esac
+    if [ ! -z "${OPENSSL_LINK_MODE:-}" ]; then
+        SHARED_STATIC=("${OPENSSL_LINK_MODE}" "zlib")
+    else
+        case $(cpackageLibraryType) in
+            static)
+                SHARED_STATIC=( "-static" "zlib" )
+                ;;
+            shared)
+                SHARED_STATIC=( "shared" "zlib" )
+                SHARED_ONLY="true"
+                ;;
+            both)
+                SHARED_STATIC=( "shared" "zlib" )
+                ;;
+        esac
+    fi
 
     # refer: https://github.com/openssl/openssl/blob/master/Configurations/10-main.conf
     case "$ARCH" in
@@ -80,6 +95,7 @@ buildScript: |
         --libdir=lib \
         "${SHARED_STATIC[@]}" \
         "threads" \
+        ${OPENSSL_ADDITIONAL_OPTIONS:-} \
         "-I${BOB_DEP_PATHS[libs::zlib-dev]}/usr/include" \
         "-Wl,-L${BOB_DEP_PATHS[libs::zlib-dev]}/usr/lib" \
         "-Wl,-rpath-link=${BOB_DEP_PATHS[libs::zlib-dev]}/usr/lib" \
@@ -105,10 +121,24 @@ multiPackage:
         provideTools:
             openssl: "usr/bin"
 
+    # using openssl plugins within the host-tool requires a shared variant
+    pluginable:
+        environment:
+            OPENSSL_LINK_MODE: "shared"
+        packageScript: |
+           installPackageTgt "$1/install/"
+        provideTools:
+            openssl:
+                path: "usr/bin"
+                libs: [ "usr/lib", "usr/lib/engines" ]
+
     dev:
         # Static library builds need to explicitly link with libz but the
         # pkgconfig file is not referenced. Fix that up.
         packageScript: |
+            if [[ ${OPENSSL_LINK_MODE:-} == *"shared"* ]]; then
+                INSTALL_SHARED="true"
+            fi
             installPackageDev "$1/install/"
             sed -i -e '/^Libs:.*-lz/{
             s/-lz//
@@ -117,5 +147,9 @@ multiPackage:
         provideDeps: [ "*-dev" ]
 
     tgt:
-        packageScript: installPackageLib "$1/install/"
+        packageScript: |
+            if [[ ${OPENSSL_LINK_MODE:-} == *"shared"* ]]; then
+                INSTALL_SHARED="true"
+            fi
+            installPackageLib "$1/install/"
         provideDeps: [ "*-tgt" ]