From nobody Sun Mar 31 13:07:52 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V6vZd2BrBz5G1kT; Sun, 31 Mar 2024 13:07:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V6vZd0X16z4Rbt; Sun, 31 Mar 2024 13:07:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711890473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dot/2SRKqeNAHrqn9642UQo/QL50W3jz3186hRjJWZQ=; b=Zl8e5ymQ4y5exiJ7gAWs3TF5uRViltm21Bng2U7B0vpaZ3Tuj3QNd+bzJkmgnr3AvO2py0 RrBqFrykUVrqUa/hDLNtTBd3SzyetM3PfwbA6YKq9EFJoT73qXi2Sj6PqVuPiy5HZf35Qk MZb/8RbWZBx4eqeTLO9jzW3zYCSlfB/fm0GQeTCCvDs51JsI5W+8HV9Ijf0cXOGjExqYaE 4ZHuWfrR92iVHayN5iID8bs/UthciCuVEyHLtFsWQgn5v9V4Sm0n9oOs26YAT32FTLvkGe wmdG6qKrzLj62XRcA2BNIkWFXeXNYP0G98fQlbnkyS8CNNh/SmH8rOF3Id1UFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711890473; a=rsa-sha256; cv=none; b=hk7UBTGAz1kw81aEqHV1O/dVXusbC7kpcLPDTTkPRWUn6/eEKVxY8zwz3lgOUHl6ATD6gs r9CNk3rv9FgF1dj3lutdLealCQJVAP9MzcqA0mNOD0scpBYq5Usdf+33g61+2SPh2eR7rL ZJigk+Pz4e9xFq0nL+PW/CIfJtrztdFRSQcS9HaezeQk+NcXXp4jPcAS2eUS0lYBiEfLlH b2PDxvLCaR+SYpNrt12+EZikngxu2jnoy7YbG1zjN80sapclyYyW1A6d+kmLcutv8/++uB iDRm+RZnE5/adsRHVXk5+nObgY1TTkPd5X6FA14jXmwh4xr8CkhCq+O9p87VKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711890473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dot/2SRKqeNAHrqn9642UQo/QL50W3jz3186hRjJWZQ=; b=stptQ29XxUaiiaWhGlaPngextpNg8IFho82yxCs/tTNYrxxZljuWclnB2cckpKDAsWh7Dl j3RDxER6S4V9QQ1DEGoZtLKhem94gAfH/VuVbpRvshjDhYBuOsz79SoqikoKkQuuJXQNCS 7EdX71P1qoTRUNxZY8QjN0tVDSAFSrQsV2q52xcHMXiTRnmsSFeFzloHWHpIEiNSo8zxzK D2UKY8UVTxwFdsAPd9ZOIyWajJDGezk7ElygsPZEywBb6YM7GEa+bO6pU/WFkYEi+QP5I9 ZRtf8edo08hy38DGTFnPbVekO0TspC75tGVRKg8YDmJF8Y0BS7TrpvAzZiz8ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V6vZd07YTzdn5; Sun, 31 Mar 2024 13:07:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42VD7qLB049513; Sun, 31 Mar 2024 13:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42VD7qAC049510; Sun, 31 Mar 2024 13:07:52 GMT (envelope-from git) Date: Sun, 31 Mar 2024 13:07:52 GMT Message-Id: <202403311307.42VD7qAC049510@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 36dad620780f - main - security/openssl: Fix for POSIX_VERSION 200809L List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36dad620780f4b8b5c523c05c57b1c82dbd42202 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=36dad620780f4b8b5c523c05c57b1c82dbd42202 commit 36dad620780f4b8b5c523c05c57b1c82dbd42202 Author: Bernard Spil AuthorDate: 2024-03-31 13:04:52 +0000 Commit: Bernard Spil CommitDate: 2024-03-31 13:04:52 +0000 security/openssl: Fix for POSIX_VERSION 200809L * See https://github.com/openssl/openssl/pull/23885 PR: 273869 Reported by: imp Submitted by: vvd --- security/openssl-quictls/Makefile | 4 ++- security/openssl/Makefile | 2 +- .../files/patch-crypto_async_arch_async__posix.h | 32 ++++++++++++++++++++++ security/openssl111/Makefile | 4 ++- security/openssl31-quictls/Makefile | 3 ++ security/openssl31/Makefile | 4 ++- security/openssl32/Makefile | 4 ++- 7 files changed, 48 insertions(+), 5 deletions(-) diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 88be5ac5db70..22f04cf8ea2d 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -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 diff --git a/security/openssl/Makefile b/security/openssl/Makefile index ddae244b16b5..f87321fdb628 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -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/ \ diff --git a/security/openssl/files/patch-crypto_async_arch_async__posix.h b/security/openssl/files/patch-crypto_async_arch_async__posix.h new file mode 100644 index 000000000000..b544aed6932a --- /dev/null +++ b/security/openssl/files/patch-crypto_async_arch_async__posix.h @@ -0,0 +1,32 @@ +commit e883812f463c1623249e038698ccaddf2baa34d8 +Author: Warner Losh +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 + + # if _POSIX_VERSION >= 200112L \ +- && (_POSIX_VERSION < 200809L || defined(__GLIBC__)) ++ && (_POSIX_VERSION < 200809L || defined(__GLIBC__) || defined(__FreeBSD__)) + + # include + diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile index a0d1289fc06b..d076b697b980 100644 --- a/security/openssl111/Makefile +++ b/security/openssl111/Makefile @@ -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 diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile index 366b7b265689..e37460731417 100644 --- a/security/openssl31-quictls/Makefile +++ b/security/openssl31-quictls/Makefile @@ -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 diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index 4e8821af1d5f..30cfce427510 100644 --- a/security/openssl31/Makefile +++ b/security/openssl31/Makefile @@ -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 diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile index f110a9ebf574..eba26a7554a9 100644 --- a/security/openssl32/Makefile +++ b/security/openssl32/Makefile @@ -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