diff --git a/apps/php5/5.4.45/build/php/extensions/install-php-extensions b/apps/php5/5.4.45/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php5/5.4.45/build/php/extensions/install-php-extensions +++ b/apps/php5/5.4.45/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php5/5.5.38/build/php/extensions/install-php-extensions b/apps/php5/5.5.38/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php5/5.5.38/build/php/extensions/install-php-extensions +++ b/apps/php5/5.5.38/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php5/5.6.40/build/php/extensions/install-php-extensions b/apps/php5/5.6.40/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php5/5.6.40/build/php/extensions/install-php-extensions +++ b/apps/php5/5.6.40/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php7/7.0.33/build/php/extensions/install-php-extensions b/apps/php7/7.0.33/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php7/7.0.33/build/php/extensions/install-php-extensions +++ b/apps/php7/7.0.33/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php7/7.1.33/build/php/extensions/install-php-extensions b/apps/php7/7.1.33/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php7/7.1.33/build/php/extensions/install-php-extensions +++ b/apps/php7/7.1.33/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php7/7.2.34/build/php/extensions/install-php-extensions b/apps/php7/7.2.34/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php7/7.2.34/build/php/extensions/install-php-extensions +++ b/apps/php7/7.2.34/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php7/7.3.33/build/php/extensions/install-php-extensions b/apps/php7/7.3.33/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php7/7.3.33/build/php/extensions/install-php-extensions +++ b/apps/php7/7.3.33/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php7/7.4.33/build/php/extensions/install-php-extensions b/apps/php7/7.4.33/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php7/7.4.33/build/php/extensions/install-php-extensions +++ b/apps/php7/7.4.33/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php8/8.0.28/build/php/extensions/install-php-extensions b/apps/php8/8.0.28/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php8/8.0.28/build/php/extensions/install-php-extensions +++ b/apps/php8/8.0.28/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php8/8.1.18/build/php/extensions/install-php-extensions b/apps/php8/8.1.18/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php8/8.1.18/build/php/extensions/install-php-extensions +++ b/apps/php8/8.1.18/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then diff --git a/apps/php8/8.2.5/build/php/extensions/install-php-extensions b/apps/php8/8.2.5/build/php/extensions/install-php-extensions index 72a75d9f..164c8d47 100644 --- a/apps/php8/8.2.5/build/php/extensions/install-php-extensions +++ b/apps/php8/8.2.5/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=master +IPE_VERSION=2.1.28 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -566,6 +566,8 @@ sortModulesToInstall() { checkRequiredModule relay msgpack # relay requires igbinary checkRequiredModule relay igbinary + # pq requires raphf + checkRequiredModule pq raphf # Some module installation may use sockets if available: move it before other modules if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")" @@ -596,6 +598,12 @@ sortModulesToInstall() { PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL" PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" fi + # Some module installation may use raphf if available: move it before other modules + if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then + PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")" + PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL" + PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }" + fi # In any case, first of all, we need to install composer if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")" @@ -1094,11 +1102,11 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util" ;; - pgsql@alpine | pdo_pgsql@alpine) + pgsql@alpine | pdo_pgsql@alpine | pq@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev" ;; - pgsql@debian | pdo_pgsql@debian) + pgsql@debian | pdo_pgsql@debian | pq@debian) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; @@ -2518,6 +2526,13 @@ installRemoteModule() { fi fi ;; + bitset) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=2.0.4 + fi + fi + ;; blackfire) case $(uname -m) in i386 | i686 | x86) @@ -2682,13 +2697,6 @@ installRemoteModule() { # event must be loaded after sockets installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" ;; - excimer) - if test -z "$installRemoteModule_version"; then - if test "$DISTRO" = alpine && test $PHP_MAJMIN_VERSION -le 703; then - installRemoteModule_version=1.0.4 - fi - fi - ;; gearman) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -2749,8 +2757,21 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=1.33.1 + else + case "$DISTRO_VERSION" in + debian@8) + installRemoteModule_version=1.46.3 + ;; + alpine@3.7 | alpine@3.8 | debian@9) # With newer version: "This package requires GCC 7 or higher" + installRemoteModule_version=1.52.1 + ;; + esac fi fi + if test -z "$installRemoteModule_version"; then + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=1.55.0 + fi if test -z "$installRemoteModule_version" || test "$installRemoteModule_version" = 1.35.0; then case "$DISTRO_VERSION" in alpine@3.13) @@ -2758,13 +2779,6 @@ installRemoteModule() { ;; esac fi - if test -z "$installRemoteModule_version"; then - case "$DISTRO_VERSION" in - debian@8) - installRemoteModule_version=1.46.3 - ;; - esac - fi ;; http) if test -z "$installRemoteModule_version"; then @@ -2807,7 +2821,7 @@ installRemoteModule() { if ! test -f /usr/local/lib/libionc.so || ! test -f /usr/local/include/ionc/ion.h; then echo 'Installing ion-c... ' installRemoteModule_src="$(mktemp -p /tmp/src -d)" - git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.1 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" + git clone -q -c advice.detachedHead=false --depth 1 --branch v1.1.2 https://github.com/amzn/ion-c.git "$installRemoteModule_src/ion" ( cd "$installRemoteModule_src/ion" git submodule init -q @@ -3023,6 +3037,11 @@ installRemoteModule() { fi fi ;; + opentelemetry) + if test -z "$installRemoteModule_version"; then + installRemoteModule_version=beta + fi + ;; parallel) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 701; then @@ -3034,7 +3053,16 @@ installRemoteModule() { ;; parle) if test -z "$installRemoteModule_version"; then - installRemoteModule_version=beta + if test $PHP_MAJMIN_VERSION -lt 704; then + installRemoteModule_version=0.8.3 + else + installRemoteModule_version=beta + fi + fi + installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" + if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 0.8.4) -ge 0; then + # Enable internal UTF-32 support in parle + addConfigureOption enable-parle-utf32 yes fi ;; pcov) @@ -3051,6 +3079,10 @@ installRemoteModule() { mv "$installRemoteModule_src/include" /usr/local/include/hat-trie fi ;; + pq) + # pq must be loaded after raphf + installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module" + ;; propro) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -3063,8 +3095,8 @@ installRemoteModule() { if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=3.12.4 else - # see https://github.com/protocolbuffers/protobuf/issues/10619 - installRemoteModule_version=3.21.6 + # See https://github.com/protocolbuffers/protobuf/issues/10619 + installRemoteModule_version=3.23.2 fi fi ;; @@ -3166,8 +3198,27 @@ installRemoteModule() { installRemoteModule_hardware=x86-64 ;; esac - printf 'Downloading relay v%s (%s)... ' "$installRemoteModule_version" "$installRemoteModule_hardware" - installRemoteModule_url="https://builds.r2.relay.so/v${installRemoteModule_version}/relay-v${installRemoteModule_version}-php${PHP_MAJDOTMIN_VERSION}-${DISTRO}-${installRemoteModule_hardware}.tar.gz" + installRemoteModule_distro="$DISTRO" + installRemoteModule_flags='' + case "$DISTRO" in + alpine) + if test $DISTRO_MAJMIN_VERSION -lt 317; then + installRemoteModule_distro=alpine3.9 + else + installRemoteModule_distro=alpine3.17 + fi + ;; + debian) + case "$(dpkg -l 'libssl*' | grep -E '^ii ' | cut -d' ' -f3)" in + libssl3*) + installRemoteModule_flags=+libssl3 + ;; + esac + ;; + esac + # See https://relay.so/builds + 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" + printf 'Downloading relay v%s (%s) from %s... ' "$installRemoteModule_version" "$installRemoteModule_hardware" "$installRemoteModule_url" installRemoteModule_src="$(getPackageSource $installRemoteModule_url)" echo 'done.' cp -- "$installRemoteModule_src/relay-pkg.so" "$PHP_EXTDIR/relay.so" @@ -3192,7 +3243,7 @@ installRemoteModule() { snuffleupagus) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0.8.2 + installRemoteModule_version=0.9.0 fi installRemoteModule_src="$(getPackageSource https://codeload.github.com/jvoisin/snuffleupagus/tar.gz/v$installRemoteModule_version)" cd "$installRemoteModule_src/src" @@ -3272,8 +3323,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.13 - else - installRemoteModule_version=beta fi fi ;; @@ -3646,8 +3695,6 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then installRemoteModule_version=0.5.0 - elif test $PHP_MAJMIN_VERSION -le 700; then - installRemoteModule_version=1.0.0 else installRemoteModule_version=alpha fi @@ -3906,10 +3953,27 @@ invokeAptGetUpdate() { return fi IPE_APTGET_INSTALLOPTIONS='' - if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro='' + if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=jessie + elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then + invokeAptGetUpdate_fixdistro=stretch + else + IPE_APTGETUPDATE_ALREADY=y DEBIAN_FRONTEND=noninteractive apt-get update -q return fi + # See https://www.debian.org/distrib/archive.en.html for a list of mirrors + if test -z "${IPE_DEB_ARCHIVE:-}"; then + IPE_DEB_ARCHIVE=http://archive.kernel.org/debian-archive + fi + if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then + IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security + fi + sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list + sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list invokeAptGetUpdate_tmp="$(mktemp)" DEBIAN_FRONTEND=noninteractive apt-get update -q 2>"$invokeAptGetUpdate_tmp" if test -s "$invokeAptGetUpdate_tmp"; then