From 1b77a80e592ea91273a1a2cb36658796bc6e48a9 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 6 Oct 2023 21:31:44 +0200
Subject: [PATCH] openssl3: update to 3.0.11

---
 openssl3/build.sh                             | 10 +++---
 openssl3/meta/ChangeLog                       |  3 ++
 ...0004-Fix-build-with-posix95-pthreads.patch | 36 -------------------
 3 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 openssl3/src/0004-Fix-build-with-posix95-pthreads.patch

diff --git a/openssl3/build.sh b/openssl3/build.sh
index 4f6913f..8f089e1 100755
--- a/openssl3/build.sh
+++ b/openssl3/build.sh
@@ -6,17 +6,16 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssl
-version=3.0.10
+version=3.0.11
 pkgver=1
 source[0]=https://openssl.org/source/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
 patch[0]=0001-Fix-fallback-for-missing-getaddrinfo.patch
 patch[1]=0002-Include-sys-atomic.h-directly-on-Solaris.patch
 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
+patch[3]=0005-Handle-missing-stdint.h-on-older-Solaris.patch
+patch[4]=0006-Handle-missing-strtoumax.patch
+patch[5]=0007-Use-target-CPU-choice-on-SPARC.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@@ -88,6 +87,7 @@ install()
     compat openssl 3.0.5 1 1
     compat openssl 3.0.7 1 1
     compat openssl 3.0.9 1 1
+    compat openssl 3.0.10 1 1
 }
 
 reg pack
diff --git a/openssl3/meta/ChangeLog b/openssl3/meta/ChangeLog
index b1705cf..4d0624d 100644
--- a/openssl3/meta/ChangeLog
+++ b/openssl3/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Fri Oct 06 2023 Tom G. Christensen <swpkg@jupiterrise.com> - 3.0.11-1
+- Update to 3.0.11
+
 * Wed Sep 13 2023 Tom G. Christensen <swpkg@jupiterrise.com> - 3.0.10-1
 - Update to 3.0.10
 
diff --git a/openssl3/src/0004-Fix-build-with-posix95-pthreads.patch b/openssl3/src/0004-Fix-build-with-posix95-pthreads.patch
deleted file mode 100644
index 3818835..0000000
--- a/openssl3/src/0004-Fix-build-with-posix95-pthreads.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a9fe9b331833dad69c252b102c6fd2f2f1a2bc92 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/7] Fix build with posix95 pthreads
-
-Solaris 2.6 only conforms to POSIX.1c pthreads which has no mutex
-attribute support.
----
- crypto/threads_pthread.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
-index 5e2cec6bb6..4350c8dbbf 100644
---- a/crypto/threads_pthread.c
-+++ b/crypto/threads_pthread.c
-@@ -70,10 +70,14 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
-      */
-     pthread_mutexattr_init(&attr);
- #  if !defined (__TANDEM) && !defined (_SPT_MODEL_)
--#   if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK)
--    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
-+#   if defined(PTHREAD_MUTEX_NORMAL)
-+#    if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK)
-+     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
-+#    else
-+     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
-+#    endif
- #   else
--    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
-+     /* Assume POSIX.1c threads with no MUTEX type attribute. */
- #   endif
- #  else
-     /* The SPT Thread Library does not define MUTEX attributes. */
--- 
-2.31.1
-