Serenity Operating System
Ports: refresh OpenSSL, make it build its command line utils.
This patch refreshes the openssl port and makes it build the utilities
in apps/, e.g. the openssl utility.
Now you can do this from Serenity:
$ openssl s_client -connect example.org:443
...
GET / HTTP/1.1
Host: example.org
<HTTP response here>
The download URL was bit-rotten and needed a fix.
authored by
Xiao NuoFu
and committed by
Andreas Kling
bb1ad4b6
7fd77e9f
+32
-5
+6
-5
Ports/openssl/package.sh
+6
-5
Ports/openssl/package.sh
···
1
1
#!/bin/bash ../.port_include.sh
2
2
port=openssl
3
-
version=1.0.2t
3
+
branch='1.0.2'
4
+
version="${branch}t"
4
5
useconfigure=true
5
6
configscript=Configure
6
-
files="https://www.openssl.org/source/openssl-${version}.tar.gz openssl-${version}.tar.gz
7
-
https://www.openssl.org/source/openssl-${version}.tar.gz.asc openssl-${version}.tar.gz.asc"
7
+
files="https://ftp.openssl.org/source/old/${branch}/openssl-${version}.tar.gz openssl-${version}.tar.gz
8
+
https://ftp.openssl.org/source/old/${branch}/openssl-${version}.tar.gz.asc openssl-${version}.tar.gz.asc"
8
9
auth_type="sig"
9
10
auth_import_key="8657ABB260F056B1E5190839D9C4D26D0E604491"
10
11
auth_opts="openssl-${version}.tar.gz.asc openssl-${version}.tar.gz"
11
12
12
13
depends="zlib"
13
14
usr_local=$SERENITY_ROOT/Root/usr/local/
14
-
configopts="--prefix=$usr_local --openssldir=$usr_local/ssl BSD-x86 zlib no-tests no-threads no-asm no-sock"
15
+
configopts="--prefix=$usr_local -DOPENSSL_SYS_SERENITY=1 --openssldir=$usr_local/ssl BSD-x86 zlib no-tests no-threads no-asm"
15
16
16
17
configure() {
17
-
run rm -rf ./test/ ./apps/
18
+
run rm -rf ./test/
18
19
run ./"$configscript" $configopts
19
20
}
+13
Ports/openssl/patches/ocsp_fd_set.patch
+13
Ports/openssl/patches/ocsp_fd_set.patch
···
1
+
--- a/apps/ocsp.c 2020-04-05 16:49:54.499380971 +0100
2
+
+++ b/apps/ocsp.c 2020-04-05 16:50:13.175380426 +0100
3
+
@@ -94,6 +94,10 @@
4
+
# endif
5
+
# endif
6
+
7
+
+# if defined(OPENSSL_SYS_SERENITY)
8
+
+# include <sys/select.h>
9
+
+# endif
10
+
+
11
+
/* Maximum leeway in validity period: default 5 minutes */
12
+
# define MAX_VALIDITY_PERIOD (5 * 60)
13
+
+13
Ports/openssl/patches/s_apps.patch
+13
Ports/openssl/patches/s_apps.patch
···
1
+
--- a/apps/s_apps.h 2020-04-05 13:52:44.967691150 +0100
2
+
+++ b/apps/s_apps.h 2020-04-05 13:52:50.147690999 +0100
3
+
@@ -122,6 +122,10 @@
4
+
# define _kbhit kbhit
5
+
#endif
6
+
7
+
+#if defined(OPENSSL_SYS_SERENITY)
8
+
+# include <sys/select.h>
9
+
+#endif
10
+
+
11
+
#if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
12
+
/*
13
+
* VAX C does not defined fd_set and friends, but it's actually quite simple