/[smecontribs]/rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz12056-httpd24.patch
ViewVC logotype

Annotation of /rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz12056-httpd24.patch

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

Revision 1.3 - (hide annotations) (download)
Mon Aug 1 03:25:02 2022 UTC (2 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-phpmyadmin-4_0_10_2-14_el7_sme, smeserver-phpmyadmin-4_0_10_2-13_el7_sme, HEAD
Changes since 1.2: +80 -0 lines 
* Sun Jul 31 2022 Jean-Philippe Pialasse <tests@pialasse.com> 4.0.10.2-13.sme
- update to httpd 2.4 access syntax [SME: 12056]
1 jpp 1.1 diff -Nur --no-dereference smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias
2     --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2022-07-23 23:59:14.647000000 -0400
3     +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2022-07-24 00:11:03.606000000 -0400
4     @@ -44,33 +44,32 @@
5     SSLRequireSSL
6     Options -Indexes
7     AllowOverride None
8     - order deny,allow
9     - deny from all
10     + <IfModule mod_access_compat.c>
11     + order deny,allow
12     + deny from all
13     + );
14 jpp 1.2 + $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " allow from all": " allow from $localAccess $externalSSLAccess";
15 jpp 1.1 + $OUT .= qq(
16     + Satisfy all
17     + </IfModule>
18     + <IfModule !mod_access_compat.c>
19     + <RequireAll>
20     + );
21     + $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " Require all granted": " Require ip $localAccess $externalSSLAccess";
22     + $OUT .= qq(
23     + </RequireAll>
24     + </IfModule>
25     );
26     -
27     -
28     - my $access = ($phpmyadmin{'access'} || 'private');
29     -
30     - if ("$access" eq "private")
31     - {
32     - $OUT .= "allow from $localAccess $externalSSLAccess";
33     - }
34     - elsif ("$access" eq "public")
35     - {
36     - $OUT .= "allow from all";
37     - }
38    
39     # we do not want people to mess with this for the moment
40     my $version = '74';
41    
42     $OUT .= qq(
43     - Satisfy all
44     AddType application/x-httpd-php .php
45     -
46     -<FilesMatch .php\$\>
47     - SetHandler "proxy:unix:/var/run/php-fpm/php$version-phpmyadmin.sock|fcgi://localhost"
48     -</FilesMatch>
49     -SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
50     + <FilesMatch .php\$\>
51     + SetHandler "proxy:unix:/var/run/php-fpm/php$version-phpmyadmin.sock|fcgi://localhost"
52     + </FilesMatch>
53     + SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
54     </Directory>
55    
56    
57     @@ -78,28 +77,48 @@
58     # phpMyAdmin upstream tarball
59     #
60     <Directory /usr/share/phpMyAdmin/setup/>
61     - Order Deny,Allow
62     - Deny from All
63     - Allow from None
64     + <IfModule mod_access_compat.c>
65     + Order Deny,Allow
66     + Deny from All
67     + Allow from None
68     + </IfModule>
69     + <IfModule !mod_access_compat.c>
70     + Require all denied
71     + </IfModule>
72     </Directory>
73    
74    
75     <Directory /usr/share/phpMyAdmin/libraries/>
76     - Order Deny,Allow
77     - Deny from All
78     - Allow from None
79     + <IfModule mod_access_compat.c>
80     + Order Deny,Allow
81     + Deny from All
82     + Allow from None
83     + </IfModule>
84     + <IfModule !mod_access_compat.c>
85     + Require all denied
86     + </IfModule>
87     </Directory>
88    
89     <Directory /usr/share/phpMyAdmin/setup/lib/>
90     - Order Deny,Allow
91     - Deny from All
92     - Allow from None
93     + <IfModule mod_access_compat.c>
94     + Order Deny,Allow
95     + Deny from All
96     + Allow from None
97     + </IfModule>
98     + <IfModule !mod_access_compat.c>
99     + Require all denied
100     + </IfModule>
101     </Directory>
102    
103     <Directory /usr/share/phpMyAdmin/setup/frames/>
104     - Order Deny,Allow
105     - Deny from All
106     - Allow from None
107     + <IfModule mod_access_compat.c>
108     + Order Deny,Allow
109     + Deny from All
110     + Allow from None
111     + </IfModule>
112     + <IfModule !mod_access_compat.c>
113     + Require all denied
114     + </IfModule>
115     </Directory>);
116    
117     }
118 jpp 1.3 diff -Nur --no-dereference smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias
119     --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2022-07-31 23:18:04.267000000 -0400
120     +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2022-07-31 23:22:01.899000000 -0400
121     @@ -44,21 +44,11 @@
122     SSLRequireSSL
123     Options -Indexes
124     AllowOverride None
125     - <IfModule mod_access_compat.c>
126     - order deny,allow
127     - deny from all
128     - );
129     - $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " allow from all": " allow from $localAccess $externalSSLAccess";
130     - $OUT .= qq(
131     - Satisfy all
132     - </IfModule>
133     - <IfModule !mod_access_compat.c>
134     - <RequireAll>
135     + <RequireAll>
136     );
137     $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ? " Require all granted": " Require ip $localAccess $externalSSLAccess";
138     $OUT .= qq(
139     - </RequireAll>
140     - </IfModule>
141     + </RequireAll>
142     );
143    
144     # we do not want people to mess with this for the moment
145     @@ -77,48 +67,20 @@
146     # phpMyAdmin upstream tarball
147     #
148     <Directory /usr/share/phpMyAdmin/setup/>
149     - <IfModule mod_access_compat.c>
150     - Order Deny,Allow
151     - Deny from All
152     - Allow from None
153     - </IfModule>
154     - <IfModule !mod_access_compat.c>
155     - Require all denied
156     - </IfModule>
157     + Require all denied
158     </Directory>
159    
160    
161     <Directory /usr/share/phpMyAdmin/libraries/>
162     - <IfModule mod_access_compat.c>
163     - Order Deny,Allow
164     - Deny from All
165     - Allow from None
166     - </IfModule>
167     - <IfModule !mod_access_compat.c>
168     - Require all denied
169     - </IfModule>
170     + Require all denied
171     </Directory>
172    
173     <Directory /usr/share/phpMyAdmin/setup/lib/>
174     - <IfModule mod_access_compat.c>
175     - Order Deny,Allow
176     - Deny from All
177     - Allow from None
178     - </IfModule>
179     - <IfModule !mod_access_compat.c>
180     - Require all denied
181     - </IfModule>
182     + Require all denied
183     </Directory>
184    
185     <Directory /usr/share/phpMyAdmin/setup/frames/>
186     - <IfModule mod_access_compat.c>
187     - Order Deny,Allow
188     - Deny from All
189     - Allow from None
190     - </IfModule>
191     - <IfModule !mod_access_compat.c>
192     - Require all denied
193     - </IfModule>
194     + Require all denied
195     </Directory>);
196    
197     }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed