diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 3b012beb60..bdf08474f5 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -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/ | diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh index 32aa2e0c9c..c8c45fd6f9 100755 --- a/Ports/openssl/package.sh +++ b/Ports/openssl/package.sh @@ -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 +} diff --git a/Ports/openssl/patches/ocsp_fd_set.patch b/Ports/openssl/patches/ocsp_fd_set.patch deleted file mode 100644 index b9c140c17b..0000000000 --- a/Ports/openssl/patches/ocsp_fd_set.patch +++ /dev/null @@ -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 -+# endif -+ - /* Maximum leeway in validity period: default 5 minutes */ - # define MAX_VALIDITY_PERIOD (5 * 60) - diff --git a/Ports/openssl/patches/s_apps.patch b/Ports/openssl/patches/s_apps.patch deleted file mode 100644 index eaa326a890..0000000000 --- a/Ports/openssl/patches/s_apps.patch +++ /dev/null @@ -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 -+#endif -+ - #if defined(OPENSSL_SYS_VMS) && !defined(FD_SET) - /* - * VAX C does not defined fd_set and friends, but it's actually quite simple