smeserver-horde/sme10/smeserver-horde-1.0.0-bz10908-httpd-auth.patch

diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess
--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess        2020-03-27 11:53:44.451000000 -0400
+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess    2020-03-27 12:15:18.099219531 -0400
@@ -47,6 +47,7 @@
 else
 {
        $OUT .= qq(
+    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
     <FilesMatch \.php\$>
         SetHandler "proxy:unix:/var/run/php-fpm/horde.sock|fcgi://localhost"
     </FilesMatch>
diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde
--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde 2020-03-27 11:53:44.451000000 -0400
+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde     2020-03-27 12:14:08.226307938 -0400
@@ -15,7 +15,7 @@
   my $post_max_size       = $horde->prop('PHPPostMaxSize')       || '10M';
   my $upload_max_filesize = $horde->prop('PHPUploadMaxFilesize') || '10M';
   my $file_upload         = $horde->prop('PHPFileUpload')        || 'enabled';
-  my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data";
+  my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data:/usr/share/php";
   my $open_basedir        = $horde->prop('PHPBaseDir')           || '/usr/share/horde' . 
                                                                    ':/etc/horde/' .
                                                                     ':/var/lib/php/' . $key .  
@@ -29,7 +29,7 @@
   $file_upload        = ($file_upload =~ m/^1|yes|on|enabled$/) ?     'on' : 'off';
   $allow_url_fopen    = "off" ; # ($allow_url_fopen =~ m/^1|yes|on|enabled$/) ? 'on' : 'off';
   $disabled_functions = join(', ', split /[,;:]/, $disabled_functions);
-  $open_basedir       = join(':',  split(/[,;:]/, $open_basedir));
+  $open_basedir       = join(':',  split(/[,;:]/, $open_basedir . ",/usr/share/php"));
 
   $OUT .=<<"_EOF" if ($version eq $PHP_VERSION);
 
@@ -68,6 +68,7 @@
 php_admin_value[session.save_handler] = files
 php_admin_value[open_basedir] = $open_basedir
 
+php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php
 php_value[include_path] = $include_path
 php_flag[magic_quotes_gpc] = off
 php_flag[track_vars] = on
1	jpp	1.1	diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess
2			--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess 2020-03-27 11:53:44.451000000 -0400
3			+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess 2020-03-27 12:15:18.099219531 -0400
4			@@ -47,6 +47,7 @@
5			else
6			{
7			$OUT .= qq(
8			+ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
9			<FilesMatch \.php\$>
10			SetHandler "proxy:unix:/var/run/php-fpm/horde.sock\|fcgi://localhost"
11			</FilesMatch>
12			diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde
13			--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde 2020-03-27 11:53:44.451000000 -0400
14			+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20Horde 2020-03-27 12:14:08.226307938 -0400
15			@@ -15,7 +15,7 @@
16			my $post_max_size = $horde->prop('PHPPostMaxSize') \|\| '10M';
17			my $upload_max_filesize = $horde->prop('PHPUploadMaxFilesize') \|\| '10M';
18			my $file_upload = $horde->prop('PHPFileUpload') \|\| 'enabled';
19			- my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data";
20			+ my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data:/usr/share/php";
21			my $open_basedir = $horde->prop('PHPBaseDir') \|\| '/usr/share/horde' .
22			':/etc/horde/' .
23			':/var/lib/php/' . $key .
24			@@ -29,7 +29,7 @@
25			$file_upload = ($file_upload =~ m/^1\|yes\|on\|enabled$/) ? 'on' : 'off';
26			$allow_url_fopen = "off" ; # ($allow_url_fopen =~ m/^1\|yes\|on\|enabled$/) ? 'on' : 'off';
27			$disabled_functions = join(', ', split /[,;:]/, $disabled_functions);
28			- $open_basedir = join(':', split(/[,;:]/, $open_basedir));
29			+ $open_basedir = join(':', split(/[,;:]/, $open_basedir . ",/usr/share/php"));
30
31			$OUT .=<<"_EOF" if ($version eq $PHP_VERSION);
32
33			@@ -68,6 +68,7 @@
34			php_admin_value[session.save_handler] = files
35			php_admin_value[open_basedir] = $open_basedir
36
37			+php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php
38			php_value[include_path] = $include_path
39			php_flag[magic_quotes_gpc] = off
40			php_flag[track_vars] = on