Ports: Update OpenSSL to 1.1.1k

This commit is contained in:
Luke 2021-07-29 23:04:32 +01:00 committed by Gunnar Beutner
parent f5d4de8b66
commit 4ca14d6e67
Notes: sideshowbarker 2024-07-18 07:44:27 +09:00
4 changed files with 11 additions and 31 deletions

View file

@ -108,7 +108,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`ntbtls`](ntbtls/) | The Not Too Bad TLS Library | 0.2.0 | https://gnupg.org/software/ntbtls/index.html |
| [`nyancat`](nyancat/) | Nyancat | | https://github.com/klange/nyancat |
| [`openssh`](openssh/) | OpenSSH | 8.3-9ca7e9c | https://github.com/openssh/openssh-portable |
| [`openssl`](openssl/) | OpenSSL | 1.0.2t | https://www.openssl.org/ |
| [`openssl`](openssl/) | OpenSSL | 1.1.1k | https://www.openssl.org/ |
| [`openttd`](openttd/) | OpenTTD | 1.11.0 | https://www.openttd.org/ |
| [`openttd-opengfx`](openttd-opengfx/) | OpenGFX graphics for OpenTTD | 0.6.1 | https://www.openttd.org/ |
| [`openttd-opensfx`](openttd-opensfx/) | OpenSFX audio files for OpenTTD | 1.0.1 | https://www.openttd.org/ |

View file

@ -1,15 +1,21 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=openssl
branch='1.0.2'
version="${branch}t"
branch='1.1.1'
version="${branch}k"
useconfigure=true
configscript=Configure
files="https://ftp.openssl.org/source/old/${branch}/openssl-${version}.tar.gz openssl-${version}.tar.gz 14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"
files="https://ftp.nluug.nl/security/openssl/openssl-${version}.tar.gz openssl-${version}.tar.gz 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5"
auth_type=sha256
depends="zlib"
configopts="--prefix=/usr/local --install_prefix=${SERENITY_INSTALL_ROOT} -DOPENSSL_SYS_SERENITY=1 linux-elf zlib no-tests no-threads no-asm"
configopts="--prefix=/usr/local -DOPENSSL_SYS_SERENITY=1 gcc zlib no-tests no-threads no-asm"
configure() {
run ./"$configscript" $configopts
}
install() {
# The default "install" also installs docs, which we don't want.
run make DESTDIR=$DESTDIR install_sw $installopts
run make DESTDIR=$DESTDIR install_ssldirs $installopts
}

View file

@ -1,13 +0,0 @@
--- a/apps/ocsp.c 2020-04-05 16:49:54.499380971 +0100
+++ b/apps/ocsp.c 2020-04-05 16:50:13.175380426 +0100
@@ -94,6 +94,10 @@
# endif
# endif
+# if defined(OPENSSL_SYS_SERENITY)
+# include <sys/select.h>
+# endif
+
/* Maximum leeway in validity period: default 5 minutes */
# define MAX_VALIDITY_PERIOD (5 * 60)

View file

@ -1,13 +0,0 @@
--- a/apps/s_apps.h 2020-04-05 13:52:44.967691150 +0100
+++ b/apps/s_apps.h 2020-04-05 13:52:50.147690999 +0100
@@ -122,6 +122,10 @@
# define _kbhit kbhit
#endif
+#if defined(OPENSSL_SYS_SERENITY)
+# include <sys/select.h>
+#endif
+
#if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
/*
* VAX C does not defined fd_set and friends, but it's actually quite simple