diff --git a/openssl3/build.sh b/openssl3/build.sh index c086547..a093f7f 100755 --- a/openssl3/build.sh +++ b/openssl3/build.sh @@ -6,7 +6,7 @@ ########################################################### # Check the following 4 variables before running the script topdir=openssl -version=3.0.7 +version=3.0.9 pkgver=1 source[0]=https://openssl.org/source/$topdir-$version.tar.gz # If there are no patches, simply comment this @@ -86,6 +86,7 @@ install() compat openssl 3.0.2 1 1 compat openssl 3.0.3 1 1 compat openssl 3.0.5 1 1 + compat openssl 3.0.7 1 1 } reg pack diff --git a/openssl3/meta/ChangeLog b/openssl3/meta/ChangeLog index 3992946..85a72d3 100644 --- a/openssl3/meta/ChangeLog +++ b/openssl3/meta/ChangeLog @@ -1,5 +1,11 @@ CHANGELOG --------- +* Sun Jun 25 2023 Tom G. Christensen - 3.0.9-1 +- Update to 3.0.9 + +* Mon Mar 27 2023 Tom G. Christensen - 3.0.8-1 +- Update to 3.0.8 + * Tue Nov 01 2022 Tom G. Christensen - 3.0.7-1 - Update to 3.0.7 diff --git a/openssl3/src/0001-Fix-fallback-for-missing-getaddrinfo.patch b/openssl3/src/0001-Fix-fallback-for-missing-getaddrinfo.patch index 3f58164..74403e4 100644 --- a/openssl3/src/0001-Fix-fallback-for-missing-getaddrinfo.patch +++ b/openssl3/src/0001-Fix-fallback-for-missing-getaddrinfo.patch @@ -1,4 +1,4 @@ -From 524f98565bcb90c0df8cbbd5dea215de945ff2b3 Mon Sep 17 00:00:00 2001 +From adb78cd04700f417f19eba18bdb4a7e476a2d2ca Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Wed, 27 Oct 2021 20:15:30 +0200 Subject: [PATCH 1/7] Fix fallback for missing getaddrinfo() @@ -9,7 +9,7 @@ Allow port 0 which is what the testsuite uses. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/bio/bio_addr.c b/crypto/bio/bio_addr.c -index d18c849ade..16a3676492 100644 +index a80774bbd7..784ee1fecf 100644 --- a/crypto/bio/bio_addr.c +++ b/crypto/bio/bio_addr.c @@ -867,7 +867,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, @@ -22,5 +22,5 @@ index d18c849ade..16a3676492 100644 se_fallback.s_proto = proto; se = &se_fallback; -- -2.27.0 +2.31.1 diff --git a/openssl3/src/0002-Include-sys-atomic.h-directly-on-Solaris.patch b/openssl3/src/0002-Include-sys-atomic.h-directly-on-Solaris.patch index d868ff8..c4ab8d9 100644 --- a/openssl3/src/0002-Include-sys-atomic.h-directly-on-Solaris.patch +++ b/openssl3/src/0002-Include-sys-atomic.h-directly-on-Solaris.patch @@ -1,4 +1,4 @@ -From f1afddaeb70d98047dc52c07b943b9d1c0282c4a Mon Sep 17 00:00:00 2001 +From e7a6bcc4bdea5477896297103a6ce9d59b5a2c5d Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Wed, 27 Oct 2021 20:38:52 +0200 Subject: [PATCH 2/7] Include directly on Solaris @@ -10,7 +10,7 @@ Only Solaris 10 has and it is only a wrapper around 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c -index 9f00d8be5e..2792f82684 100644 +index bfc05a4e87..5e2cec6bb6 100644 --- a/crypto/threads_pthread.c +++ b/crypto/threads_pthread.c @@ -13,8 +13,8 @@ @@ -23,7 +23,7 @@ index 9f00d8be5e..2792f82684 100644 +# include #endif - #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS) + #if defined(__apple_build_version__) && __apple_build_version__ < 6000000 -- -2.27.0 +2.31.1 diff --git a/openssl3/src/0003-Provide-socklen_t-on-Solaris-2.6.patch b/openssl3/src/0003-Provide-socklen_t-on-Solaris-2.6.patch index 05b2819..e3443b1 100644 --- a/openssl3/src/0003-Provide-socklen_t-on-Solaris-2.6.patch +++ b/openssl3/src/0003-Provide-socklen_t-on-Solaris-2.6.patch @@ -1,4 +1,4 @@ -From bb038a4df281e1104f6748d8dcc2803ea9728dd5 Mon Sep 17 00:00:00 2001 +From 55ec94b9fa825a3fee1e95cbdbd4356e6a12ddee Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Wed, 27 Oct 2021 20:48:25 +0200 Subject: [PATCH 3/7] Provide socklen_t on Solaris 2.6 @@ -23,5 +23,5 @@ index 749e8f810c..f1c9aa9473 100644 int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa); -- -2.27.0 +2.31.1 diff --git a/openssl3/src/0004-Fix-build-with-posix95-pthreads.patch b/openssl3/src/0004-Fix-build-with-posix95-pthreads.patch index 3c44333..3818835 100644 --- a/openssl3/src/0004-Fix-build-with-posix95-pthreads.patch +++ b/openssl3/src/0004-Fix-build-with-posix95-pthreads.patch @@ -1,4 +1,4 @@ -From 2c9c6a7cb7b9cbf8ee68bb55b29313a26d0d43bd Mon Sep 17 00:00:00 2001 +From a9fe9b331833dad69c252b102c6fd2f2f1a2bc92 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Wed, 27 Oct 2021 20:52:24 +0200 Subject: [PATCH 4/7] Fix build with posix95 pthreads @@ -10,10 +10,10 @@ attribute support. 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c -index 2792f82684..31005ad4c3 100644 +index 5e2cec6bb6..4350c8dbbf 100644 --- a/crypto/threads_pthread.c +++ b/crypto/threads_pthread.c -@@ -58,10 +58,14 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) +@@ -70,10 +70,14 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) */ pthread_mutexattr_init(&attr); # if !defined (__TANDEM) && !defined (_SPT_MODEL_) @@ -32,5 +32,5 @@ index 2792f82684..31005ad4c3 100644 # else /* The SPT Thread Library does not define MUTEX attributes. */ -- -2.27.0 +2.31.1 diff --git a/openssl3/src/0005-Handle-missing-stdint.h-on-older-Solaris.patch b/openssl3/src/0005-Handle-missing-stdint.h-on-older-Solaris.patch index 346bada..886c03f 100644 --- a/openssl3/src/0005-Handle-missing-stdint.h-on-older-Solaris.patch +++ b/openssl3/src/0005-Handle-missing-stdint.h-on-older-Solaris.patch @@ -1,4 +1,4 @@ -From 0d98913eefc39e7fed780a0c1affbb8356ce29b8 Mon Sep 17 00:00:00 2001 +From 8bcca1cfcf3799c100d711cf4f56b75be7e165ea Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Wed, 27 Oct 2021 21:33:59 +0200 Subject: [PATCH 5/7] Handle missing on older Solaris @@ -25,5 +25,5 @@ index 6728909271..a0b68bb376 100644 /* * minimally required typdefs for systems not supporting inttypes.h or -- -2.27.0 +2.31.1 diff --git a/openssl3/src/0006-Handle-missing-strtoumax.patch b/openssl3/src/0006-Handle-missing-strtoumax.patch index 415e9ed..8b37ba4 100644 --- a/openssl3/src/0006-Handle-missing-strtoumax.patch +++ b/openssl3/src/0006-Handle-missing-strtoumax.patch @@ -1,4 +1,4 @@ -From 9a352568d247db4f471dc6e1ba3a62180a63e3ee Mon Sep 17 00:00:00 2001 +From 310b28a03bde6d9cfcd19bc84e83e6fd13639a3d Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Thu, 28 Oct 2021 21:33:49 +0200 Subject: [PATCH 6/7] Handle missing strtoumax @@ -8,12 +8,12 @@ Subject: [PATCH 6/7] Handle missing strtoumax 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/params_conversion_test.c b/test/params_conversion_test.c -index 9422ef1473..300899f861 100644 +index 30477e8127..8e99da70f4 100644 --- a/test/params_conversion_test.c +++ b/test/params_conversion_test.c -@@ -19,7 +19,7 @@ - # define strcasecmp _stricmp - # endif +@@ -15,7 +15,7 @@ + /* On machines that dont support just disable the tests */ + #if !defined(OPENSSL_NO_INTTYPES_H) -# ifdef OPENSSL_SYS_VMS +# if defined(OPENSSL_SYS_VMS) || !defined(strtoumax) @@ -21,5 +21,5 @@ index 9422ef1473..300899f861 100644 # define strtoimax strtoll # endif -- -2.27.0 +2.31.1 diff --git a/openssl3/src/0007-Use-target-CPU-choice-on-SPARC.patch b/openssl3/src/0007-Use-target-CPU-choice-on-SPARC.patch index 053969b..9f08e91 100644 --- a/openssl3/src/0007-Use-target-CPU-choice-on-SPARC.patch +++ b/openssl3/src/0007-Use-target-CPU-choice-on-SPARC.patch @@ -1,4 +1,4 @@ -From cfefa89777a03a2fe8875cb761ffc0d2b9c2d650 Mon Sep 17 00:00:00 2001 +From 8615101bf02c43fec559aa72f01399f9833c8325 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 2 Jan 2022 15:51:24 +0100 Subject: [PATCH 7/7] Use target CPU choice on SPARC @@ -53,5 +53,5 @@ index 07ea1ddd0a..95015f3336 100644 /* Fujitsu SPARC64 X support */ # include "crypto/sparc_arch.h" -- -2.27.0 +2.31.1