smeserver-ezmlm-web/contribs10/smeserver-ezmlm-web-1.1.3-bz12045-httpd24.patch

diff -Nur --no-dereference smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess
--- smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess   2022-07-22 02:02:52.392000000 -0400
+++ smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess       2022-07-22 02:05:55.794000000 -0400
@@ -2,14 +2,13 @@
 
 <Directory /usr/local/share/ezmlm-web/www-data >
     Options +ExecCGI
-    order deny,allow
-    deny from all
-    allow from { "$localAccess"; }
     AuthName "SME User manager"
     AuthType Basic
     TKTAuthLoginURL /server-common/cgi-bin/login
-    require valid-user
-    Satisfy all
+    <RequireAll>
+      Require ip { "$localAccess"; }
+      Require valid-user
+    </RequireAll>
 
 </Directory>
 
diff -Nur --no-dereference smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web
--- smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web 2022-07-31 22:01:41.537000000 -0400
+++ smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web     2022-07-31 22:04:37.741000000 -0400
@@ -18,13 +18,11 @@
         }
 
         $OUT .= "    <Location /$place>\n";
-        $OUT .= "        order deny,allow\n";
-        $OUT .= "        deny from all\n";
         if (($haveSSL eq 'yes') && (($port eq "443") || ($plainTextAccess ne 'yes')))
         {
-            $OUT .= "        allow from $localAccess $externalSSLAccess\n";
+            $OUT .= "        Require ip $localAccess $externalSSLAccess\n";
         } else {
-            $OUT .= "        allow from $localAccess\n";
+            $OUT .= "        Require ip $localAccess\n";
         }
         $OUT .= "    </Location>\n";
     }
1	jpp	1.1	diff -Nur --no-dereference smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess
2			--- smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess 2022-07-22 02:02:52.392000000 -0400
3			+++ smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/admin-conf/httpd.conf/85EzmlmWebAccess 2022-07-22 02:05:55.794000000 -0400
4			@@ -2,14 +2,13 @@
5
6			<Directory /usr/local/share/ezmlm-web/www-data >
7			Options +ExecCGI
8			- order deny,allow
9			- deny from all
10			- allow from { "$localAccess"; }
11			AuthName "SME User manager"
12			AuthType Basic
13			TKTAuthLoginURL /server-common/cgi-bin/login
14			- require valid-user
15			- Satisfy all
16			+ <RequireAll>
17			+ Require ip { "$localAccess"; }
18			+ Require valid-user
19			+ </RequireAll>
20
21			</Directory>
22
23	jpp	1.2	diff -Nur --no-dereference smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web
24			--- smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web 2022-07-31 22:01:41.537000000 -0400
25			+++ smeserver-ezmlm-web-1.1.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28ezmlm-web 2022-07-31 22:04:37.741000000 -0400
26			@@ -18,13 +18,11 @@
27			}
28
29			$OUT .= " <Location /$place>\n";
30			- $OUT .= " order deny,allow\n";
31			- $OUT .= " deny from all\n";
32			if (($haveSSL eq 'yes') && (($port eq "443") \|\| ($plainTextAccess ne 'yes')))
33			{
34			- $OUT .= " allow from $localAccess $externalSSLAccess\n";
35			+ $OUT .= " Require ip $localAccess $externalSSLAccess\n";
36			} else {
37			- $OUT .= " allow from $localAccess\n";
38			+ $OUT .= " Require ip $localAccess\n";
39			}
40			$OUT .= " </Location>\n";
41			}