--- rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.5.0-bz11611.patch 2021/06/01 17:15:32 1.5 +++ rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.5.0-bz11611.patch 2021/06/01 17:29:33 1.6 @@ -12,9 +12,9 @@ diff -Nur --no-dereference smeserver-php + { + templates2events("/etc/httpd/conf/httpd.conf", $event); + templates2events("/etc/phpldapadmin/config.php", $event); -+ templates2events("/etc/opt/remi/php74/php-fpm.d/www.conf", $event); ++ templates2events("/etc/opt/remi/php____PHPVERSION____/php-fpm.d/www.conf", $event); + safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); -+ safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php74-php-fpm"); ++ safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php____PHPVERSION____-php-fpm"); + } diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status smeserver-phpldapadmin-1.5.0/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status 1969-12-31 19:00:00.000000000 -0500 @@ -32,7 +32,7 @@ diff -Nur --no-dereference smeserver-php - php_flag magic_quotes_gpc on - php_flag track_vars on + -+ SetHandler "proxy:unix:/var/run/php-fpm/php74-phpldapadmin.sock|fcgi://localhost" ++ SetHandler "proxy:unix:/var/run/php-fpm/php____PHPVERSION____-phpldapadmin.sock|fcgi://localhost" + + SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1 + @@ -44,7 +44,7 @@ diff -Nur --no-dereference smeserver-php @@ -0,0 +1,73 @@ +{ + -+if ($PHP_VERSION eq '74'){ ++if ($PHP_VERSION eq '____PHPVERSION____'){ + if (($phpldapadmin{'status'} || 'disabled') eq 'enabled'){ + my $max_upload_size = ($phpldapadmin{MaxUploadSize} || '100M');# 104857600 bytes + $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);