Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4f73e5b
commit 2f97826
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- a/Configurations/10-main.conf | ||
| +++ b/Configurations/10-main.conf | ||
| @@ -1603,6 +1603,18 @@ | ||
| multilib => "64", | ||
| }, | ||
|
|
||
| + "mingwarm64" => { | ||
| + inherit_from => [ "mingw-common" ], | ||
| + cflags => "", | ||
| + sys_id => "MINGWARM64", | ||
| + bn_ops => add("SIXTY_FOUR_BIT"), | ||
| + asm_arch => 'aarch64', | ||
| + uplink_arch => undef, | ||
| + perlasm_scheme => "coff", | ||
| + shared_rcflag => "", | ||
| + multilib => "", | ||
| + }, | ||
| + | ||
| #### UEFI | ||
| "UEFI" => { | ||
| inherit_from => [ "BASE_unix" ], |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,32 +3,29 @@ | |
| _realname=openssl | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| pkgver=3.0.7 | ||
| pkgrel=1 | ||
| pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)" | ||
| arch=('any') | ||
| mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') | ||
| url='https://www.openssl.org/' | ||
| license=("spdx:Apache-2.0") | ||
| optdepends=("${MINGW_PACKAGE_PREFIX}-ca-certificates") | ||
| makedepends=("${MINGW_PACKAGE_PREFIX}-cc" | ||
| "${MINGW_PACKAGE_PREFIX}-autotools") | ||
| options=('!buildflags') | ||
| source=("https://www.openssl.org/source/openssl-${pkgver}.tar.gz"{,.asc} | ||
| '001-support-aarch64.patch' | ||
| '002-relocation.patch' | ||
| 'pathtools.c' | ||
| 'pathtools.h') | ||
| sha256sums=('83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e' | ||
| 'SKIP' | ||
| 'd612e8005d2a311595004059244cfe2ff2c5d30ea80cca2a092963057f421b4c' | ||
| '5bb4c03af10f5faed8680d6089a6347659b31719057d41bc07a8e7e300437dd5' | ||
| '703cd0cb74e714f9e66d26de11c109dd76fab07e723af8dde56a35ea65102e5f' | ||
| '4f9d325265ef6f4e90ad637dea41afa6995388c921fe961ad5dc895aca10318b') | ||
|
|
||
| # https://www.openssl.org/community/otc.html | ||
| validpgpkeys=( | ||
| '8657ABB260F056B1E5190839D9C4D26D0E604491' # Matt Caswell <matt@openssl.org> | ||
|
|
@@ -48,31 +45,27 @@ apply_patch_with_msg() { | |
| # =========================================== # | ||
|
|
||
| prepare() { | ||
| cd ${srcdir}/${_realname}-${pkgver} | ||
|
|
||
| apply_patch_with_msg \ | ||
| 001-support-aarch64.patch \ | ||
| 002-relocation.patch | ||
|
|
||
| test ! -d "${startdir}/../mingw-w64-pathtools" || { | ||
| cmp "${startdir}/../mingw-w64-pathtools/pathtools.c" "${srcdir}/pathtools.c" && | ||
| cmp "${startdir}/../mingw-w64-pathtools/pathtools.h" "${srcdir}/pathtools.h" | ||
| } || exit 1 | ||
|
|
||
| cp -fHv "${srcdir}"/pathtools.c crypto/ | ||
| cp -fHv "${srcdir}"/pathtools.h ./ | ||
| } | ||
|
|
||
| build() { | ||
| mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" | ||
|
|
||
| # Use mingw cflags instead of hardcoded ones | ||
| sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -Wall/-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4/' \ | ||
| ${srcdir}/${_realname}-${pkgver}/Configurations/10-main.conf | ||
|
|
||
| case "${CARCH}" in | ||
| i?86) | ||
|
|
@@ -81,22 +74,16 @@ build() { | |
| x86_64) | ||
| _mingw=mingw64 | ||
| ;; | ||
| aarch64) | ||
| _mingw="mingwarm64 no-asm" | ||
| ;; | ||
| esac | ||
|
|
||
| MSYS2_ARG_CONV_EXCL="--prefix=" \ | ||
| ../"${_realname}-${pkgver}"/Configure \ | ||
| --prefix="${MINGW_PREFIX}" \ | ||
| --libdir=lib \ | ||
| --openssldir=etc/ssl \ | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
MehdiChinoune
Author
Collaborator
|
||
| ${_mingw} \ | ||
| shared \ | ||
| zlib-dynamic \ | ||
|
|
@@ -106,34 +93,21 @@ build() { | |
| enable-mdc2 \ | ||
| enable-rc5 \ | ||
| enable-rfc3779 \ | ||
| -DOPENSSLBIN=\"\\\"${MINGW_PREFIX}/bin\\\"\" | ||
|
|
||
| make | ||
| } | ||
|
|
||
| check() { | ||
| cd "${srcdir}/build-${MSYSTEM}" | ||
|
|
||
| make VERBOSE=1 test | ||
| } | ||
|
|
||
| package() { | ||
| cd "${srcdir}/build-${MSYSTEM}" | ||
|
|
||
| make install DESTDIR="${pkgdir}" | ||
|
|
||
| install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" | ||
| } | ||
@MehdiChinoune Did you change the
--openssldirintensionally? It wassslin OpenSSL-1.1 and this commit changes it toetc/sslin OpenSSL-3.0. That means, that CA certificates have a different location now. I didn't find any discussion about this change.We use the
ssldirectory in RubyInstaller to distribute the CA bundle and our unit tests fail now.