Ports/openssl: Update to 3.0.9

The 3.0 series is the new LTS version and is supported until 7th
September 2026. The 1.1.1 series which is the previous LTS version has
an end of support on 11th September 2023.
This commit is contained in:
Kenneth Myhra 2023-07-18 20:37:56 +02:00 committed by Sam Atkins
parent 25b89aa962
commit b38edc9d43
Notes: sideshowbarker 2024-07-16 22:26:05 +09:00
6 changed files with 43 additions and 13 deletions

View File

@ -211,7 +211,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`OpenJDK`](OpenJDK/) | OpenJDK | 17.0.6 | https://openjdk.java.net/ |
| [`openrct2`](openrct2/) | OpenRCT2 | 0.4.4 | https://openrct2.org/ |
| [`openssh`](openssh/) | OpenSSH | 9.0-94eb685 | https://github.com/openssh/openssh-portable |
| [`openssl`](openssl/) | OpenSSL | 1.1.1s | https://www.openssl.org/ |
| [`openssl`](openssl/) | OpenSSL | 3.0.9 | https://www.openssl.org/ |
| [`openttd`](openttd/) | OpenTTD | 12.2 | https://www.openttd.org/ |
| [`openttd-opengfx`](openttd-opengfx/) | OpenGFX graphics for OpenTTD | 7.1 | https://www.openttd.org/ |
| [`openttd-opensfx`](openttd-opensfx/) | OpenSFX audio files for OpenTTD | 1.0.3 | https://www.openttd.org/ |

View File

@ -1,10 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=openssl
branch='1.1.1'
version="${branch}s"
version='3.0.9'
useconfigure=true
configscript=Configure
files="https://www.openssl.org/source/openssl-${version}.tar.gz openssl-${version}.tar.gz c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa"
files="https://www.openssl.org/source/openssl-${version}.tar.gz openssl-${version}.tar.gz eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
depends=("zlib")
configopts=("--prefix=/usr/local" "-DOPENSSL_SYS_SERENITY=1" "-DOPENSSL_USE_IPV6=0" "zlib" "threads" "no-tests" "no-asm" "serenity-generic")

View File

@ -9,10 +9,10 @@ Co-Authored-By: Rodrigo Tobar <rtobarc@gmail.com>
1 file changed, 24 insertions(+)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 8ca8235..3dea01f 100644
index 8010087b46dcea332f586d440b442fa1bcf3e34d..ee25d4c1be22f7eade443a5d48c3df60f4c7a6f1 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -627,6 +627,30 @@ my %targets = (
@@ -672,6 +672,30 @@ my %targets = (
shared_extension => ".so",
},

View File

@ -1,19 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Wilde <lukew@serenityos.org>
Date: Wed, 16 Mar 2022 12:52:30 +0000
From: Kenneth Myhra <kennethmyhra@gmail.com>
Date: Tue, 18 Jul 2023 18:58:14 +0200
Subject: [PATCH] Add build configuration info for serenity
Co-Authored-By: Luke Wilde <lukew@serenityos.org>
Co-Authored-By: Rodrigo Tobar <rtobarc@gmail.com>
---
Configurations/shared-info.pl | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 47eddd6..ab04a19 100644
index edd16f405594a7e0d25d479e7e04272679bf8061..04852a65793c2ad4f53615d9c6c054ea0760e80a 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -34,6 +34,13 @@ my %shared_info;
shared_defflag => '-Wl,--version-script=',
@@ -39,6 +39,13 @@ my %shared_info;
: '-Wl,-z,defs',
};
},
+ 'serenity-shared' => {
@ -24,5 +25,5 @@ index 47eddd6..ab04a19 100644
+ shared_defflag => "-Wl,-Map=",
+ },
'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },
'bsd-shared' => sub {
return $shared_info{'gnu-shared'} if detect_gnu_ld();
'darwin-shared' => {
module_ldflags => '-bundle',

View File

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kenneth Myhra <kennethmyhra@gmail.com>
Date: Tue, 18 Jul 2023 19:18:27 +0200
Subject: [PATCH] Add serenity alias to linker version script
This adds a serenity alias to the linker version script and forwards it
to the solaris configuration.
---
util/mkdef.pl | 1 +
1 file changed, 1 insertion(+)
diff --git a/util/mkdef.pl b/util/mkdef.pl
index d9534674cde1ed722cbf665692b9efc541f1d01a..28976aafe65b97dfd6bab7c460cc0f9648d33ebd 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -113,6 +113,7 @@ my %OS_data = (
platforms => { UNIX => 1 } },
"solaris-gcc" => 'solaris', # alias
linux => 'solaris', # alias
+ serenity => 'solaris', # alias
"bsd-gcc" => 'solaris', # alias
aix => { writer => \&writer_aix,
sort => sorter_unix(),

View File

@ -10,3 +10,10 @@ Add a serenity configuration
Add build configuration info for serenity
## `0003-Add-serenity-alias-to-linker-version-script.patch`
Add serenity alias to linker version script
This adds a serenity alias to the linker version script and forwards it
to the solaris configuration.