Skip to content

Commit 227e2ea

Browse files
committed
1 parent 10bf6a7 commit 227e2ea

File tree

3 files changed

+11
-41
lines changed

3 files changed

+11
-41
lines changed

_versions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ export OPENSSL_VER_='3.2.1'
5050
export OPENSSL_HASH=83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39
5151
export BORINGSSL_VER_='4fe29ebc759e482891e96fc4170eb3db26c0bc13'
5252
export BORINGSSL_HASH=6c6ffd273a9bda604d619e8c82d5573258e805ce5cb25fe96bd89d510a312685
53-
export LIBRESSL_VER_='3.8.2'
54-
export LIBRESSL_HASH=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954
53+
export LIBRESSL_VER_='3.8.3'
54+
export LIBRESSL_HASH=a65f40e3ef6e3c9451c8318e6f2c454c367e67f09c0cde1849731a4d6ecc7272
5555
export ZLIBNG_VER_='2.1.6'
5656
export ZLIBNG_HASH=a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2
5757
export ZLIB_VER_='1.3.1'

libressl-cmake.sh

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,11 @@ _VER="$1"
2020
CFLAGS="-ffile-prefix-map=$(pwd)="
2121
CPPFLAGS=''
2222

23-
# FIXME upstream: debug options are permanently force-enabled. [FIX MERGED]
23+
# FIXME upstream: debug options are permanently force-enabled. [FIX MERGED THEN LOST]
2424
if [[ "${_CONFIG}" != *'debug'* ]]; then
2525
CPPFLAGS+=' -DNDEBUG'
2626
fi
2727

28-
if [ "${LIBRESSL_VER_}" = '3.8.2' ]; then
29-
# LibreSSL (as of v3.8.2) hangs with ASM enabled on Windows ARM64.
30-
if [ "${_OS}" = 'win' ] && [ "${_CPU}" = 'a64' ]; then
31-
options+=' -DENABLE_ASM=OFF'
32-
fi
33-
fi
34-
3528
if [ "${_CC}" = 'llvm' ]; then
3629
CFLAGS+=' -Wa,--noexecstack'
3730
else
@@ -43,17 +36,10 @@ _VER="$1"
4336
if [ "${_OS}" = 'mac' ]; then
4437
CPPFLAGS+=' -Dglobl=private_extern' # make assembly symbols hidden
4538

46-
# Syncs behaviour with autotools on next version: https://github.com/libressl/portable/pull/963
47-
if [ "${LIBRESSL_VER_}" = '3.8.2' ]; then
48-
if [ "${_OSVER}" -ge '1100' ]; then
49-
options+=' -DHAVE_STRTONUM=1'
50-
fi
51-
else
52-
# Workaround for mis-detecting 'strtonum' successfully despite targeting
53-
# older OS version, then using it.
54-
if [ "${_OSVER}" -lt '1100' ]; then
55-
options+=' -DHAVE_STRTONUM=0'
56-
fi
39+
# Workaround for mis-detecting 'strtonum' successfully despite targeting
40+
# older OS version, then using it.
41+
if [ "${_OSVER}" -lt '1100' ]; then
42+
options+=' -DHAVE_STRTONUM=0'
5743
fi
5844
elif [ "${_OS}" = 'linux' ] && [ "${_CPU}" = 'x64' ]; then
5945
# Add a `.hidden <func>` next to each `.globl <func>` one:
@@ -75,20 +61,9 @@ _VER="$1"
7561
options+=' -DHAVE_SYS_TYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STDDEF_H=1'
7662
fi
7763

78-
if [ "${LIBRESSL_VER_}" = '3.8.2' ]; then
79-
# We might prefer passing the triplet as-is, but as of LibreSSL v3.8.2,
80-
# a triplet does not work in all cases due to the use of `STREQUAL`.
81-
[ "${_CPU}" = 'x86' ] && cpu='x86'
82-
[ "${_CPU}" = 'x64' ] && cpu='x86_64'
83-
[ "${_CPU}" = 'a64' ] && cpu='aarch64'
84-
[ "${_CPU}" = 'r64' ] && cpu='riscv64'
85-
else
86-
cpu="${_TRIPLET}"
87-
fi
88-
8964
# shellcheck disable=SC2086
9065
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${options} \
91-
"-DCMAKE_SYSTEM_PROCESSOR=${cpu}" \
66+
"-DCMAKE_SYSTEM_PROCESSOR=${_TRIPLET}" \
9267
'-DBUILD_SHARED_LIBS=OFF' \
9368
'-DLIBRESSL_APPS=OFF' \
9469
'-DLIBRESSL_TESTS=OFF' \

libressl-pkg.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@
33
# Copyright (C) Viktor Szakats. See LICENSE.md
44
# SPDX-License-Identifier: MIT
55

6-
# Caveats (as of 3.8.2):
7-
# - ARM64 Windows builds exit with an assert and hang with asserts disabled. [FIX MERGED]
8-
# - CMake builds override -NDEBUG and do not allow building with this option. [FIX MERGED]
6+
# Caveats (as of 3.9.0):
7+
# - CMake builds override -NDEBUG and do not allow building with this option. [FIX MERGED THEN LOST] https://github.com/libressl/portable/pull/988
98
# - ASM support only for x64.
10-
# - ASM missing Intel CET support, resulting in linker warnings:
11-
# ld.lld-17: warning: libressl/_x64-linux-gnu/usr/lib/libcrypto.a(cpuid-elf-x86_64.S.o): -z cet-report: file does not have GNU_PROPERTY_X86_FEATURE_1_IBT property
12-
# ld.lld-17: warning: libressl/_x64-linux-gnu/usr/lib/libcrypto.a(cpuid-elf-x86_64.S.o): -z cet-report: file does not have GNU_PROPERTY_X86_FEATURE_1_SHSTK property
13-
# https://github.com/curl/curl-for-win/actions/runs/7159857921/job/19493575609#step:3:11146
149
# - Not possible to hide most ASM symbols from shared lib exports in Linux, macOS.
1510
# https://github.com/libressl/portable/issues/957
1611
# Local patch exists for this, or ASM can be disabled.
17-
# - Non-namespaced functions are defined and exported from libcrypto. [fix pending]
12+
# - Non-namespaced functions are defined and exported from libcrypto. [FIXED IN 3.9.0?]
1813
# This causes a list of issues, from mis-detection, mis-use, unhidden
1914
# export from shared lib. Mostly affects macOS.
2015
# https://github.com/libressl/portable/issues/928

0 commit comments

Comments
 (0)