Contents of /trunk/firewalld/patches/firewalld-0.3.10-confd.patch
Parent Directory | Revision Log
Revision 2448 -
(show annotations)
(download)
Tue Jul 1 11:32:17 2014 UTC (10 years, 2 months ago) by niro
File size: 26705 byte(s)
Tue Jul 1 11:32:17 2014 UTC (10 years, 2 months ago) by niro
File size: 26705 byte(s)
-re-diffed conf.d patch
1 | diff -Naur firewalld-0.3.10/config/firewalld.init firewalld-0.3.10-magellan/config/firewalld.init |
2 | --- firewalld-0.3.10/config/firewalld.init 2013-05-10 10:50:44.000000000 +0000 |
3 | +++ firewalld-0.3.10-magellan/config/firewalld.init 2014-07-01 13:59:43.276000000 +0000 |
4 | @@ -29,7 +29,7 @@ |
5 | prog="firewalld" |
6 | #config="/etc/firewalld/firewalld.conf" |
7 | |
8 | -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog |
9 | +[ -e /etc/conf.d/$prog ] && . /etc/conf.d/$prog |
10 | |
11 | lockfile=/var/lock/subsys/$prog |
12 | |
13 | diff -Naur firewalld-0.3.10/config/firewalld.service.in firewalld-0.3.10-magellan/config/firewalld.service.in |
14 | --- firewalld-0.3.10/config/firewalld.service.in 2013-05-10 10:50:44.000000000 +0000 |
15 | +++ firewalld-0.3.10-magellan/config/firewalld.service.in 2014-07-01 13:59:25.860000000 +0000 |
16 | @@ -6,7 +6,7 @@ |
17 | Conflicts=iptables.service ip6tables.service ebtables.service |
18 | |
19 | [Service] |
20 | -EnvironmentFile=-/etc/sysconfig/firewalld |
21 | +EnvironmentFile=-/etc/conf.d/firewalld |
22 | ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS |
23 | ExecReload=/bin/kill -HUP $MAINPID |
24 | # supress to log debug and error output also to /var/log/messages |
25 | diff -Naur firewalld-0.3.10/config/Makefile.am firewalld-0.3.10-magellan/config/Makefile.am |
26 | --- firewalld-0.3.10/config/Makefile.am 2014-05-28 15:56:56.000000000 +0000 |
27 | +++ firewalld-0.3.10-magellan/config/Makefile.am 2014-07-01 13:58:05.460000000 +0000 |
28 | @@ -164,12 +164,12 @@ |
29 | $(edit) $< >$@ |
30 | |
31 | install-sysconfig: |
32 | - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
33 | - $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
34 | + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d |
35 | + $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
36 | |
37 | uninstall-sysconfig: |
38 | - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
39 | - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
40 | + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
41 | + rmdir $(DESTDIR)$(sysconfdir)/conf.d || : |
42 | |
43 | install-init: install-sysconfig |
44 | $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d |
45 | diff -Naur firewalld-0.3.10/config/Makefile.in firewalld-0.3.10-magellan/config/Makefile.in |
46 | --- firewalld-0.3.10/config/Makefile.in 2014-05-28 16:24:47.000000000 +0000 |
47 | +++ firewalld-0.3.10-magellan/config/Makefile.in 2014-07-01 13:59:02.949000000 +0000 |
48 | @@ -761,12 +761,12 @@ |
49 | $(edit) $< >$@ |
50 | |
51 | install-sysconfig: |
52 | - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig |
53 | - $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
54 | + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/conf.d |
55 | + $(INSTALL_DATA) $(srcdir)/firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
56 | |
57 | uninstall-sysconfig: |
58 | - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
59 | - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : |
60 | + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
61 | + rmdir $(DESTDIR)$(sysconfdir)/conf.d || : |
62 | |
63 | install-init: install-sysconfig |
64 | $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d |
65 | diff -Naur firewalld-0.3.10/doc/man/man1/firewall-offline-cmd.1 firewalld-0.3.10-magellan/doc/man/man1/firewall-offline-cmd.1 |
66 | --- firewalld-0.3.10/doc/man/man1/firewall-offline-cmd.1 2014-05-28 16:24:53.000000000 +0000 |
67 | +++ firewalld-0.3.10-magellan/doc/man/man1/firewall-offline-cmd.1 2014-07-01 13:55:39.843000000 +0000 |
68 | @@ -42,7 +42,7 @@ |
69 | .SH "OPTIONS" |
70 | .PP |
71 | If no options are given, configuration from |
72 | -\fB/etc/sysconfig/system\-config\-firewall\fR |
73 | +\fB/etc/conf.d/system\-config\-firewall\fR |
74 | will be migrated\&. |
75 | .PP |
76 | The following options are supported: |
77 | diff -Naur firewalld-0.3.10/doc/xml/firewall-offline-cmd.xml firewalld-0.3.10-magellan/doc/xml/firewall-offline-cmd.xml |
78 | --- firewalld-0.3.10/doc/xml/firewall-offline-cmd.xml 2014-05-15 11:46:34.000000000 +0000 |
79 | +++ firewalld-0.3.10-magellan/doc/xml/firewall-offline-cmd.xml 2014-07-01 13:55:18.365000000 +0000 |
80 | @@ -68,7 +68,7 @@ |
81 | <refsect1 id="options"> |
82 | <title>Options</title> |
83 | <para> |
84 | - If no options are given, configuration from <command>/etc/sysconfig/system-config-firewall</command> will be migrated. |
85 | + If no options are given, configuration from <command>/etc/conf.d/system-config-firewall</command> will be migrated. |
86 | </para> |
87 | <para> |
88 | The following options are supported: |
89 | diff -Naur firewalld-0.3.10/firewalld.spec firewalld-0.3.10-magellan/firewalld.spec |
90 | --- firewalld-0.3.10/firewalld.spec 2014-05-28 16:55:40.000000000 +0000 |
91 | +++ firewalld-0.3.10-magellan/firewalld.spec 2014-07-01 13:54:50.204000000 +0000 |
92 | @@ -128,7 +128,7 @@ |
93 | %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services |
94 | %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones |
95 | %defattr(0644,root,root) |
96 | -%config(noreplace) %{_sysconfdir}/sysconfig/firewalld |
97 | +%config(noreplace) %{_sysconfdir}/conf.d/firewalld |
98 | #%attr(0755,root,root) %{_initrddir}/firewalld |
99 | %{_unitdir}/firewalld.service |
100 | %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf |
101 | diff -Naur firewalld-0.3.10/po/as.po firewalld-0.3.10-magellan/po/as.po |
102 | --- firewalld-0.3.10/po/as.po 2014-05-28 17:03:49.000000000 +0000 |
103 | +++ firewalld-0.3.10-magellan/po/as.po 2014-07-01 14:00:45.926000000 +0000 |
104 | @@ -1564,10 +1564,10 @@ |
105 | |
106 | #~ msgid "" |
107 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
108 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
109 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
110 | #~ msgstr "" |
111 | #~ "উপেক্ষিত বিকল্প। ফায়াৰৱালত স্বনিৰ্বাচিত নিয়মসমূহ যোগ কৰাৰ বাবে ব্যৱহাৰ কৰা " |
112 | -#~ "হৈছিল (উদাহৰণস্বৰূপ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
113 | +#~ "হৈছিল (উদাহৰণস্বৰূপ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
114 | |
115 | #~ msgid "" |
116 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
117 | diff -Naur firewalld-0.3.10/po/bn_IN.po firewalld-0.3.10-magellan/po/bn_IN.po |
118 | --- firewalld-0.3.10/po/bn_IN.po 2014-05-28 17:03:49.000000000 +0000 |
119 | +++ firewalld-0.3.10-magellan/po/bn_IN.po 2014-07-01 14:00:45.934000000 +0000 |
120 | @@ -1566,10 +1566,10 @@ |
121 | |
122 | #~ msgid "" |
123 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
124 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
125 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
126 | #~ msgstr "" |
127 | #~ "উপেক্ষিত বিকল্প। ফায়ারওয়ালে স্বনির্ধারিত নিয়ম যোগ করতে ব্যবহার করা হয়েছে " |
128 | -#~ "(উদাহরণ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
129 | +#~ "(উদাহরণ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
130 | |
131 | #~ msgid "" |
132 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
133 | diff -Naur firewalld-0.3.10/po/de.po firewalld-0.3.10-magellan/po/de.po |
134 | --- firewalld-0.3.10/po/de.po 2014-05-28 17:03:50.000000000 +0000 |
135 | +++ firewalld-0.3.10-magellan/po/de.po 2014-07-01 14:00:45.968000000 +0000 |
136 | @@ -1626,10 +1626,10 @@ |
137 | |
138 | #~ msgid "" |
139 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
140 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
141 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
142 | #~ msgstr "" |
143 | #~ "Unberücksichtigte Option. Dies wurde benutzt, um benutzerdefinierte " |
144 | -#~ "Regeln zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/sysconfig/" |
145 | +#~ "Regeln zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/conf.d/" |
146 | #~ "ipv4_filter_addon)" |
147 | |
148 | #~ msgid "" |
149 | diff -Naur firewalld-0.3.10/po/en_GB.po firewalld-0.3.10-magellan/po/en_GB.po |
150 | --- firewalld-0.3.10/po/en_GB.po 2014-05-28 17:03:50.000000000 +0000 |
151 | +++ firewalld-0.3.10-magellan/po/en_GB.po 2014-07-01 14:00:45.976000000 +0000 |
152 | @@ -1515,10 +1515,10 @@ |
153 | |
154 | #~ msgid "" |
155 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
156 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
157 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
158 | #~ msgstr "" |
159 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
160 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
161 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
162 | |
163 | #~ msgid "" |
164 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
165 | diff -Naur firewalld-0.3.10/po/es.po firewalld-0.3.10-magellan/po/es.po |
166 | --- firewalld-0.3.10/po/es.po 2014-05-28 17:03:50.000000000 +0000 |
167 | +++ firewalld-0.3.10-magellan/po/es.po 2014-07-01 14:00:45.984000000 +0000 |
168 | @@ -1595,10 +1595,10 @@ |
169 | |
170 | #~ msgid "" |
171 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
172 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
173 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
174 | #~ msgstr "" |
175 | #~ "Opción ignorada. Se usó para agregar reglas personalizadas al cortafuego " |
176 | -#~ "(Ejemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
177 | +#~ "(Ejemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
178 | |
179 | #~ msgid "" |
180 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
181 | diff -Naur firewalld-0.3.10/po/gu.po firewalld-0.3.10-magellan/po/gu.po |
182 | --- firewalld-0.3.10/po/gu.po 2014-05-28 17:03:50.000000000 +0000 |
183 | +++ firewalld-0.3.10-magellan/po/gu.po 2014-07-01 14:00:46.006000000 +0000 |
184 | @@ -1552,10 +1552,10 @@ |
185 | |
186 | #~ msgid "" |
187 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
188 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
189 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
190 | #~ msgstr "" |
191 | #~ "અવગણેલ વિકલ્પ. ફાયરવોલમાં વૈવિધ્ય નિયમોનું વાપરેલ હતુ (ઉદાહરણ: ipv4:filter:/etc/" |
192 | -#~ "sysconfig/ipv4_filter_addon)" |
193 | +#~ "conf.d/ipv4_filter_addon)" |
194 | |
195 | #~ msgid "" |
196 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
197 | diff -Naur firewalld-0.3.10/po/hi.po firewalld-0.3.10-magellan/po/hi.po |
198 | --- firewalld-0.3.10/po/hi.po 2014-05-28 17:03:51.000000000 +0000 |
199 | +++ firewalld-0.3.10-magellan/po/hi.po 2014-07-01 14:00:46.014000000 +0000 |
200 | @@ -1551,10 +1551,10 @@ |
201 | |
202 | #~ msgid "" |
203 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
204 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
205 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
206 | #~ msgstr "" |
207 | #~ "अनदेखा विकल्प. फ़ायरवॉल में पसंदीदा नियम जोड़ने के लिए प्रयुक्त (उदाहरण: ipv4:filter:/" |
208 | -#~ "etc/sysconfig/ipv4_filter_addon)" |
209 | +#~ "etc/conf.d/ipv4_filter_addon)" |
210 | |
211 | #~ msgid "" |
212 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
213 | diff -Naur firewalld-0.3.10/po/it.po firewalld-0.3.10-magellan/po/it.po |
214 | --- firewalld-0.3.10/po/it.po 2014-05-28 17:03:51.000000000 +0000 |
215 | +++ firewalld-0.3.10-magellan/po/it.po 2014-07-01 14:00:46.029000000 +0000 |
216 | @@ -1604,10 +1604,10 @@ |
217 | |
218 | #~ msgid "" |
219 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
220 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
221 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
222 | #~ msgstr "" |
223 | #~ "Opzione ignorata. E' utilizzata per aggiungere regole personalizzate per " |
224 | -#~ "il firewall (Esempio : ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
225 | +#~ "il firewall (Esempio : ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
226 | |
227 | #~ msgid "" |
228 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
229 | diff -Naur firewalld-0.3.10/po/ja.po firewalld-0.3.10-magellan/po/ja.po |
230 | --- firewalld-0.3.10/po/ja.po 2014-05-28 17:03:51.000000000 +0000 |
231 | +++ firewalld-0.3.10-magellan/po/ja.po 2014-07-01 14:00:46.037000000 +0000 |
232 | @@ -1586,10 +1586,10 @@ |
233 | |
234 | #~ msgid "" |
235 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
236 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
237 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
238 | #~ msgstr "" |
239 | #~ "無視されたオプション、カスタムルールをファイアウォールに追加するために使用" |
240 | -#~ "されました (例: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)。" |
241 | +#~ "されました (例: ipv4:filter:/etc/conf.d/ipv4_filter_addon)。" |
242 | |
243 | #~ msgid "" |
244 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
245 | diff -Naur firewalld-0.3.10/po/kn.po firewalld-0.3.10-magellan/po/kn.po |
246 | --- firewalld-0.3.10/po/kn.po 2014-05-28 17:03:51.000000000 +0000 |
247 | +++ firewalld-0.3.10-magellan/po/kn.po 2014-07-01 14:00:46.046000000 +0000 |
248 | @@ -1578,10 +1578,10 @@ |
249 | |
250 | #~ msgid "" |
251 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
252 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
253 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
254 | #~ msgstr "" |
255 | #~ "ಕಡೆಗಣಿಸಲಾದ ಆಯ್ಕೆ.. ಫೈರ್ವಾಲ್ಗೆ ಅಗತ್ಯಾನುಗಣವಾದ ನಿಯಮಗಳನ್ನು ಸೇರಿಸಲು ಇದನ್ನು " |
256 | -#~ "ಬಳಸಲಾಗಿತ್ತು (ಉದಾಹರಣೆಗೆ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
257 | +#~ "ಬಳಸಲಾಗಿತ್ತು (ಉದಾಹರಣೆಗೆ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
258 | |
259 | #~ msgid "" |
260 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
261 | diff -Naur firewalld-0.3.10/po/ko.po firewalld-0.3.10-magellan/po/ko.po |
262 | --- firewalld-0.3.10/po/ko.po 2014-05-28 17:03:51.000000000 +0000 |
263 | +++ firewalld-0.3.10-magellan/po/ko.po 2014-07-01 14:00:46.054000000 +0000 |
264 | @@ -1568,10 +1568,10 @@ |
265 | |
266 | #~ msgid "" |
267 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
268 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
269 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
270 | #~ msgstr "" |
271 | #~ "무시된 옵션입니다. 방화벽에 사용자 지정 규칙을 추가하기 위해 사용되었습니" |
272 | -#~ "다 (예: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
273 | +#~ "다 (예: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
274 | |
275 | #~ msgid "" |
276 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
277 | diff -Naur firewalld-0.3.10/po/ml.po firewalld-0.3.10-magellan/po/ml.po |
278 | --- firewalld-0.3.10/po/ml.po 2014-05-28 17:03:51.000000000 +0000 |
279 | +++ firewalld-0.3.10-magellan/po/ml.po 2014-07-01 14:00:46.064000000 +0000 |
280 | @@ -1565,10 +1565,10 @@ |
281 | |
282 | #~ msgid "" |
283 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
284 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
285 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
286 | #~ msgstr "" |
287 | #~ "ഉപേക്ഷിച്ച ഐച്ഛികം. ഫയര്വോളിനു് യഥേഷ്ടമുള്ള നിയമങ്ങള് ചേര്ക്കുവാന് ഉപയോഗിച്ചിരിയ്ക്കുന്നു " |
288 | -#~ "(ഉദാഹരണത്തിനു്: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
289 | +#~ "(ഉദാഹരണത്തിനു്: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
290 | |
291 | #~ msgid "" |
292 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
293 | diff -Naur firewalld-0.3.10/po/mr.po firewalld-0.3.10-magellan/po/mr.po |
294 | --- firewalld-0.3.10/po/mr.po 2014-05-28 17:03:51.000000000 +0000 |
295 | +++ firewalld-0.3.10-magellan/po/mr.po 2014-07-01 14:00:46.072000000 +0000 |
296 | @@ -1557,10 +1557,10 @@ |
297 | |
298 | #~ msgid "" |
299 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
300 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
301 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
302 | #~ msgstr "" |
303 | #~ "दुर्लक्ष केलेले पर्याय. फायरवॉलकरिता पसंतीचे रूल्स समाविष्ट करण्यासाठी वापरले गेले " |
304 | -#~ "(उदाहरणार्थ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
305 | +#~ "(उदाहरणार्थ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
306 | |
307 | #~ msgid "" |
308 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
309 | diff -Naur firewalld-0.3.10/po/nl.po firewalld-0.3.10-magellan/po/nl.po |
310 | --- firewalld-0.3.10/po/nl.po 2014-05-28 17:03:52.000000000 +0000 |
311 | +++ firewalld-0.3.10-magellan/po/nl.po 2014-07-01 14:00:46.081000000 +0000 |
312 | @@ -1590,10 +1590,10 @@ |
313 | |
314 | #~ msgid "" |
315 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
316 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
317 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
318 | #~ msgstr "" |
319 | #~ "Genegeerde optie. Werd gebruikt om aangepaste regels toe te voegen aan de " |
320 | -#~ "firewall (Voorbeeld: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
321 | +#~ "firewall (Voorbeeld: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
322 | |
323 | #~ msgid "" |
324 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
325 | diff -Naur firewalld-0.3.10/po/or.po firewalld-0.3.10-magellan/po/or.po |
326 | --- firewalld-0.3.10/po/or.po 2014-05-28 17:03:52.000000000 +0000 |
327 | +++ firewalld-0.3.10-magellan/po/or.po 2014-07-01 14:00:46.087000000 +0000 |
328 | @@ -1556,10 +1556,10 @@ |
329 | |
330 | #~ msgid "" |
331 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
332 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
333 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
334 | #~ msgstr "" |
335 | #~ "ଅଗ୍ରହଣୀୟ ବିକଳ୍ପ। ଇଚ୍ଛାରୂପଣ ନିୟମାବଳୀକୁ ଫାୟାରୱାଲରେ ଯୋଗ କରିବା ପାଇଁ ବ୍ୟବହାର କରିଥାଏ " |
336 | -#~ "(ଉଦାହରଣ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
337 | +#~ "(ଉଦାହରଣ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
338 | |
339 | #~ msgid "" |
340 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
341 | diff -Naur firewalld-0.3.10/po/pa.po firewalld-0.3.10-magellan/po/pa.po |
342 | --- firewalld-0.3.10/po/pa.po 2014-05-28 17:03:52.000000000 +0000 |
343 | +++ firewalld-0.3.10-magellan/po/pa.po 2014-07-01 14:00:46.093000000 +0000 |
344 | @@ -1555,10 +1555,10 @@ |
345 | |
346 | #~ msgid "" |
347 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
348 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
349 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
350 | #~ msgstr "" |
351 | #~ "ਅਣਗੌਲੀ ਚੋਣ। ਫਾਇਰਵਾਲ ਲਈ ਚੁਣਿੰਦਾ ਨਿਯਮ ਜੋੜਨ ਲਈ ਵਰਤੀ ਗਈ ਸੀ (ਉਦਾਹਰਣ: ipv4:filter:/" |
352 | -#~ "etc/sysconfig/ipv4_filter_addon)" |
353 | +#~ "etc/conf.d/ipv4_filter_addon)" |
354 | |
355 | #~ msgid "" |
356 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
357 | diff -Naur firewalld-0.3.10/po/pl.po firewalld-0.3.10-magellan/po/pl.po |
358 | --- firewalld-0.3.10/po/pl.po 2014-05-28 17:03:52.000000000 +0000 |
359 | +++ firewalld-0.3.10-magellan/po/pl.po 2014-07-01 14:00:46.099000000 +0000 |
360 | @@ -1551,10 +1551,10 @@ |
361 | |
362 | #~ msgid "" |
363 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
364 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
365 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
366 | #~ msgstr "" |
367 | #~ "Ignorowana opcja. Była używana do dodawania własnych reguł do zapory " |
368 | -#~ "sieciowej (przykład: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
369 | +#~ "sieciowej (przykład: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
370 | |
371 | #~ msgid "" |
372 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
373 | diff -Naur firewalld-0.3.10/po/pt_BR.po firewalld-0.3.10-magellan/po/pt_BR.po |
374 | --- firewalld-0.3.10/po/pt_BR.po 2014-05-28 17:03:52.000000000 +0000 |
375 | +++ firewalld-0.3.10-magellan/po/pt_BR.po 2014-07-01 14:00:46.105000000 +0000 |
376 | @@ -1611,10 +1611,10 @@ |
377 | |
378 | #~ msgid "" |
379 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
380 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
381 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
382 | #~ msgstr "" |
383 | #~ "Ignorando a opção. Foi usado para adicionar regras personalizadas para o " |
384 | -#~ "firewall (Exemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
385 | +#~ "firewall (Exemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
386 | |
387 | #~ msgid "" |
388 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
389 | diff -Naur firewalld-0.3.10/po/ru.po firewalld-0.3.10-magellan/po/ru.po |
390 | --- firewalld-0.3.10/po/ru.po 2014-05-28 17:03:52.000000000 +0000 |
391 | +++ firewalld-0.3.10-magellan/po/ru.po 2014-07-01 14:00:46.116000000 +0000 |
392 | @@ -1575,10 +1575,10 @@ |
393 | |
394 | #~ msgid "" |
395 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
396 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
397 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
398 | #~ msgstr "" |
399 | #~ "Игнорируемый параметр. Использовался для добавления дополнительных правил " |
400 | -#~ "межсетевого экрана. Пример: ipv4:filter:/etc/sysconfig/ipv4_filter_addon" |
401 | +#~ "межсетевого экрана. Пример: ipv4:filter:/etc/conf.d/ipv4_filter_addon" |
402 | |
403 | #~ msgid "" |
404 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
405 | diff -Naur firewalld-0.3.10/po/ta.po firewalld-0.3.10-magellan/po/ta.po |
406 | --- firewalld-0.3.10/po/ta.po 2014-05-28 17:03:53.000000000 +0000 |
407 | +++ firewalld-0.3.10-magellan/po/ta.po 2014-07-01 14:00:46.142000000 +0000 |
408 | @@ -1579,10 +1579,10 @@ |
409 | |
410 | #~ msgid "" |
411 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
412 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
413 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
414 | #~ msgstr "" |
415 | #~ "விருப்பம் புறக்கணிக்கப்பட்டது. ஃபயர்வாலுக்கு தனிப்பயன் விதியைச் சேர்க்கப் " |
416 | -#~ "பயன்படுத்தப்பட்டது (எடுத்துக்காட்டு: ipv4:filter:/etc/sysconfig/" |
417 | +#~ "பயன்படுத்தப்பட்டது (எடுத்துக்காட்டு: ipv4:filter:/etc/conf.d/" |
418 | #~ "ipv4_filter_addon)" |
419 | |
420 | #~ msgid "" |
421 | diff -Naur firewalld-0.3.10/po/te.po firewalld-0.3.10-magellan/po/te.po |
422 | --- firewalld-0.3.10/po/te.po 2014-05-28 17:03:53.000000000 +0000 |
423 | +++ firewalld-0.3.10-magellan/po/te.po 2014-07-01 14:00:46.148000000 +0000 |
424 | @@ -1554,10 +1554,10 @@ |
425 | |
426 | #~ msgid "" |
427 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
428 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
429 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
430 | #~ msgstr "" |
431 | #~ "విస్మరించిన ఐచ్చికం. ఫైర్వాల్కు వినియోగదారి మలచిన నియమాలు జతచేయుటకు వుపయోగించబడెను (ఉదాహరణ: ipv4:" |
432 | -#~ "filter:/etc/sysconfig/ipv4_filter_addon)" |
433 | +#~ "filter:/etc/conf.d/ipv4_filter_addon)" |
434 | |
435 | #~ msgid "" |
436 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
437 | diff -Naur firewalld-0.3.10/po/uk.po firewalld-0.3.10-magellan/po/uk.po |
438 | --- firewalld-0.3.10/po/uk.po 2014-05-28 17:03:53.000000000 +0000 |
439 | +++ firewalld-0.3.10-magellan/po/uk.po 2014-07-01 14:00:46.160000000 +0000 |
440 | @@ -1589,10 +1589,10 @@ |
441 | |
442 | #~ msgid "" |
443 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
444 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
445 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
446 | #~ msgstr "" |
447 | #~ "Ігнорований параметр. Використовувався для додавання нетипових правил " |
448 | -#~ "обробки брандмауером (Приклад: ipv4:filter:/etc/sysconfig/" |
449 | +#~ "обробки брандмауером (Приклад: ipv4:filter:/etc/conf.d/" |
450 | #~ "ipv4_filter_addon)" |
451 | |
452 | #~ msgid "" |
453 | diff -Naur firewalld-0.3.10/po/zh_CN.po firewalld-0.3.10-magellan/po/zh_CN.po |
454 | --- firewalld-0.3.10/po/zh_CN.po 2014-05-28 17:03:53.000000000 +0000 |
455 | +++ firewalld-0.3.10-magellan/po/zh_CN.po 2014-07-01 14:00:46.165000000 +0000 |
456 | @@ -1533,10 +1533,10 @@ |
457 | |
458 | #~ msgid "" |
459 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
460 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
461 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
462 | #~ msgstr "" |
463 | #~ "选项已被忽略,曾用于将自定义规则加入防火墙 ( 例: ipv4:filter:/etc/" |
464 | -#~ "sysconfig/ipv4_filter_addon )" |
465 | +#~ "conf.d/ipv4_filter_addon )" |
466 | |
467 | #~ msgid "" |
468 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
469 | diff -Naur firewalld-0.3.10/po/zh_TW.po firewalld-0.3.10-magellan/po/zh_TW.po |
470 | --- firewalld-0.3.10/po/zh_TW.po 2014-05-28 17:03:53.000000000 +0000 |
471 | +++ firewalld-0.3.10-magellan/po/zh_TW.po 2014-07-01 14:00:46.171000000 +0000 |
472 | @@ -1539,10 +1539,10 @@ |
473 | |
474 | #~ msgid "" |
475 | #~ "Ignored option. Was used to add custom rules to the firewall (Example: " |
476 | -#~ "ipv4:filter:/etc/sysconfig/ipv4_filter_addon)" |
477 | +#~ "ipv4:filter:/etc/conf.d/ipv4_filter_addon)" |
478 | #~ msgstr "" |
479 | #~ "忽略的選項。過去用來將自訂規則加入防火牆中 (範例:ipv4:filter:/etc/" |
480 | -#~ "sysconfig/ipv4_filter_addon)" |
481 | +#~ "conf.d/ipv4_filter_addon)" |
482 | |
483 | #~ msgid "" |
484 | #~ "if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:" |
485 | diff -Naur firewalld-0.3.10/src/firewall-offline-cmd firewalld-0.3.10-magellan/src/firewall-offline-cmd |
486 | --- firewalld-0.3.10/src/firewall-offline-cmd 2014-05-15 11:46:34.000000000 +0000 |
487 | +++ firewalld-0.3.10-magellan/src/firewall-offline-cmd 2014-07-01 13:54:00.172000000 +0000 |
488 | @@ -44,7 +44,7 @@ |
489 | print (""" |
490 | Usage: firewall-offline-cmd [OPTIONS...] |
491 | |
492 | -If no options are given, configuration from '/etc/sysconfig/system-config-firewall' will be migrated. |
493 | +If no options are given, configuration from '/etc/conf.d/system-config-firewall' will be migrated. |
494 | |
495 | General Options |
496 | -h, --help Prints a short help text and exists |
497 | @@ -70,7 +70,7 @@ |
498 | --custom-rules=[<type>:][<table>:]<filename> |
499 | Ignored option. Was used to add custom rules to the |
500 | firewall (Example: |
501 | - ipv4:filter:/etc/sysconfig/ipv4_filter_addon) |
502 | + ipv4:filter:/etc/conf.d/ipv4_filter_addon) |
503 | --forward-port=if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:toaddr=<destination address>] |
504 | Forward the port with protocol for the interface to |
505 | either another local destination port (no destination |
506 | @@ -376,7 +376,7 @@ |
507 | __fail('no such file '+_PK_DIR+_PK_NAME+product+'.policy') |
508 | |
509 | # system-config-firewall: fw_sysconfig |
510 | -CONFIG = '/etc/sysconfig/system-config-firewall' |
511 | +CONFIG = '/etc/conf.d/system-config-firewall' |
512 | def read_sysconfig_args(): |
513 | filename = None |
514 | if os.path.exists(CONFIG) and os.path.isfile(CONFIG): |
515 | @@ -562,7 +562,7 @@ |
516 | args.append(joinArgs(aux_args[i+1:])) # add <args> as one arg |
517 | a = parser.parse_args(args) |
518 | else: |
519 | - # migrate configuration from /etc/sysconfig/system-config-firewall |
520 | + # migrate configuration from /etc/conf.d/system-config-firewall |
521 | args = read_sysconfig_args() |
522 | if args: |
523 | a = parser.parse_args(args) |