From 112d610a3bbe6b97930c90a8d2d4ba8cee09a5e1 Mon Sep 17 00:00:00 2001
From: Andy Fiddaman <illumos@fiddaman.net>
Date: Wed, 25 Oct 2023 14:20:18 +0000
Subject: [PATCH] openssl - update from 3.0.11 to 3.0.12

---
 build/openssl/build-3.sh                    | 2 +-
 build/openssl/patches-3/cross-aarch64.patch | 2 +-
 build/openssl/patches-3/libs.patch          | 8 ++++----
 build/openssl/testsuite-3.log               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/openssl/build-3.sh b/build/openssl/build-3.sh
index bebb79581c..c596989205 100755
--- a/build/openssl/build-3.sh
+++ b/build/openssl/build-3.sh
@@ -19,7 +19,7 @@
 . common.sh
 
 PROG=openssl
-VER=3.0.11
+VER=3.0.12
 PKG=library/security/openssl-3
 SUMMARY="Cryptography and SSL/TLS Toolkit"
 DESC="A toolkit for Secure Sockets Layer and Transport Layer protocols "
diff --git a/build/openssl/patches-3/cross-aarch64.patch b/build/openssl/patches-3/cross-aarch64.patch
index bb2027c319..4b5d3b41ca 100644
--- a/build/openssl/patches-3/cross-aarch64.patch
+++ b/build/openssl/patches-3/cross-aarch64.patch
@@ -1,4 +1,4 @@
-diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/15-illumos-aarch.conf a/Configurations/15-illumos-aarch.conf
+diff -wpruN '--exclude=*.orig' a~/Configurations/15-illumos-aarch.conf a/Configurations/15-illumos-aarch.conf
 --- a~/Configurations/15-illumos-aarch.conf	1970-01-01 00:00:00
 +++ a/Configurations/15-illumos-aarch.conf	1970-01-01 00:00:00
 @@ -0,0 +1,17 @@
diff --git a/build/openssl/patches-3/libs.patch b/build/openssl/patches-3/libs.patch
index 06600332df..a3d145de52 100644
--- a/build/openssl/patches-3/libs.patch
+++ b/build/openssl/patches-3/libs.patch
@@ -14,10 +14,10 @@ patch the configuration script to stop linking against these two libraries.
 We also patch out the desire to omit the frame pointer and add in dwarf-2
 debug information which can be converted to CTF.
 
-diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/10-main.conf a/Configurations/10-main.conf
+diff -wpruN '--exclude=*.orig' a~/Configurations/10-main.conf a/Configurations/10-main.conf
 --- a~/Configurations/10-main.conf	1970-01-01 00:00:00
 +++ a/Configurations/10-main.conf	1970-01-01 00:00:00
-@@ -210,7 +210,7 @@ my %targets = (
+@@ -213,7 +213,7 @@ my %targets = (
          inherit_from     => [ "BASE_unix" ],
          template         => 1,
          lib_cppflags     => "-DFILIO_H",
@@ -26,7 +26,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/10-main.conf a
          dso_scheme       => "dlfcn",
          thread_scheme    => "pthreads",
      },
-@@ -238,7 +238,7 @@ my %targets = (
+@@ -241,7 +241,7 @@ my %targets = (
          CC               => "gcc",
          CFLAGS           => add_before(picker(default => "-Wall",
                                                debug   => "-O0 -g",
@@ -35,7 +35,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Configurations/10-main.conf a
          cflags           => add(threads("-pthread")),
          lib_cppflags     => add("-DL_ENDIAN"),
          ex_libs          => add(threads("-pthread")),
-@@ -261,7 +261,7 @@ my %targets = (
+@@ -264,7 +264,7 @@ my %targets = (
          CC               => "gcc",
          CFLAGS           => add_before(picker(default => "-Wall",
                                                debug   => "-O0 -g",
diff --git a/build/openssl/testsuite-3.log b/build/openssl/testsuite-3.log
index de1c662adb..a22b8a773f 100644
--- a/build/openssl/testsuite-3.log
+++ b/build/openssl/testsuite-3.log
@@ -252,5 +252,5 @@ Result: NOTESTS
 99-test_fuzz_server.t .............. ok
 99-test_fuzz_x509.t ................ ok
 All tests successful.
-Files=250, Tests=3327, 
+Files=250, Tests=3328, 
 Result: PASS