Attachment #249443 for bug #277915

Lines 1-6 Link Here

(-)b/security/openssl111/Makefile (-1 / +1 lines)
1	PORTNAME= openssl	1	PORTNAME= openssl
2	PORTVERSION= 1.1.1w	2	PORTVERSION= 1.1.1w
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= security devel	4	CATEGORIES= security devel
5	MASTER_SITES= https://www.openssl.org/source/ \	5	MASTER_SITES= https://www.openssl.org/source/ \
6	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/	6	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/




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>
 

Lines 1-6 Link Here

(-)b/security/openssl31/Makefile (-1 / +1 lines)
1	PORTNAME= openssl	1	PORTNAME= openssl
2	PORTVERSION= 3.1.5	2	PORTVERSION= 3.1.5
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= security devel	4	CATEGORIES= security devel
5	MASTER_SITES= https://www.openssl.org/source/ \	5	MASTER_SITES= https://www.openssl.org/source/ \
6	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/	6	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/




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>
 

Lines 1-6 Link Here

(-)b/security/openssl32/Makefile (-1 / +1 lines)
1	PORTNAME= openssl	1	PORTNAME= openssl
2	DISTVERSION= 3.2.1	2	DISTVERSION= 3.2.1
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= security devel	4	CATEGORIES= security devel
5	MASTER_SITES= https://www.openssl.org/source/ \	5	MASTER_SITES= https://www.openssl.org/source/ \
6	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/	6	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/




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>
 

Lines 1-5 Link Here

(-)b/security/openssl33/Makefile (+1 lines)
1	PORTNAME= openssl	1	PORTNAME= openssl
2	DISTVERSION= 3.3.0-alpha1	2	DISTVERSION= 3.3.0-alpha1
		3	PATCHREVISION= 1
3	CATEGORIES= security devel	4	CATEGORIES= security devel
4	MASTER_SITES= https://www.openssl.org/source/ \	5	MASTER_SITES= https://www.openssl.org/source/ \
5	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/	6	ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/




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>
 

Return to bug 277915

Added Link Here

(-)b/security/openssl111/files/patch-openssl-exprun.diff (+32 lines)
1	commit e883812f463c1623249e038698ccaddf2baa34d8
2	Author: Warner Losh <imp@FreeBSD.org>
3	Date: Mon Mar 18 19:48:22 2024 -0600
4
5	posix_async: FreeBSD also defines {make\|swap\|get\|set}context
6
7	FreeBSD also defines {make\|swap\|get\|set}context for backward
8	compatibility, despite also exposing POSIX_VERSION 200809L
9	in FreeBSD 15-current.
10
11	Note: There's no fallback for POSIX_VERSION 200809 without these
12	routines, so maybe that should be a #error? ... But that's a questionf
13	or upstream.
14
15	FreeBSD has defined these interfaces since FreeBSD 4.7, released over 20
16	years ago, so no further nuance in FreeBSD version number is necessary.
17
18	Pull Request: https://github.com/openssl/openssl/pull/23885
19
20	diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
21	index a17c6b8e68af..2d97ec3acc9b 100644
22	--- crypto/async/arch/async_posix.h
23	+++ crypto/async/arch/async_posix.h
24	@@ -18,7 +18,7 @@
25	# include <unistd.h>
26
27	# if _POSIX_VERSION >= 200112L \
28	- && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__))
29	+ && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__) \|\| defined(__FreeBSD__))
30
31	# include <pthread.h>
32

Added Link Here

