mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

security/openssl: Fix for POSIX_VERSION 200809L

Browse Source 
* See https://github.com/openssl/openssl/pull/23885

PR:		273869
Reported by:	imp
Submitted by:	vvd
This commit is contained in:
Bernard Spil 2024-03-31 15:04:52 +02:00
parent 87ef391da2
commit 36dad62078
7 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/openssl-quictls/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= openssl
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 3.0.13
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONSUFFIX= -quic1
CATEGORIES= security devel
PKGNAMESUFFIX= -${GH_ACCOUNT}
@ -35,6 +35,8 @@ 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

2
security/openssl/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= openssl
PORTVERSION= 3.0.13
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= security devel
MASTER_SITES= https://www.openssl.org/source/ \

32
security/openssl/files/patch-crypto_async_arch_async__posix.h Normal file
View File

@ -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>

4
security/openssl111/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= openssl
PORTVERSION= 1.1.1w
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security devel
MASTER_SITES= https://www.openssl.org/source/ \
ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@ -34,6 +34,8 @@ 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

3
security/openssl31-quictls/Makefile
View File

@ -1,6 +1,7 @@
PORTNAME= openssl
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 3.1.5
PORTREVISION= 1
DISTVERSIONSUFFIX= -quic1
CATEGORIES= security devel
PKGNAMESUFFIX= 31-quictls
@ -34,6 +35,8 @@ 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

4
security/openssl31/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= openssl
PORTVERSION= 3.1.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security devel
MASTER_SITES= https://www.openssl.org/source/ \
ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@ -32,6 +32,8 @@ 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

4
security/openssl32/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= openssl
DISTVERSION= 3.2.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security devel
MASTER_SITES= https://www.openssl.org/source/ \
ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@ -30,6 +30,8 @@ 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 COMPRESSION HASHES MODULES OPTIMIZE PROTOCOLS
OPTIONS_GROUP_CIPHERS= ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS
OPTIONS_GROUP_COMPRESSION= BROTLI ZLIB ZSTD