diff --git a/o/openssl/manifest.x86_64.bin b/o/openssl/manifest.x86_64.bin index ff7c43b4f..bce712b4d 100644 Binary files a/o/openssl/manifest.x86_64.bin and b/o/openssl/manifest.x86_64.bin differ diff --git a/o/openssl/manifest.x86_64.jsonc b/o/openssl/manifest.x86_64.jsonc index ac88ee9c9..ac27f7c92 100644 --- a/o/openssl/manifest.x86_64.jsonc +++ b/o/openssl/manifest.x86_64.jsonc @@ -4,8 +4,10 @@ "packages": { "openssl": { "build-depends": [ + "gcc", + "gcc-32bit", "perl", - "pkgconfig(zlib)" + "pkgconfig32(zlib)" ], "depends": [ "binary(perl)", @@ -347,10 +349,79 @@ "soname(ossl-modules/legacy.so(x86_64))" ] }, + "openssl-32bit": { + "build-depends": [ + "gcc", + "gcc-32bit", + "perl", + "pkgconfig32(zlib)" + ], + "depends": [ + "openssl", + "soname(libatomic.so.1(386))", + "soname(libc.so.6(386))" + ], + "files": [ + "/usr/lib32/engines-3/afalg.so", + "/usr/lib32/engines-3/capi.so", + "/usr/lib32/engines-3/loader_attic.so", + "/usr/lib32/engines-3/padlock.so", + "/usr/lib32/libcrypto.so.3", + "/usr/lib32/libssl.so.3", + "/usr/lib32/ossl-modules/legacy.so" + ], + "name": "openssl-32bit", + "provides": [ + "soname(engines-3/afalg.so(386))", + "soname(engines-3/afalg.so(x86))", + "soname(engines-3/capi.so(386))", + "soname(engines-3/capi.so(x86))", + "soname(engines-3/loader_attic.so(386))", + "soname(engines-3/loader_attic.so(x86))", + "soname(engines-3/padlock.so(386))", + "soname(engines-3/padlock.so(x86))", + "soname(libcrypto.so.3(386))", + "soname(libcrypto.so.3(x86))", + "soname(libssl.so.3(386))", + "soname(libssl.so.3(x86))", + "soname(ossl-modules/legacy.so(386))", + "soname(ossl-modules/legacy.so(x86))" + ] + }, + "openssl-32bit-devel": { + "build-depends": [ + "gcc", + "gcc-32bit", + "perl", + "pkgconfig32(zlib)" + ], + "depends": [ + "openssl-32bit", + "openssl-devel" + ], + "files": [ + "/usr/lib32/cmake/OpenSSL/OpenSSLConfig.cmake", + "/usr/lib32/cmake/OpenSSL/OpenSSLConfigVersion.cmake", + "/usr/lib32/libcrypto.so", + "/usr/lib32/libssl.so", + "/usr/lib32/pkgconfig/libcrypto.pc", + "/usr/lib32/pkgconfig/libssl.pc", + "/usr/lib32/pkgconfig/openssl.pc" + ], + "name": "openssl-32bit-devel", + "provides": [ + "cmake(OpenSSL)", + "pkgconfig32(libcrypto)", + "pkgconfig32(libssl)", + "pkgconfig32(openssl)" + ] + }, "openssl-devel": { "build-depends": [ + "gcc", + "gcc-32bit", "perl", - "pkgconfig(zlib)" + "pkgconfig32(zlib)" ], "depends": [ "openssl" @@ -6174,8 +6245,10 @@ }, "openssl-docs": { "build-depends": [ + "gcc", + "gcc-32bit", "perl", - "pkgconfig(zlib)" + "pkgconfig32(zlib)" ], "files": [ "/usr/share/doc/openssl/html/man1/CA.pl.html", @@ -7042,6 +7115,6 @@ } }, "source-name": "openssl", - "source-release": "18", + "source-release": "19", "source-version": "3.3.2" } diff --git a/o/openssl/stone.yaml b/o/openssl/stone.yaml index 255cc73f9..34c3f40bf 100644 --- a/o/openssl/stone.yaml +++ b/o/openssl/stone.yaml @@ -5,7 +5,7 @@ # name : openssl version : 3.3.2 -release : 18 +release : 19 summary : OpenSSL cryptography library license : Apache-2.0 homepage : https://www.openssl.org @@ -14,24 +14,41 @@ description : | upstreams : - https://www.openssl.org/source/openssl-3.3.2.tar.gz: 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 builddeps : - - pkgconfig(zlib) + - gcc # libatomic + - gcc-32bit # libatomic(386) + - pkgconfig32(zlib) - perl rundeps : - ca-certificates - coreutils - binary(perl) +emul32 : true +packages : + - "%(name)-docs": + paths: + - /usr/share/doc/* +profiles : + - emul32: + install: | + %make_install MANSUFFIX=openssl + rm -v %(installroot)%(libdir)/*.a setup : | + if [[ %(target_triple) = i686* ]]; then + export OSSL_TARGET="linux-x86-clang" + else + export OSSL_TARGET=linux-x86_64-clang"" + fi %patch %(pkgdir)/stateless/0001-Use-OS-provided-copy-of-openssl.cnf-as-fallback.patch %patch %(pkgdir)/config.patch - ./Configure shared no-ssl zlib-dynamic no-rc4 no-ssl2 no-ssl3 enable-ktls \ + ./Configure $OSSL_TARGET shared no-ssl zlib-dynamic no-rc4 no-ssl2 no-ssl3 enable-ktls \ --prefix=/usr \ --openssldir=/etc/ssl \ - --libdir=/usr/lib + --libdir=%(libdir) build : | %make install : | %make_install MANSUFFIX=openssl - rm %(installroot)/%(libdir)/*.a + rm -v %(installroot)%(libdir)/*.a # Stateless %install_dir %(installroot)/%(vendordir)/etc @@ -45,7 +62,3 @@ install : | %tmpfiles "# Create SSL compatibility link" %tmpfiles "d /etc/ssl 0755 - - -" %tmpfiles "L+ /etc/ssl/certs - - - - /usr/share/defaults/etc/ssl/certs" -packages : - - "%(name)-docs": - paths: - - /usr/share/doc/*