diff options
| author | Xiao NuoFu <xiaonuofu@email.it> | 2020-04-05 18:08:11 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-04-06 11:44:13 +0200 |
| commit | bb1ad4b649a2c7e532f8ec6e6ab53e4e7937b1da (patch) | |
| tree | 1993658e8f44e3648953e6c628deb663019e7cf0 /Ports/openssl | |
| parent | 7fd77e9ffe5eed78d30ad8fd08e079ccbb0948cf (diff) | |
| download | serenity-bb1ad4b649a2c7e532f8ec6e6ab53e4e7937b1da.zip | |
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.
Diffstat (limited to 'Ports/openssl')
| -rwxr-xr-x | Ports/openssl/package.sh | 11 | ||||
| -rw-r--r-- | Ports/openssl/patches/ocsp_fd_set.patch | 13 | ||||
| -rw-r--r-- | Ports/openssl/patches/s_apps.patch | 13 |
3 files changed, 32 insertions, 5 deletions
diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh index 9e535eef77..9963eedbe6 100755 --- a/Ports/openssl/package.sh +++ b/Ports/openssl/package.sh @@ -1,19 +1,20 @@ #!/bin/bash ../.port_include.sh port=openssl -version=1.0.2t +branch='1.0.2' +version="${branch}t" useconfigure=true configscript=Configure -files="https://www.openssl.org/source/openssl-${version}.tar.gz openssl-${version}.tar.gz -https://www.openssl.org/source/openssl-${version}.tar.gz.asc openssl-${version}.tar.gz.asc" +files="https://ftp.openssl.org/source/old/${branch}/openssl-${version}.tar.gz openssl-${version}.tar.gz +https://ftp.openssl.org/source/old/${branch}/openssl-${version}.tar.gz.asc openssl-${version}.tar.gz.asc" auth_type="sig" auth_import_key="8657ABB260F056B1E5190839D9C4D26D0E604491" auth_opts="openssl-${version}.tar.gz.asc openssl-${version}.tar.gz" depends="zlib" usr_local=$SERENITY_ROOT/Root/usr/local/ -configopts="--prefix=$usr_local --openssldir=$usr_local/ssl BSD-x86 zlib no-tests no-threads no-asm no-sock" +configopts="--prefix=$usr_local -DOPENSSL_SYS_SERENITY=1 --openssldir=$usr_local/ssl BSD-x86 zlib no-tests no-threads no-asm" configure() { - run rm -rf ./test/ ./apps/ + run rm -rf ./test/ run ./"$configscript" $configopts } diff --git a/Ports/openssl/patches/ocsp_fd_set.patch b/Ports/openssl/patches/ocsp_fd_set.patch new file mode 100644 index 0000000000..b9c140c17b --- /dev/null +++ b/Ports/openssl/patches/ocsp_fd_set.patch @@ -0,0 +1,13 @@ +--- 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) + diff --git a/Ports/openssl/patches/s_apps.patch b/Ports/openssl/patches/s_apps.patch new file mode 100644 index 0000000000..eaa326a890 --- /dev/null +++ b/Ports/openssl/patches/s_apps.patch @@ -0,0 +1,13 @@ +--- 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 |