diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2026-01-31 14:49:17 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2026-02-04 07:59:46 +0000 |
| commit | ddbbc1e781e1c148534832f83ec4fac52d429c6a (patch) | |
| tree | 02b50d039ab97f99d520181719b8ad5d5d243376 | |
| parent | 68ecb06061d9baafe34b55bca774cb958e08c9a0 (diff) | |
security/openssl-quictls: Unbreak port
* And mark expiration (long overdue)
MFH: 2026Q1
| -rw-r--r-- | security/openssl-quictls/Makefile | 5 | ||||
| -rw-r--r-- | security/openssl-quictls/files/patch-crypto_async_arch_async__posix.h | 32 |
2 files changed, 35 insertions, 2 deletions
diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 1aec30d6868c..74fad5355b31 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -17,6 +17,9 @@ CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3 BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free +DEPRECATED= Upstream project has been archived, use security/quictls +EXPIRATION_DATE=2025-12-31 + HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config CONFIGURE_ENV= PERL="${PERL}" @@ -35,8 +38,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 MODULES 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/openssl-quictls/files/patch-crypto_async_arch_async__posix.h b/security/openssl-quictls/files/patch-crypto_async_arch_async__posix.h new file mode 100644 index 000000000000..b544aed6932a --- /dev/null +++ b/security/openssl-quictls/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> + |