diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2026-01-31 14:51:30 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2026-02-04 07:59:46 +0000 |
| commit | d117e83d514d968e040d50e61daddb5beea3c1b0 (patch) | |
| tree | 06d6072768a32330953af27dc09962317c74799b | |
| parent | ddbbc1e781e1c148534832f83ec4fac52d429c6a (diff) | |
security/openssl111: Unbreak port
MFH: 2026Q1
| -rw-r--r-- | security/openssl111/Makefile | 2 | ||||
| -rw-r--r-- | security/openssl111/files/patch-crypto_async_arch_async__posix.h | 32 |
2 files changed, 32 insertions, 2 deletions
diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile index 3621a9c8a7de..44ee41731e46 100644 --- a/security/openssl111/Makefile +++ b/security/openssl111/Makefile @@ -34,8 +34,6 @@ LDFLAGS_i386= -Wl,-znotext MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}" MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= -EXTRA_PATCHES+= ${.CURDIR}/../openssl/files/patch-crypto_async_arch_async__posix.h - OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS OPTIONS_GROUP_CIPHERS= ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160 SM2 SM3 diff --git a/security/openssl111/files/patch-crypto_async_arch_async__posix.h b/security/openssl111/files/patch-crypto_async_arch_async__posix.h new file mode 100644 index 000000000000..b544aed6932a --- /dev/null +++ b/security/openssl111/files/patch-crypto_async_arch_async__posix.h @@ -0,0 +1,32 @@ +commit e883812f463c1623249e038698ccaddf2baa34d8 +Author: Warner Losh <imp@FreeBSD.org> +Date: Mon Mar 18 19:48:22 2024 -0600 + + posix_async: FreeBSD also defines {make|swap|get|set}context + + FreeBSD also defines {make|swap|get|set}context for backward + compatibility, despite also exposing POSIX_VERSION 200809L + in FreeBSD 15-current. + + Note: There's no fallback for POSIX_VERSION 200809 without these + routines, so maybe that should be a #error? ... But that's a questionf + or upstream. + + FreeBSD has defined these interfaces since FreeBSD 4.7, released over 20 + years ago, so no further nuance in FreeBSD version number is necessary. + + Pull Request: https://github.com/openssl/openssl/pull/23885 + +diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h +index a17c6b8e68af..2d97ec3acc9b 100644 +--- crypto/async/arch/async_posix.h ++++ crypto/async/arch/async_posix.h +@@ -18,7 +18,7 @@ + # include <unistd.h> + + # if _POSIX_VERSION >= 200112L \ +- && (_POSIX_VERSION < 200809L || defined(__GLIBC__)) ++ && (_POSIX_VERSION < 200809L || defined(__GLIBC__) || defined(__FreeBSD__)) + + # include <pthread.h> + |