Merge branch 'master' into test-alpine3.21-test-extensions

mlocati · Feb 5, 2025 · f403d59 · f403d59
2 parents 113411b + ef1399a
commit f403d59
Showing 1 changed file with 25 additions and 6 deletions.
diff --git a/install-php-extensions b/install-php-extensions
@@ -2545,30 +2545,41 @@ actuallyInstallComposer() {
 
 # Install ionCube Loader
 installIonCubeLoader() {
+	installIonCubeLoader_version=''
+	if test $PHP_MAJMIN_VERSION -lt 804; then
+		# For 14.4.0 we have a Segmentation Fault
+		installIonCubeLoader_version=14.0.0
+	fi
+	installIonCubeLoader_versionForUrl=''
+	installIonCubeLoader_versionForMessage=latest
+	if test -n "$installIonCubeLoader_version"; then
+		installIonCubeLoader_versionForUrl="_$installIonCubeLoader_version"
+		installIonCubeLoader_versionForMessage="v$installIonCubeLoader_version"
+	fi
 	# See https://www.ioncube.com/loaders.php
 	case $PHP_BITS in
 		32)
 			case $(uname -m) in
 				aarch* | arm*)
-					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_armv7l.tar.gz"
+					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_armv7l$installIonCubeLoader_versionForUrl.tar.gz"
 					;;
 				*)
-					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86.tar.gz"
+					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86$installIonCubeLoader_versionForUrl.tar.gz"
 					;;
 			esac
 			;;
 		*)
 			case $(uname -m) in
 				aarch64 | arm64 | armv8)
-					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz"
+					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64$installIonCubeLoader_versionForUrl.tar.gz"
 					;;
 				*)
-					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz"
+					installIonCubeLoader_url="https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64$installIonCubeLoader_versionForUrl.tar.gz"
 					;;
 			esac
 			;;
 	esac
-	printf 'Downloading ionCube Loader... '
+	printf 'Downloading ionCube Loader (%s)... ' "$installIonCubeLoader_versionForMessage"
 	installIonCubeLoader_dir="$(getPackageSource $installIonCubeLoader_url)"
 	echo 'done.'
 	installIonCubeLoader_so=$(php -r "printf('ioncube_loader_lin_%s.%s%s.so', PHP_MAJOR_VERSION, PHP_MINOR_VERSION, ZEND_THREAD_SAFE ? '_ts' : '');")
@@ -3347,7 +3358,7 @@ installRemoteModule() {
 					git submodule update -q
 					mkdir -p build
 					cd build
-					cmake -DCMAKE_BUILD_TYPE=Release .. -Wno-dev
+					CFLAGS='-Wno-incompatible-pointer-types -Wno-stringop-overflow -Wno-discarded-qualifiers' cmake -DCMAKE_BUILD_TYPE=Release .. -Wno-dev
 					make clean
 					make -j$(getProcessorCount) install
 				)
@@ -3703,6 +3714,7 @@ installRemoteModule() {
 					installRemoteModule_version=5.4.0
 				fi
 			fi
+			installRemoteModule_cppflags='-Wno-incompatible-pointer-types'
 			;;
 		php_trie)
 			if ! test -f /usr/local/include/hat-trie/include/tsl/htrie_map.h; then
@@ -3930,6 +3942,9 @@ installRemoteModule() {
 				fi
 			fi
 			;;
+		seaslog)
+			installRemoteModule_cppflags='-Wno-incompatible-pointer-types'
+			;;
 		smbclient)
 			if test -z "$installRemoteModule_version"; then
 				if test $PHP_MAJMIN_VERSION -le 506; then
@@ -3958,6 +3973,8 @@ installRemoteModule() {
 				if test -z "$installRemoteModule_version"; then
 					if test $PHP_MAJMIN_VERSION -le 800; then
 						installRemoteModule_version=0.9.0
+					elif test $PHP_MAJMIN_VERSION -le 801; then
+						installRemoteModule_version=0.10.0
 					else
 						installRemoteModule_version=0.11.0
 					fi
@@ -4382,6 +4399,7 @@ installRemoteModule() {
 			fi
 			;;
 		tensor)
+			installRemoteModule_cppflags='-Wno-incompatible-pointer-types'
 			if test -z "$installRemoteModule_version"; then
 				if test $PHP_MAJMIN_VERSION -le 703; then
 					installRemoteModule_version=2.2.3
@@ -4449,6 +4467,7 @@ installRemoteModule() {
 			installRemoteModule_manuallyInstalled=1
 			;;
 		uopz)
+			installRemoteModule_cppflags='-Wno-incompatible-pointer-types'
 			if test -z "$installRemoteModule_version"; then
 				if test $PHP_MAJMIN_VERSION -le 506; then
 					installRemoteModule_version=2.0.7