openssl3: update to 3.0.2

openssl3/build.sh

@@ -6,7 +6,7 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssl
-version=3.0.0
+version=3.0.2
 pkgver=1
 source[0]=https://openssl.org/source/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
@@ -16,6 +16,7 @@ patch[2]=0003-Provide-socklen_t-on-Solaris-2.6.patch
 patch[3]=0004-Fix-build-with-posix95-pthreads.patch
 patch[4]=0005-Handle-missing-stdint.h-on-older-Solaris.patch
 patch[5]=0006-Handle-missing-strtoumax.patch
+patch[6]=0007-Use-target-CPU-choice-on-SPARC.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@@ -30,7 +31,7 @@ configure_args=(--prefix=$prefix --openssldir=${prefix}/${_sharedir}/ssl --with-
 if [ "$arch" = "sparc" ]; then
     configure_args+=(solaris-sparc${gcc_arch}-gcc)
 else
-    configure_args+=(solaris-x86-gcc 386)
+    configure_args+=(386 solaris-x86-gcc)
     configure_args+=(CFLAGS="-march=${gcc_arch}")
 fi
 configure_args+=(LDFLAGS="-L$prefix/lib -R$prefix/lib -lposix4")
@@ -40,6 +41,10 @@ reg prep
 prep()
 {
     generic_prep
+    setdir source
+    # gcc < 4.6.0 will not link -lpthread when -pthread is combined
+    # with -shared (see PR target/18788)
+    ${__gsed} -i '/ex_libs/ s/-pthread/-lpthread/' Configurations/10-main.conf
 }
 
 reg build

openssl3/meta/ChangeLog

@@ -1,4 +1,10 @@
 CHANGELOG
 ---------
+* Tue Mar 22 2022 Tom G. Christensen <swpkg@jupiterrise.com> - 3.0.2-1
+- Update to 3.0.2
+
+* Sat Jan 01 2022 Tom G. Christensen <swpkg@jupiterrise.com> - 3.0.1-1
+- Update to 3.0.1
+
 * Sun Nov 14 2021 Tom G. Christensen <swpkg@jupiterrise.com> - 3.0.0-1
 - First release

openssl3/src/0001-Fix-fallback-for-missing-getaddrinfo.patch

@@ -1,7 +1,7 @@
-From 4b50edca4dfb70ba36ece8dfb457c2c52dd65065 Mon Sep 17 00:00:00 2001
+From 524f98565bcb90c0df8cbbd5dea215de945ff2b3 Mon Sep 17 00:00:00 2001
 From: "Tom G. Christensen" <tgc@jupiterrise.com>
 Date: Wed, 27 Oct 2021 20:15:30 +0200
-Subject: [PATCH 1/6] Fix fallback for missing getaddrinfo()
+Subject: [PATCH 1/7] Fix fallback for missing getaddrinfo()
 
 Allow port 0 which is what the testsuite uses.
 ---

openssl3/src/0002-Include-sys-atomic.h-directly-on-Solaris.patch

@@ -1,7 +1,7 @@
-From 9aa7d4ac148ac0b9aa695936d6f5d01ab198f05c Mon Sep 17 00:00:00 2001
+From f1afddaeb70d98047dc52c07b943b9d1c0282c4a Mon Sep 17 00:00:00 2001
 From: "Tom G. Christensen" <tgc@jupiterrise.com>
 Date: Wed, 27 Oct 2021 20:38:52 +0200
-Subject: [PATCH 2/6] Include <sys/atomic.h> directly on Solaris
+Subject: [PATCH 2/7] Include <sys/atomic.h> directly on Solaris
 
 Only Solaris 10 has <atomic.h> and it is only a wrapper around
 <sys/atomic.h>.

openssl3/src/0003-Provide-socklen_t-on-Solaris-2.6.patch

@@ -1,7 +1,7 @@
-From 6266f902d2e12987812060db6fad106e1614dc13 Mon Sep 17 00:00:00 2001
+From bb038a4df281e1104f6748d8dcc2803ea9728dd5 Mon Sep 17 00:00:00 2001
 From: "Tom G. Christensen" <tgc@jupiterrise.com>
 Date: Wed, 27 Oct 2021 20:48:25 +0200
-Subject: [PATCH 3/6] Provide socklen_t on Solaris 2.6
+Subject: [PATCH 3/7] Provide socklen_t on Solaris 2.6
 
 ---
  crypto/bio/bio_local.h | 4 ++++

openssl3/src/0004-Fix-build-with-posix95-pthreads.patch

@@ -1,7 +1,7 @@
-From 6abfca6f0805c0c3e9b6bd0e7298ce01962f08b8 Mon Sep 17 00:00:00 2001
+From 2c9c6a7cb7b9cbf8ee68bb55b29313a26d0d43bd Mon Sep 17 00:00:00 2001
 From: "Tom G. Christensen" <tgc@jupiterrise.com>
 Date: Wed, 27 Oct 2021 20:52:24 +0200
-Subject: [PATCH 4/6] Fix build with posix95 pthreads
+Subject: [PATCH 4/7] Fix build with posix95 pthreads
 
 Solaris 2.6 only conforms to POSIX.1c pthreads which has no mutex
 attribute support.

openssl3/src/0005-Handle-missing-stdint.h-on-older-Solaris.patch

@@ -1,7 +1,7 @@
-From da14a764a1a533bb6043fa9e682256fe6c02772f Mon Sep 17 00:00:00 2001
+From 0d98913eefc39e7fed780a0c1affbb8356ce29b8 Mon Sep 17 00:00:00 2001
 From: "Tom G. Christensen" <tgc@jupiterrise.com>
 Date: Wed, 27 Oct 2021 21:33:59 +0200
-Subject: [PATCH 5/6] Handle missing <stdint.h> on older Solaris
+Subject: [PATCH 5/7] Handle missing <stdint.h> on older Solaris
 
 Basically we assume that if we are on a Solaris platform with gcc older
 than 4.5 then <stdint.h> is not available.

openssl3/src/0006-Handle-missing-strtoumax.patch

@@ -1,7 +1,7 @@
-From 749b94c6b91e1abdbd7acb816ac901336c81a911 Mon Sep 17 00:00:00 2001
+From 9a352568d247db4f471dc6e1ba3a62180a63e3ee Mon Sep 17 00:00:00 2001
 From: "Tom G. Christensen" <tgc@jupiterrise.com>
 Date: Thu, 28 Oct 2021 21:33:49 +0200
-Subject: [PATCH 6/6] Handle missing strtoumax
+Subject: [PATCH 6/7] Handle missing strtoumax
 
 ---
  test/params_conversion_test.c | 2 +-

openssl3/src/0007-Use-target-CPU-choice-on-SPARC.patch

@@ -0,0 +1,57 @@
+From cfefa89777a03a2fe8875cb761ffc0d2b9c2d650 Mon Sep 17 00:00:00 2001
+From: "Tom G. Christensen" <tgc@jupiterrise.com>
+Date: Sun, 2 Jan 2022 15:51:24 +0100
+Subject: [PATCH 7/7] Use target CPU choice on SPARC
+
+This code would take the capabilities of the buildhost cpu at buildtime
+and override the compiler target choice, e.g. a solaris-sparcv8-gcc
+build would have SPARC_DES_CAPABLE defined causing a missing symbol
+error later since the sparcv9 DES code is not included in this target.
+---
+ crypto/evp/e_des.c            | 2 +-
+ crypto/evp/e_des3.c           | 2 +-
+ include/crypto/des_platform.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c
+index cd6e5af8d0..8faaacea3f 100644
+--- a/crypto/evp/e_des.c
++++ b/crypto/evp/e_des.c
+@@ -34,7 +34,7 @@ typedef struct {
+     } stream;
+ } EVP_DES_KEY;
+ 
+-# if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
++# if defined(AES_ASM) && ((defined(__sparc) || defined(__sparc__)) && defined(__sparc_v9__))
+ /* ----------^^^ this is not a typo, just a way to detect that
+  * assembler support was in general requested... */
+ #  include "crypto/sparc_arch.h"
+diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
+index 1e15918344..1528491882 100644
+--- a/crypto/evp/e_des3.c
++++ b/crypto/evp/e_des3.c
+@@ -37,7 +37,7 @@ typedef struct {
+ # define ks2 ks.ks[1]
+ # define ks3 ks.ks[2]
+ 
+-# if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
++# if defined(AES_ASM) && ((defined(__sparc) || defined(__sparc__)) && defined(__sparc_v9__))
+ /* ---------^^^ this is not a typo, just a way to detect that
+  * assembler support was in general requested... */
+ #  include "crypto/sparc_arch.h"
+diff --git a/include/crypto/des_platform.h b/include/crypto/des_platform.h
+index 07ea1ddd0a..95015f3336 100644
+--- a/include/crypto/des_platform.h
++++ b/include/crypto/des_platform.h
+@@ -11,7 +11,7 @@
+ # define OSSL_DES_PLATFORM_H
+ # pragma once
+ 
+-# if defined(DES_ASM) && (defined(__sparc) || defined(__sparc__))
++# if defined(DES_ASM) && ((defined(__sparc) || defined(__sparc__)) && defined(__sparc_v9__))
+ 
+ /* Fujitsu SPARC64 X support */
+ #  include "crypto/sparc_arch.h"
+-- 
+2.27.0
+