/[smecontribs]/rpms/smeserver-print-monitor/contribs10/smeserver-print-monitor-0.0.7-bz12058-httpd24.patch
ViewVC logotype

Contents of /rpms/smeserver-print-monitor/contribs10/smeserver-print-monitor-0.0.7-bz12058-httpd24.patch

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

Revision 1.3 - (show annotations) (download)
Mon Aug 1 03:59:10 2022 UTC (2 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-print-monitor-0_0_7-8_el7_sme, smeserver-print-monitor-0_0_7-7_el7_sme, HEAD
Changes since 1.2: +63 -0 lines
Error occurred while calculating annotation data. 
* Sun Jul 31 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.0.7-7.sme
- update to httpd 2.4 access syntax [SME: 12058]
  removed compat sections, adding Requirement for e-smith-apache >= 2.6.0-19
1 diff -Nur --no-dereference smeserver-print-monitor-0.0.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng smeserver-print-monitor-0.0.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng
2 --- smeserver-print-monitor-0.0.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng 2022-07-24 00:51:13.644000000 -0400
3 +++ smeserver-print-monitor-0.0.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng 2022-07-24 01:06:28.619000000 -0400
4 @@ -29,45 +29,67 @@
5 }
6
7 $OUT .= <<HERE;
8 -# LPRng
9 +#------------------------------------------------------------
10 +# LPRng - smeserver-print-monitor contrib
11 +#------------------------------------------------------------
12 Alias /LPRng /var/www/html/LPRng
13 <Directory /var/www/html/LPRng>
14 AllowOverride None
15 Options +Indexes
16 - order deny,allow
17 - deny from all
18 - allow from all
19 AuthName "SME Server Manager"
20 AuthType Basic
21 AuthBasicProvider external
22 AuthExternal pwauth
23 - require user admin $lprusers
24 + <IfModule mod_access_compat.c>
25 + order deny,allow
26 + deny from all
27 + allow from all
28 + Require user admin $lprusers
29 + </IfModule>
30 + <IfModule !mod_access_compat.c>
31 + Require user admin $lprusers
32 + </IfModule>
33 </Directory>
34 <Directory /var/www/html/LPRng/admin>
35 AllowOverride None
36 Options +Indexes
37 - order deny,allow
38 - deny from all
39 - allow from all
40 AuthName "SME Server Manager"
41 AuthType Basic
42 AuthBasicProvider external
43 AuthExternal pwauth
44 - require user admin $lprusers
45 + <IfModule mod_access_compat.c>
46 + order deny,allow
47 + deny from all
48 + allow from all
49 + Require user admin $lprusers
50 + </IfModule>
51 + <IfModule !mod_access_compat.c>
52 + Require user admin $lprusers
53 + </IfModule>
54 </Directory>
55 <Directory /var/www/html/LPRng/cgi-bin>
56 Options ExecCGI
57 AllowOverride None
58 - order deny,allow
59 - deny from all
60 - allow from all
61 + <IfModule mod_access_compat.c>
62 + order deny,allow
63 + deny from all
64 + allow from all
65 + </IfModule>
66 + <IfModule !mod_access_compat.c>
67 + Require all granted
68 + </IfModule>
69 </Directory>
70 <Directory /var/www/html/LPRng/admin/cgi-bin>
71 Options ExecCGI FollowSymLinks
72 AllowOverride None
73 - order deny,allow
74 - deny from all
75 - allow from all
76 + <IfModule mod_access_compat.c>
77 + order deny,allow
78 + deny from all
79 + allow from all
80 + </IfModule>
81 + <IfModule !mod_access_compat.c>
82 + Require all granted
83 + </IfModule>
84 </Directory>
85 # LPRng end
86 HERE
87 diff -Nur --no-dereference smeserver-print-monitor-0.0.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng smeserver-print-monitor-0.0.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng
88 --- smeserver-print-monitor-0.0.7.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng 2022-07-31 23:51:26.851000000 -0400
89 +++ smeserver-print-monitor-0.0.7/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40LPRng 2022-07-31 23:57:03.652000000 -0400
90 @@ -40,15 +40,7 @@
91 AuthType Basic
92 AuthBasicProvider external
93 AuthExternal pwauth
94 - <IfModule mod_access_compat.c>
95 - order deny,allow
96 - deny from all
97 - allow from all
98 - Require user admin $lprusers
99 - </IfModule>
100 - <IfModule !mod_access_compat.c>
101 - Require user admin $lprusers
102 - </IfModule>
103 + Require user admin $lprusers
104 </Directory>
105 <Directory /var/www/html/LPRng/admin>
106 AllowOverride None
107 @@ -57,39 +49,17 @@
108 AuthType Basic
109 AuthBasicProvider external
110 AuthExternal pwauth
111 - <IfModule mod_access_compat.c>
112 - order deny,allow
113 - deny from all
114 - allow from all
115 - Require user admin $lprusers
116 - </IfModule>
117 - <IfModule !mod_access_compat.c>
118 - Require user admin $lprusers
119 - </IfModule>
120 + Require user admin $lprusers
121 </Directory>
122 <Directory /var/www/html/LPRng/cgi-bin>
123 Options ExecCGI
124 AllowOverride None
125 - <IfModule mod_access_compat.c>
126 - order deny,allow
127 - deny from all
128 - allow from all
129 - </IfModule>
130 - <IfModule !mod_access_compat.c>
131 - Require all granted
132 - </IfModule>
133 + Require all granted
134 </Directory>
135 <Directory /var/www/html/LPRng/admin/cgi-bin>
136 Options ExecCGI FollowSymLinks
137 AllowOverride None
138 - <IfModule mod_access_compat.c>
139 - order deny,allow
140 - deny from all
141 - allow from all
142 - </IfModule>
143 - <IfModule !mod_access_compat.c>
144 - Require all granted
145 - </IfModule>
146 + Require all granted
147 </Directory>
148 # LPRng end
149 HERE
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed