Attachment 249443 Details for Bug 277915 – ports git-format-patch changes

[patch] ports git-format-patch changes

exp-run-ports-posix-version.diff (text/plain), 8.43 KB, created by Warner Losh on 2024-03-24 11:07:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Warner Losh

Created: 2024-03-24 11:07:56 UTC

Size: 8.43 KB

patch

obsolete

>From 1edb3a2c5e9cbcc55b29b8fd9e392e71d50486db Mon Sep 17 00:00:00 2001
>From: Warner Losh <imp@FreeBSD.org>
>Date: Sun, 24 Mar 2024 04:39:47 -0600
>Subject: [PATCH] security/openssl*: Exprun test
>
>Make the same change I made to base to all the ports.
>
>Sponsored by:		Netflix
>---
> security/openssl111/Makefile                  |  2 +-
> .../files/patch-openssl-exprun.diff           | 32 +++++++++++++++++++
> security/openssl31/Makefile                   |  2 +-
> .../openssl31/files/patch-openssl-exprun.diff | 32 +++++++++++++++++++
> security/openssl32/Makefile                   |  2 +-
> .../openssl32/files/patch-openssl-exprun.diff | 32 +++++++++++++++++++
> security/openssl33/Makefile                   |  1 +
> .../openssl33/files/patch-openssl-exprun.diff | 32 +++++++++++++++++++
> 8 files changed, 132 insertions(+), 3 deletions(-)
> create mode 100644 security/openssl111/files/patch-openssl-exprun.diff
> create mode 100644 security/openssl31/files/patch-openssl-exprun.diff
> create mode 100644 security/openssl32/files/patch-openssl-exprun.diff
> create mode 100644 security/openssl33/files/patch-openssl-exprun.diff
>
>diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile
>index a0d1289fc06b..b7256d3f96af 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/
>diff --git a/security/openssl111/files/patch-openssl-exprun.diff b/security/openssl111/files/patch-openssl-exprun.diff
>new file mode 100644
>index 000000000000..3dc20b44928a
>--- /dev/null
>+++ b/security/openssl111/files/patch-openssl-exprun.diff
>@@ -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>
>+ 
>diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile
>index 4e8821af1d5f..2510e606d7ed 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/
>diff --git a/security/openssl31/files/patch-openssl-exprun.diff b/security/openssl31/files/patch-openssl-exprun.diff
>new file mode 100644
>index 000000000000..3dc20b44928a
>--- /dev/null
>+++ b/security/openssl31/files/patch-openssl-exprun.diff
>@@ -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>
>+ 
>diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile
>index f110a9ebf574..9db1ecc146e7 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/
>diff --git a/security/openssl32/files/patch-openssl-exprun.diff b/security/openssl32/files/patch-openssl-exprun.diff
>new file mode 100644
>index 000000000000..3dc20b44928a
>--- /dev/null
>+++ b/security/openssl32/files/patch-openssl-exprun.diff
>@@ -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>
>+ 
>diff --git a/security/openssl33/Makefile b/security/openssl33/Makefile
>index 85198c07e44d..5f6a1c26ff6b 100644
>--- a/security/openssl33/Makefile
>+++ b/security/openssl33/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	openssl
> DISTVERSION=	3.3.0-alpha1
>+PATCHREVISION=	1
> CATEGORIES=	security devel
> MASTER_SITES=	https://www.openssl.org/source/ \
> 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
>diff --git a/security/openssl33/files/patch-openssl-exprun.diff b/security/openssl33/files/patch-openssl-exprun.diff
>new file mode 100644
>index 000000000000..3dc20b44928a
>--- /dev/null
>+++ b/security/openssl33/files/patch-openssl-exprun.diff
>@@ -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>
>+ 
>-- 
>2.43.2
>

Actions: View | Diff

Attachments on bug 277915: 249443 | 249444 | 249580