Skip to content

Commit b1d683a

Browse files
authored
Improve Relay Install (for libssl3 / zts) (#1274)
* Improve Relay extension by adding a check if ZTS should be used and a better check for libssl3. Test: relay * Fix line endings. * Fix if.
1 parent 5a4c049 commit b1d683a

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

install-php-extensions

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4282,19 +4282,21 @@ installRemoteModule() {
42824282
fi
42834283
;;
42844284
debian)
4285-
case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in
4286-
libssl3*)
4287-
installRemoteModule_flags=+libssl3
4288-
;;
4289-
esac
4285+
if dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3 | grep -q '^libssl3'; then
4286+
installRemoteModule_flags=+libssl3
4287+
fi
42904288
;;
42914289
esac
42924290
# See https://relay.so/builds
42934291
installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${installRemoteModule_distro}-${installRemoteModule_hardware}${installRemoteModule_flags}.tar.gz"
42944292
printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url"
42954293
installRemoteModule_src="$(getPackageSource $installRemoteModule_url)"
42964294
echo 'done.'
4297-
cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so"
4295+
if test $PHP_THREADSAFE -eq 1; then
4296+
cp -- "$installRemoteModule_src/relay-zts.so" "$PHP_EXTDIR/relay.so"
4297+
else
4298+
cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so"
4299+
fi
42984300
sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" "$PHP_EXTDIR/relay.so"
42994301
installRemoteModule_ini_extra="$(grep -vE '^[ \t]*extension[ \t]*=' $installRemoteModule_src/relay.ini)"
43004302
installRemoteModule_manuallyInstalled=1

0 commit comments

Comments
 (0)