CVS commit: pkgsrc/security/openssl

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Apr 22 09:32:40 UTC 2021

Modified Files:
        pkgsrc/security/openssl: distinfo
Added Files:
        pkgsrc/security/openssl/patches: patch-include_openssl_e__os2.h

Log Message:
Fix c++17 and openssl on solaris/illumos

gcc on solaris/illumos defines __STDC_VERSION__ in c++ mode where _Noreturn
does not exist.
This causes breakage when building c++17 programs that use openssl.


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 pkgsrc/security/openssl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/openssl/patches/patch-include_openssl_e__os2.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssl/distinfo
diff -u pkgsrc/security/openssl/distinfo:1.149 pkgsrc/security/openssl/distinfo:1.150
--- pkgsrc/security/openssl/distinfo:1.149      Thu Mar 25 16:36:19 2021
+++ pkgsrc/security/openssl/distinfo    Thu Apr 22 09:32:39 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.149 2021/03/25 16:36:19 jperkin Exp $
+$NetBSD: distinfo,v 1.150 2021/04/22 09:32:39 nros Exp $
 
 SHA1 (openssl-1.1.1k.tar.gz) = bad9dc4ae6dcc1855085463099b5dacb0ec6130b
 RMD160 (openssl-1.1.1k.tar.gz) = 5c9fbbeae7d115e59be705162e58195517a37cae
@@ -7,3 +7,4 @@ Size (openssl-1.1.1k.tar.gz) = 9823400 b
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = cf6b46c6e10e84100beb468bbe6f85c5e62cbe7a
 SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
+SHA1 (patch-include_openssl_e__os2.h) = d2f08d50fe44da37c6399665c09abe0e1f06429b

Added files:

Index: pkgsrc/security/openssl/patches/patch-include_openssl_e__os2.h
diff -u /dev/null pkgsrc/security/openssl/patches/patch-include_openssl_e__os2.h:1.1
--- /dev/null   Thu Apr 22 09:32:40 2021
+++ pkgsrc/security/openssl/patches/patch-include_openssl_e__os2.h      Thu Apr 22 09:32:40 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_openssl_e__os2.h,v 1.1 2021/04/22 09:32:40 nros Exp $
+
+* gcc on Solaris/lllumos defines __STDC_VERSION__ in c++ mode where _Noreturn
+  does not exist, this breaks c++17 builds that use openssl.
+
+  filed upstream: https://github.com/openssl/openssl/pull/14944
+
+--- include/openssl/e_os2.h.orig       2021-04-22 08:37:49.922502161 +0000
++++ include/openssl/e_os2.h
+@@ -279,7 +279,8 @@ typedef unsigned __int64 uint64_t;
+ #  define ossl_inline inline
+ # endif
+ 
+-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
++     !defined(__cplusplus)
+ #  define ossl_noreturn _Noreturn
+ # elif defined(__GNUC__) && __GNUC__ >= 2
+ #  define ossl_noreturn __attribute__((noreturn))