From 44717a317e6f9638c3b2396cee3db94b89336b1e Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Sun, 31 Jan 2021 10:47:52 +0100 Subject: [PATCH] Enable SSL for swoole whenever possible Test: swoole --- install-php-extensions | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/install-php-extensions b/install-php-extensions index 9461ac4..8967bd8 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -852,17 +852,8 @@ buildRequiredPackageLists() { buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libssh2-1-dev" ;; swoole@alpine) - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs libstdc++" - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile curl-dev postgresql-dev linux-headers" - case "$DISTRO_VERSION" in - alpine@3.7 | alpine@3.8) - # I can assure you I tried very hard to enable openssl in these Alpine versions... - ;; - *) - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent $buildRequiredPackageLists_libssl" - buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libressl-dev" - ;; - esac + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs libstdc++ $buildRequiredPackageLists_libssl" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile curl-dev postgresql-dev linux-headers libressl-dev" ;; swoole@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libcurl3-gnutls libpq5" @@ -1936,13 +1927,13 @@ installRemoteModule() { else installRemoteModule_sockets=no fi + installRemoteModule_openssl=yes case "$DISTRO_VERSION" in alpine@3.7 | alpine@3.8) - # I can assure you I tried very hard to enable openssl in these Alpine versions... - installRemoteModule_openssl=no - ;; - *) - installRemoteModule_openssl=yes + if test -n "$installRemoteModule_version" && test $(compareVersions "$installRemoteModule_version" 4.6.0) -lt 0; then + # see https://github.com/swoole/swoole-src/issues/3934 + installRemoteModule_openssl=no + fi ;; esac if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 4.6.1) -ge 0; then