(-)b/security/openssl31/files/patch-openssl-exprun.diff (+32 lines)
1	commit e883812f463c1623249e038698ccaddf2baa34d8
2	Author: Warner Losh <imp@FreeBSD.org>
3	Date: Mon Mar 18 19:48:22 2024 -0600
4
5	posix_async: FreeBSD also defines {make\|swap\|get\|set}context
6
7	FreeBSD also defines {make\|swap\|get\|set}context for backward
8	compatibility, despite also exposing POSIX_VERSION 200809L
9	in FreeBSD 15-current.
10
11	Note: There's no fallback for POSIX_VERSION 200809 without these
12	routines, so maybe that should be a #error? ... But that's a questionf
13	or upstream.
14
15	FreeBSD has defined these interfaces since FreeBSD 4.7, released over 20
16	years ago, so no further nuance in FreeBSD version number is necessary.
17
18	Pull Request: https://github.com/openssl/openssl/pull/23885
19
20	diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
21	index a17c6b8e68af..2d97ec3acc9b 100644
22	--- crypto/async/arch/async_posix.h
23	+++ crypto/async/arch/async_posix.h
24	@@ -18,7 +18,7 @@
25	# include <unistd.h>
26
27	# if _POSIX_VERSION >= 200112L \
28	- && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__))
29	+ && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__) \|\| defined(__FreeBSD__))
30
31	# include <pthread.h>
32

Added Link Here

(-)b/security/openssl32/files/patch-openssl-exprun.diff (+32 lines)
1	commit e883812f463c1623249e038698ccaddf2baa34d8
2	Author: Warner Losh <imp@FreeBSD.org>
3	Date: Mon Mar 18 19:48:22 2024 -0600
4
5	posix_async: FreeBSD also defines {make\|swap\|get\|set}context
6
7	FreeBSD also defines {make\|swap\|get\|set}context for backward
8	compatibility, despite also exposing POSIX_VERSION 200809L
9	in FreeBSD 15-current.
10
11	Note: There's no fallback for POSIX_VERSION 200809 without these
12	routines, so maybe that should be a #error? ... But that's a questionf
13	or upstream.
14
15	FreeBSD has defined these interfaces since FreeBSD 4.7, released over 20
16	years ago, so no further nuance in FreeBSD version number is necessary.
17
18	Pull Request: https://github.com/openssl/openssl/pull/23885
19
20	diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
21	index a17c6b8e68af..2d97ec3acc9b 100644
22	--- crypto/async/arch/async_posix.h
23	+++ crypto/async/arch/async_posix.h
24	@@ -18,7 +18,7 @@
25	# include <unistd.h>
26
27	# if _POSIX_VERSION >= 200112L \
28	- && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__))
29	+ && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__) \|\| defined(__FreeBSD__))
30
31	# include <pthread.h>
32

Added Link Here

(-)b/security/openssl33/files/patch-openssl-exprun.diff (-1 / +32 lines)
0	-	1	commit e883812f463c1623249e038698ccaddf2baa34d8
		2	Author: Warner Losh <imp@FreeBSD.org>
		3	Date: Mon Mar 18 19:48:22 2024 -0600
		4
		5	posix_async: FreeBSD also defines {make\|swap\|get\|set}context
		6
		7	FreeBSD also defines {make\|swap\|get\|set}context for backward
		8	compatibility, despite also exposing POSIX_VERSION 200809L
		9	in FreeBSD 15-current.
		10
		11	Note: There's no fallback for POSIX_VERSION 200809 without these
		12	routines, so maybe that should be a #error? ... But that's a questionf
		13	or upstream.
		14
		15	FreeBSD has defined these interfaces since FreeBSD 4.7, released over 20
		16	years ago, so no further nuance in FreeBSD version number is necessary.
		17
		18	Pull Request: https://github.com/openssl/openssl/pull/23885
		19
		20	diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
		21	index a17c6b8e68af..2d97ec3acc9b 100644
		22	--- crypto/async/arch/async_posix.h
		23	+++ crypto/async/arch/async_posix.h
		24	@@ -18,7 +18,7 @@
		25	# include <unistd.h>
		26
		27	# if _POSIX_VERSION >= 200112L \
		28	- && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__))
		29	+ && (_POSIX_VERSION < 200809L \|\| defined(__GLIBC__) \|\| defined(__FreeBSD__))
		30
		31	# include <pthread.h>
		32