smeserver-egroupware/contribs10/smeserver-egroupware-1.8.6-bz12044-24syntax.patch

diff -urN smeserver-egroupware-1.8.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware smeserver-egroupware-1.8.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware
--- smeserver-egroupware-1.8.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware    2022-07-25 14:38:36.572385592 +0300
+++ smeserver-egroupware-1.8.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware        2022-07-25 14:42:41.363088279 +0300
@@ -23,14 +23,13 @@
   AddType text/xml .xml
   Options FollowSymLinks ExecCGI
   AllowOverride None
-  Order allow,deny
 {
     my $egw = $egroupware{'PublicAccess'} || "local";
     if ($egw eq "local")
     {
-  $OUT .= "  allow from $localAccess";    
+  $OUT .= "  Require ip $localAccess";    
     } else {
-  $OUT .= "  allow from all";
+  $OUT .= "  Require all granted";
     }
 }
   DirectoryIndex index.html index.php
@@ -58,8 +57,7 @@
   php_value upload_max_filesize 65M
   php_value max_input_vars 3000
   <Files ~ "\.inc\.php$">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 </Directory>
 
@@ -77,28 +75,26 @@
   Script PUT /opt/egroupware/html/icalsrv.php
   AddHandler ical/ics .ics
   Action ical/ics /opt/egroupware/html/icalsrv.php
-  Order allow,deny
 {
     my $egw = $egroupware{'PublicAccess'} || "local";
     if ($egw eq "local")
     {
-  $OUT .= "  allow from $localAccess";    
+  $OUT .= "  Require ip $localAccess";    
     } else {
-  $OUT .= "  allow from all";
+  $OUT .= "  Require all granted";
     }
 }
 </Location>
 
 <Location /egroupware/rpc.php>
   php_value mbstring.func_overload 0
-  Order allow,deny
 {
     my $egw = $egroupware{'PublicAccess'} || "local";
     if ($egw eq "local")
     {
-  $OUT .= "  allow from $localAccess";    
+  $OUT .= "  Require ip $localAccess";    
     } else {
-  $OUT .= "  allow from all";
+  $OUT .= "  Require all granted";
     }
 }
 </Location>
1	diff -urN smeserver-egroupware-1.8.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware smeserver-egroupware-1.8.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware
2	--- smeserver-egroupware-1.8.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware 2022-07-25 14:38:36.572385592 +0300
3	+++ smeserver-egroupware-1.8.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98egroupware 2022-07-25 14:42:41.363088279 +0300
4	@@ -23,14 +23,13 @@
5	AddType text/xml .xml
6	Options FollowSymLinks ExecCGI
7	AllowOverride None
8	- Order allow,deny
9	{
10	my $egw = $egroupware{'PublicAccess'} \|\| "local";
11	if ($egw eq "local")
12	{
13	- $OUT .= " allow from $localAccess";
14	+ $OUT .= " Require ip $localAccess";
15	} else {
16	- $OUT .= " allow from all";
17	+ $OUT .= " Require all granted";
18	}
19	}
20	DirectoryIndex index.html index.php
21	@@ -58,8 +57,7 @@
22	php_value upload_max_filesize 65M
23	php_value max_input_vars 3000
24	<Files ~ "\.inc\.php$">
25	- Order allow,deny
26	- Deny from all
27	+ Require all denied
28	</Files>
29	</Directory>
30
31	@@ -77,28 +75,26 @@
32	Script PUT /opt/egroupware/html/icalsrv.php
33	AddHandler ical/ics .ics
34	Action ical/ics /opt/egroupware/html/icalsrv.php
35	- Order allow,deny
36	{
37	my $egw = $egroupware{'PublicAccess'} \|\| "local";
38	if ($egw eq "local")
39	{
40	- $OUT .= " allow from $localAccess";
41	+ $OUT .= " Require ip $localAccess";
42	} else {
43	- $OUT .= " allow from all";
44	+ $OUT .= " Require all granted";
45	}
46	}
47	</Location>
48
49	<Location /egroupware/rpc.php>
50	php_value mbstring.func_overload 0
51	- Order allow,deny
52	{
53	my $egw = $egroupware{'PublicAccess'} \|\| "local";
54	if ($egw eq "local")
55	{
56	- $OUT .= " allow from $localAccess";
57	+ $OUT .= " Require ip $localAccess";
58	} else {
59	- $OUT .= " allow from all";
60	+ $OUT .= " Require all granted";
61	}
62	}
63	</Location>