diff --git a/data/special-requirements b/data/special-requirements index f5a98d2..c0cc331 100644 --- a/data/special-requirements +++ b/data/special-requirements @@ -14,3 +14,4 @@ sodium !jessie sqlsrv !7.1-alpine3.9 !7.1-alpine3.10 vips !alpine3.9 !jessie wikidiff2 !jessie !stretch +xpass !buster diff --git a/data/supported-extensions b/data/supported-extensions index 7097e58..5859385 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -136,6 +136,7 @@ xhprof 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 xlswriter 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 xmldiff 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 xmlrpc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 +xpass 8.0 8.1 8.2 8.3 8.4 xsl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 yac 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 yaml 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 diff --git a/install-php-extensions b/install-php-extensions index 73d8be8..29e0e07 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -1554,6 +1554,12 @@ buildRequiredPackageLists() { xmlrpc@debian) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev" ;; + xpass@alpine) + if ! isLibXCryptInstalled; then + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile linux-headers" + COMPILE_LIBS="$COMPILE_LIBS libxcrypt" + fi + ;; xsl@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libxslt" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxslt-dev libgcrypt-dev" @@ -2423,6 +2429,25 @@ installFirebird() { cd - >/dev/null fi } + +isLibXCryptInstalled() { + if ! test -f /usr/local/lib/libcrypt.so && ! test -f /usr/lib/libcrypt.so && ! test -f /usr/lib/x86_64*/libcrypt.so; then + return 1 + fi + return 0 +} + +installLibXCrypt() { + printf 'Installing libxcrypt\n' + installLibXCrypt_version=4.4.36 + installLibXCrypt_src="$(getPackageSource "https://github.com/besser82/libxcrypt/releases/download/v$installLibXCrypt_version/libxcrypt-$installLibXCrypt_version.tar.xz")" + cd -- "$installLibXCrypt_src" + ./configure --prefix /usr + make -j$(getProcessorCount) + make install + cd - >/dev/null +} + # Install Composer installComposer() { installComposer_version="$(getWantedPHPModuleVersion @composer)" @@ -2618,6 +2643,9 @@ compileLibs() { if stringInList firebird "$COMPILE_LIBS"; then installFirebird fi + if stringInList libxcrypt "$COMPILE_LIBS"; then + installLibXCrypt + fi } # Install a bundled PHP module given its handle