/[smeserver]/rpms/e-smith-apache/sme10/e-smith-apache-2.6.0-bz9375-Require.patch
ViewVC logotype

Contents of /rpms/e-smith-apache/sme10/e-smith-apache-2.6.0-bz9375-Require.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Sat Apr 16 06:08:09 2022 UTC (2 years, 7 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-apache-2_6_0-20_el7_sme, e-smith-apache-2_6_0-23_el7_sme, e-smith-apache-2_6_0-21_el7_sme, e-smith-apache-2_6_0-22_el7_sme, e-smith-apache-2_6_0-19_el7_sme, HEAD 
* Sat Apr 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-19.sme
- convert httpd 2.2 allow,deny to Require for 2.4 [SME: 9375]
- use maxsize, not size [SME: 11867]
1 diff -Nur --no-dereference e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35ProxyPass e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35ProxyPass
2 --- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35ProxyPass 2006-03-14 11:47:18.000000000 -0500
3 +++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35ProxyPass 2022-04-16 01:53:25.694000000 -0400
4 @@ -42,9 +42,7 @@
5 $valid =~ s/,/ /g;
6 # Make sure that /32 ValidFrom specs don't cause Apache problems.
7 $valid =~ s:/255.255.255.255::g;
8 - $OUT .= " order deny,allow\n";
9 - $OUT .= " deny from all\n";
10 - $OUT .= " allow from $valid\n";
11 + $OUT .= " Require ip $valid\n";
12 }
13 $OUT .= "</Location>\n";
14 }
15 diff -Nur --no-dereference e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80DenyHTAccess e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80DenyHTAccess
16 --- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80DenyHTAccess 2006-03-14 11:47:18.000000000 -0500
17 +++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80DenyHTAccess 2022-04-16 01:54:59.664000000 -0400
18 @@ -1,4 +1,3 @@
19 <FilesMatch "^\.ht">
20 - Order allow,deny
21 - Deny from all
22 + Require all denied
23 </FilesMatch>
24 diff -Nur --no-dereference e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85DefaultAccess e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85DefaultAccess
25 --- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85DefaultAccess 2003-01-07 10:00:49.000000000 -0500
26 +++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85DefaultAccess 2022-04-16 01:56:11.959000000 -0400
27 @@ -5,8 +5,6 @@
28 <Directory />
29 Options None
30 AllowOverride None
31 - order deny,allow
32 - deny from all
33 - allow from none
34 + Require all denied
35 </Directory>
36
37 diff -Nur --no-dereference e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85ServerResourcesAccess e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85ServerResourcesAccess
38 --- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85ServerResourcesAccess 2006-03-14 11:47:18.000000000 -0500
39 +++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85ServerResourcesAccess 2022-04-16 01:57:06.336000000 -0400
40 @@ -2,7 +2,5 @@
41
42 <Directory /home/e-smith/files/server-resources>
43 Options +Indexes
44 - order deny,allow
45 - deny from all
46 - allow from { "$localAccess $externalSSLAccess"; }
47 + Require ip { "$localAccess $externalSSLAccess"; }
48 </Directory>
49 diff -Nur --no-dereference e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess10icons e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess10icons
50 --- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess10icons 2022-04-16 01:50:03.262000000 -0400
51 +++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess10icons 2022-04-16 01:58:47.027000000 -0400
52 @@ -5,8 +5,6 @@
53 <Directory /usr/share/httpd/icons>
54 Options None
55 AllowOverride None
56 - order deny,allow
57 - deny from all
58 - allow from all
59 + Require all granted
60 </Directory>
61
62 diff -Nur --no-dereference e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95ProxyService e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95ProxyService
63 --- e-smith-apache-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95ProxyService 2006-03-14 11:47:18.000000000 -0500
64 +++ e-smith-apache-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95ProxyService 2022-04-16 01:59:42.627000000 -0400
65 @@ -18,9 +18,7 @@
66 $OUT .= " ProxyRequests on\n";
67 $OUT .= " NoCache *\n";
68 $OUT .= " <Directory proxy:>\n";
69 - $OUT .= "\torder deny,allow\n";
70 - $OUT .= "\tdeny from all\n";
71 - $OUT .= "\tallow from $localAccess\n";
72 + $OUT .= "\tRequire ip $localAccess\n";
73 $OUT .= " </Directory>\n";
74 $OUT .= "</VirtualHost>\n";
75 }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed