Fix installing libssl on Alpine 3.19 (#852)

pull/853/head 2.1.71
Michele Locati 2023-12-14 18:04:14 +01:00 committed by GitHub
parent 8150d17927
commit 87c38b8def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -671,7 +671,7 @@ buildRequiredPackageLists() {
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS"
fi fi
if test -z "$(apk info 2>/dev/null | grep -E ^libssl)"; then if test -z "$(apk info 2>/dev/null | grep -E ^libssl)"; then
buildRequiredPackageLists_libssl='libssl1.0' buildRequiredPackageLists_libssl='^libssl[0-9]+(\.[0-9]+)*$'
elif test -z "$(apk info 2>/dev/null | grep -E '^libressl.*-libtls')" && test -z "$(apk info 2>/dev/null | grep -E '^libressl.*-libssl')" && test -z "$(apk info 2>/dev/null | grep -E '^libretls-')"; then elif test -z "$(apk info 2>/dev/null | grep -E '^libressl.*-libtls')" && test -z "$(apk info 2>/dev/null | grep -E '^libressl.*-libssl')" && test -z "$(apk info 2>/dev/null | grep -E '^libretls-')"; then
buildRequiredPackageLists_libssl=$(apk search -q libressl*-libtls) buildRequiredPackageLists_libssl=$(apk search -q libressl*-libtls)
else else
@ -1225,7 +1225,7 @@ buildRequiredPackageLists() {
relay@alpine) relay@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent lz4-libs zstd-libs" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent lz4-libs zstd-libs"
if test $DISTRO_MAJMIN_VERSION -ge 317; then if test $DISTRO_MAJMIN_VERSION -ge 317; then
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libssl1.1" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent $buildRequiredPackageLists_libssl"
fi fi
;; ;;
saxon@debian) saxon@debian)