Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/firewalld/patches/firewalld-0.3.8-confd.patch

    Contents of /trunk/firewalld/patches/firewalld-0.3.8-confd.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2333 - (show annotations) (download)
    Thu Dec 12 08:14:36 2013 UTC (10 years, 4 months ago) by niro
    File size: 27342 byte(s) 
    -re-diffed conf.d patch
    1 diff -Naur firewalld-0.3.8/config/firewalld.init firewalld-0.3.8-magellan/config/firewalld.init
    2 --- firewalld-0.3.8/config/firewalld.init 2013-05-10 10:50:44.000000000 +0000
    3 +++ firewalld-0.3.8-magellan/config/firewalld.init 2013-12-12 10:59:38.621000000 +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.8/config/firewalld.service.in firewalld-0.3.8-magellan/config/firewalld.service.in
    14 --- firewalld-0.3.8/config/firewalld.service.in 2013-05-10 10:50:44.000000000 +0000
    15 +++ firewalld-0.3.8-magellan/config/firewalld.service.in 2013-12-12 11:01:18.078000000 +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.8/config/Makefile.am firewalld-0.3.8-magellan/config/Makefile.am
    26 --- firewalld-0.3.8/config/Makefile.am 2013-10-02 10:14:36.000000000 +0000
    27 +++ firewalld-0.3.8-magellan/config/Makefile.am 2013-12-12 11:04:51.582000000 +0000
    28 @@ -143,12 +143,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.8/config/Makefile.in firewalld-0.3.8-magellan/config/Makefile.in
    46 --- firewalld-0.3.8/config/Makefile.in 2013-11-05 14:50:33.000000000 +0000
    47 +++ firewalld-0.3.8-magellan/config/Makefile.in 2013-12-12 11:06:32.960000000 +0000
    48 @@ -714,12 +714,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.8/firewalld.spec firewalld-0.3.8-magellan/firewalld.spec
    66 --- firewalld-0.3.8/firewalld.spec 2013-11-05 14:50:07.000000000 +0000
    67 +++ firewalld-0.3.8-magellan/firewalld.spec 2013-12-12 11:10:11.256000000 +0000
    68 @@ -145,7 +145,7 @@
    69 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
    70 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
    71 %defattr(0644,root,root)
    72 -%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
    73 +%config(noreplace) %{_sysconfdir}/conf.d/firewalld
    74 #%attr(0755,root,root) %{_initrddir}/firewalld
    75 %{_unitdir}/firewalld.service
    76 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
    77 diff -Naur firewalld-0.3.8/po/ar.po firewalld-0.3.8-magellan/po/ar.po
    78 --- firewalld-0.3.8/po/ar.po 2013-11-05 15:00:55.000000000 +0000
    79 +++ firewalld-0.3.8-magellan/po/ar.po 2013-12-12 11:02:29.042000000 +0000
    80 @@ -1518,7 +1518,7 @@
    81 #: ../src/firewall-offline-cmd:192
    82 msgid ""
    83 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    84 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    85 +"filter:/etc/conf.d/ipv4_filter_addon)"
    86 msgstr ""
    87
    88 #: ../src/firewall-offline-cmd:196
    89 diff -Naur firewalld-0.3.8/po/as.po firewalld-0.3.8-magellan/po/as.po
    90 --- firewalld-0.3.8/po/as.po 2013-11-05 15:00:55.000000000 +0000
    91 +++ firewalld-0.3.8-magellan/po/as.po 2013-12-12 11:02:29.064000000 +0000
    92 @@ -1585,10 +1585,10 @@
    93 #: ../src/firewall-offline-cmd:192
    94 msgid ""
    95 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    96 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    97 +"filter:/etc/conf.d/ipv4_filter_addon)"
    98 msgstr ""
    99 "উপেক্ষিত বিকল্প। ফায়াৰৱালত স্বনিৰ্বাচিত নিয়মসমূহ যোগ কৰাৰ বাবে ব্যৱহাৰ কৰা হৈছিল "
    100 -"(উদাহৰণস্বৰূপ: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    101 +"(উদাহৰণস্বৰূপ: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    102
    103 #: ../src/firewall-offline-cmd:196
    104 msgid ""
    105 diff -Naur firewalld-0.3.8/po/bn_IN.po firewalld-0.3.8-magellan/po/bn_IN.po
    106 --- firewalld-0.3.8/po/bn_IN.po 2013-11-05 15:00:56.000000000 +0000
    107 +++ firewalld-0.3.8-magellan/po/bn_IN.po 2013-12-12 11:02:29.085000000 +0000
    108 @@ -1516,7 +1516,7 @@
    109 #: ../src/firewall-offline-cmd:192
    110 msgid ""
    111 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    112 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    113 +"filter:/etc/conf.d/ipv4_filter_addon)"
    114 msgstr ""
    115
    116 #: ../src/firewall-offline-cmd:196
    117 diff -Naur firewalld-0.3.8/po/ca.po firewalld-0.3.8-magellan/po/ca.po
    118 --- firewalld-0.3.8/po/ca.po 2013-11-05 15:00:56.000000000 +0000
    119 +++ firewalld-0.3.8-magellan/po/ca.po 2013-12-12 11:02:29.106000000 +0000
    120 @@ -1520,7 +1520,7 @@
    121 #: ../src/firewall-offline-cmd:192
    122 msgid ""
    123 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    124 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    125 +"filter:/etc/conf.d/ipv4_filter_addon)"
    126 msgstr ""
    127
    128 #: ../src/firewall-offline-cmd:196
    129 diff -Naur firewalld-0.3.8/po/cs.po firewalld-0.3.8-magellan/po/cs.po
    130 --- firewalld-0.3.8/po/cs.po 2013-11-05 15:00:56.000000000 +0000
    131 +++ firewalld-0.3.8-magellan/po/cs.po 2013-12-12 11:02:29.127000000 +0000
    132 @@ -1542,7 +1542,7 @@
    133 #: ../src/firewall-offline-cmd:192
    134 msgid ""
    135 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    136 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    137 +"filter:/etc/conf.d/ipv4_filter_addon)"
    138 msgstr ""
    139
    140 #: ../src/firewall-offline-cmd:196
    141 diff -Naur firewalld-0.3.8/po/da.po firewalld-0.3.8-magellan/po/da.po
    142 --- firewalld-0.3.8/po/da.po 2013-11-05 15:00:56.000000000 +0000
    143 +++ firewalld-0.3.8-magellan/po/da.po 2013-12-12 11:02:29.147000000 +0000
    144 @@ -1521,7 +1521,7 @@
    145 #: ../src/firewall-offline-cmd:192
    146 msgid ""
    147 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    148 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    149 +"filter:/etc/conf.d/ipv4_filter_addon)"
    150 msgstr ""
    151
    152 #: ../src/firewall-offline-cmd:196
    153 diff -Naur firewalld-0.3.8/po/de.po firewalld-0.3.8-magellan/po/de.po
    154 --- firewalld-0.3.8/po/de.po 2013-11-05 15:00:56.000000000 +0000
    155 +++ firewalld-0.3.8-magellan/po/de.po 2013-12-12 11:02:29.169000000 +0000
    156 @@ -1618,10 +1618,10 @@
    157 #: ../src/firewall-offline-cmd:192
    158 msgid ""
    159 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    160 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    161 +"filter:/etc/conf.d/ipv4_filter_addon)"
    162 msgstr ""
    163 "Unberücksichtigte Option. Dies wurde benutzt, um benutzerdefinierte Regeln "
    164 -"zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/sysconfig/"
    165 +"zur Firewall hinzuzufügen (Beispiel: ipv4:filter:/etc/conf.d/"
    166 "ipv4_filter_addon)"
    167
    168 #: ../src/firewall-offline-cmd:196
    169 diff -Naur firewalld-0.3.8/po/en_GB.po firewalld-0.3.8-magellan/po/en_GB.po
    170 --- firewalld-0.3.8/po/en_GB.po 2013-11-05 15:00:56.000000000 +0000
    171 +++ firewalld-0.3.8-magellan/po/en_GB.po 2013-12-12 11:02:29.189000000 +0000
    172 @@ -1541,10 +1541,10 @@
    173 #: ../src/firewall-offline-cmd:192
    174 msgid ""
    175 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    176 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    177 +"filter:/etc/conf.d/ipv4_filter_addon)"
    178 msgstr ""
    179 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    180 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    181 +"filter:/etc/conf.d/ipv4_filter_addon)"
    182
    183 #: ../src/firewall-offline-cmd:196
    184 msgid ""
    185 diff -Naur firewalld-0.3.8/po/es.po firewalld-0.3.8-magellan/po/es.po
    186 --- firewalld-0.3.8/po/es.po 2013-11-05 15:00:56.000000000 +0000
    187 +++ firewalld-0.3.8-magellan/po/es.po 2013-12-12 11:02:29.212000000 +0000
    188 @@ -1615,10 +1615,10 @@
    189 #: ../src/firewall-offline-cmd:192
    190 msgid ""
    191 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    192 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    193 +"filter:/etc/conf.d/ipv4_filter_addon)"
    194 msgstr ""
    195 "Opción ignorada. Se usó para agregar reglas personalizadas al cortafuego "
    196 -"(Ejemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    197 +"(Ejemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    198
    199 #: ../src/firewall-offline-cmd:196
    200 msgid ""
    201 diff -Naur firewalld-0.3.8/po/fi.po firewalld-0.3.8-magellan/po/fi.po
    202 --- firewalld-0.3.8/po/fi.po 2013-11-05 15:00:56.000000000 +0000
    203 +++ firewalld-0.3.8-magellan/po/fi.po 2013-12-12 11:02:29.233000000 +0000
    204 @@ -1519,7 +1519,7 @@
    205 #: ../src/firewall-offline-cmd:192
    206 msgid ""
    207 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    208 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    209 +"filter:/etc/conf.d/ipv4_filter_addon)"
    210 msgstr ""
    211
    212 #: ../src/firewall-offline-cmd:196
    213 diff -Naur firewalld-0.3.8/po/fr.po firewalld-0.3.8-magellan/po/fr.po
    214 --- firewalld-0.3.8/po/fr.po 2013-11-05 15:00:56.000000000 +0000
    215 +++ firewalld-0.3.8-magellan/po/fr.po 2013-12-12 11:02:29.255000000 +0000
    216 @@ -1553,7 +1553,7 @@
    217 #: ../src/firewall-offline-cmd:192
    218 msgid ""
    219 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    220 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    221 +"filter:/etc/conf.d/ipv4_filter_addon)"
    222 msgstr ""
    223
    224 #: ../src/firewall-offline-cmd:196
    225 diff -Naur firewalld-0.3.8/po/gu.po firewalld-0.3.8-magellan/po/gu.po
    226 --- firewalld-0.3.8/po/gu.po 2013-11-05 15:00:56.000000000 +0000
    227 +++ firewalld-0.3.8-magellan/po/gu.po 2013-12-12 11:09:34.630000000 +0000
    228 @@ -1572,10 +1572,10 @@
    229 #: ../src/firewall-offline-cmd:192
    230 msgid ""
    231 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    232 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    233 +"filter:/etc/conf.d/ipv4_filter_addon)"
    234 msgstr ""
    235 "અવગણેલ વિકલ્પ. ફાયરવોલમાં વૈવિધ્ય નિયમોનું વાપરેલ હતુ (ઉદાહરણ: ipv4:filter:/etc/"
    236 -"sysconfig/ipv4_filter_addon)"
    237 +"conf.d/ipv4_filter_addon)"
    238
    239 #: ../src/firewall-offline-cmd:196
    240 msgid ""
    241 diff -Naur firewalld-0.3.8/po/hi.po firewalld-0.3.8-magellan/po/hi.po
    242 --- firewalld-0.3.8/po/hi.po 2013-11-05 15:00:57.000000000 +0000
    243 +++ firewalld-0.3.8-magellan/po/hi.po 2013-12-12 11:02:29.299000000 +0000
    244 @@ -1514,7 +1514,7 @@
    245 #: ../src/firewall-offline-cmd:192
    246 msgid ""
    247 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    248 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    249 +"filter:/etc/conf.d/ipv4_filter_addon)"
    250 msgstr ""
    251
    252 #: ../src/firewall-offline-cmd:196
    253 diff -Naur firewalld-0.3.8/po/hu.po firewalld-0.3.8-magellan/po/hu.po
    254 --- firewalld-0.3.8/po/hu.po 2013-11-05 15:00:57.000000000 +0000
    255 +++ firewalld-0.3.8-magellan/po/hu.po 2013-12-12 11:02:29.322000000 +0000
    256 @@ -1585,7 +1585,7 @@
    257 #: ../src/firewall-offline-cmd:192
    258 msgid ""
    259 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    260 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    261 +"filter:/etc/conf.d/ipv4_filter_addon)"
    262 msgstr ""
    263
    264 #: ../src/firewall-offline-cmd:196
    265 diff -Naur firewalld-0.3.8/po/it.po firewalld-0.3.8-magellan/po/it.po
    266 --- firewalld-0.3.8/po/it.po 2013-11-05 15:00:57.000000000 +0000
    267 +++ firewalld-0.3.8-magellan/po/it.po 2013-12-12 11:02:29.344000000 +0000
    268 @@ -1624,10 +1624,10 @@
    269 #: ../src/firewall-offline-cmd:192
    270 msgid ""
    271 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    272 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    273 +"filter:/etc/conf.d/ipv4_filter_addon)"
    274 msgstr ""
    275 "Opzione ignorata. E' utilizzata per aggiungere regole personalizzate per il "
    276 -"firewall (Esempio : ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    277 +"firewall (Esempio : ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    278
    279 #: ../src/firewall-offline-cmd:196
    280 msgid ""
    281 diff -Naur firewalld-0.3.8/po/ja.po firewalld-0.3.8-magellan/po/ja.po
    282 --- firewalld-0.3.8/po/ja.po 2013-11-05 15:00:57.000000000 +0000
    283 +++ firewalld-0.3.8-magellan/po/ja.po 2013-12-12 11:02:29.366000000 +0000
    284 @@ -1603,10 +1603,10 @@
    285 #: ../src/firewall-offline-cmd:192
    286 msgid ""
    287 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    288 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    289 +"filter:/etc/conf.d/ipv4_filter_addon)"
    290 msgstr ""
    291 "無視されたオプション、カスタムルールをファイアウォールに追加するために使用さ"
    292 -"れました (例: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)。"
    293 +"れました (例: ipv4:filter:/etc/conf.d/ipv4_filter_addon)。"
    294
    295 #: ../src/firewall-offline-cmd:196
    296 msgid ""
    297 diff -Naur firewalld-0.3.8/po/kn.po firewalld-0.3.8-magellan/po/kn.po
    298 --- firewalld-0.3.8/po/kn.po 2013-11-05 15:00:57.000000000 +0000
    299 +++ firewalld-0.3.8-magellan/po/kn.po 2013-12-12 11:02:29.388000000 +0000
    300 @@ -1518,7 +1518,7 @@
    301 #: ../src/firewall-offline-cmd:192
    302 msgid ""
    303 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    304 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    305 +"filter:/etc/conf.d/ipv4_filter_addon)"
    306 msgstr ""
    307
    308 #: ../src/firewall-offline-cmd:196
    309 diff -Naur firewalld-0.3.8/po/ko.po firewalld-0.3.8-magellan/po/ko.po
    310 --- firewalld-0.3.8/po/ko.po 2013-11-05 15:00:57.000000000 +0000
    311 +++ firewalld-0.3.8-magellan/po/ko.po 2013-12-12 11:02:29.409000000 +0000
    312 @@ -1521,7 +1521,7 @@
    313 #: ../src/firewall-offline-cmd:192
    314 msgid ""
    315 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    316 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    317 +"filter:/etc/conf.d/ipv4_filter_addon)"
    318 msgstr ""
    319
    320 #: ../src/firewall-offline-cmd:196
    321 diff -Naur firewalld-0.3.8/po/ml.po firewalld-0.3.8-magellan/po/ml.po
    322 --- firewalld-0.3.8/po/ml.po 2013-11-05 15:00:57.000000000 +0000
    323 +++ firewalld-0.3.8-magellan/po/ml.po 2013-12-12 11:02:29.429000000 +0000
    324 @@ -1515,7 +1515,7 @@
    325 #: ../src/firewall-offline-cmd:192
    326 msgid ""
    327 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    328 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    329 +"filter:/etc/conf.d/ipv4_filter_addon)"
    330 msgstr ""
    331
    332 #: ../src/firewall-offline-cmd:196
    333 diff -Naur firewalld-0.3.8/po/mr.po firewalld-0.3.8-magellan/po/mr.po
    334 --- firewalld-0.3.8/po/mr.po 2013-11-05 15:00:57.000000000 +0000
    335 +++ firewalld-0.3.8-magellan/po/mr.po 2013-12-12 11:02:29.450000000 +0000
    336 @@ -1519,7 +1519,7 @@
    337 #: ../src/firewall-offline-cmd:192
    338 msgid ""
    339 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    340 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    341 +"filter:/etc/conf.d/ipv4_filter_addon)"
    342 msgstr ""
    343
    344 #: ../src/firewall-offline-cmd:196
    345 diff -Naur firewalld-0.3.8/po/nl.po firewalld-0.3.8-magellan/po/nl.po
    346 --- firewalld-0.3.8/po/nl.po 2013-11-05 15:00:57.000000000 +0000
    347 +++ firewalld-0.3.8-magellan/po/nl.po 2013-12-12 11:02:29.472000000 +0000
    348 @@ -1611,10 +1611,10 @@
    349 #: ../src/firewall-offline-cmd:192
    350 msgid ""
    351 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    352 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    353 +"filter:/etc/conf.d/ipv4_filter_addon)"
    354 msgstr ""
    355 "Genegeerde optie. Werd gebruikt om aangepaste regels toe te voegen aan de "
    356 -"firewall (Voorbeeld: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    357 +"firewall (Voorbeeld: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    358
    359 #: ../src/firewall-offline-cmd:196
    360 msgid ""
    361 diff -Naur firewalld-0.3.8/po/or.po firewalld-0.3.8-magellan/po/or.po
    362 --- firewalld-0.3.8/po/or.po 2013-11-05 15:00:58.000000000 +0000
    363 +++ firewalld-0.3.8-magellan/po/or.po 2013-12-12 11:02:29.493000000 +0000
    364 @@ -1517,7 +1517,7 @@
    365 #: ../src/firewall-offline-cmd:192
    366 msgid ""
    367 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    368 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    369 +"filter:/etc/conf.d/ipv4_filter_addon)"
    370 msgstr ""
    371
    372 #: ../src/firewall-offline-cmd:196
    373 diff -Naur firewalld-0.3.8/po/pa.po firewalld-0.3.8-magellan/po/pa.po
    374 --- firewalld-0.3.8/po/pa.po 2013-11-05 15:00:58.000000000 +0000
    375 +++ firewalld-0.3.8-magellan/po/pa.po 2013-12-12 11:09:34.648000000 +0000
    376 @@ -1575,10 +1575,10 @@
    377 #: ../src/firewall-offline-cmd:192
    378 msgid ""
    379 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    380 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    381 +"filter:/etc/conf.d/ipv4_filter_addon)"
    382 msgstr ""
    383 "ਅਣਗੌਲੀ ਚੋਣ। ਫਾਇਰਵਾਲ ਲਈ ਚੁਣਿੰਦਾ ਨਿਯਮ ਜੋੜਨ ਲਈ ਵਰਤੀ ਗਈ ਸੀ (ਉਦਾਹਰਣ: ipv4:filter:/etc/"
    384 -"sysconfig/ipv4_filter_addon)"
    385 +"conf.d/ipv4_filter_addon)"
    386
    387 #: ../src/firewall-offline-cmd:196
    388 msgid ""
    389 diff -Naur firewalld-0.3.8/po/pl.po firewalld-0.3.8-magellan/po/pl.po
    390 --- firewalld-0.3.8/po/pl.po 2013-11-05 15:00:58.000000000 +0000
    391 +++ firewalld-0.3.8-magellan/po/pl.po 2013-12-12 11:02:29.538000000 +0000
    392 @@ -1576,10 +1576,10 @@
    393 #: ../src/firewall-offline-cmd:192
    394 msgid ""
    395 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    396 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    397 +"filter:/etc/conf.d/ipv4_filter_addon)"
    398 msgstr ""
    399 "Ignorowana opcja. Była używana do dodawania własnych reguł do zapory "
    400 -"sieciowej (przykład: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    401 +"sieciowej (przykład: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    402
    403 #: ../src/firewall-offline-cmd:196
    404 msgid ""
    405 diff -Naur firewalld-0.3.8/po/pt_BR.po firewalld-0.3.8-magellan/po/pt_BR.po
    406 --- firewalld-0.3.8/po/pt_BR.po 2013-11-05 15:00:58.000000000 +0000
    407 +++ firewalld-0.3.8-magellan/po/pt_BR.po 2013-12-12 11:02:29.560000000 +0000
    408 @@ -1598,10 +1598,10 @@
    409 #: ../src/firewall-offline-cmd:192
    410 msgid ""
    411 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    412 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    413 +"filter:/etc/conf.d/ipv4_filter_addon)"
    414 msgstr ""
    415 "Ignorando a opção. Foi usado para adicionar regras personalizadas para o "
    416 -"firewall (Exemplo: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    417 +"firewall (Exemplo: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    418
    419 #: ../src/firewall-offline-cmd:196
    420 msgid ""
    421 diff -Naur firewalld-0.3.8/po/pt.po firewalld-0.3.8-magellan/po/pt.po
    422 --- firewalld-0.3.8/po/pt.po 2013-11-05 15:00:58.000000000 +0000
    423 +++ firewalld-0.3.8-magellan/po/pt.po 2013-12-12 11:02:29.581000000 +0000
    424 @@ -1521,7 +1521,7 @@
    425 #: ../src/firewall-offline-cmd:192
    426 msgid ""
    427 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    428 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    429 +"filter:/etc/conf.d/ipv4_filter_addon)"
    430 msgstr ""
    431
    432 #: ../src/firewall-offline-cmd:196
    433 diff -Naur firewalld-0.3.8/po/ru.po firewalld-0.3.8-magellan/po/ru.po
    434 --- firewalld-0.3.8/po/ru.po 2013-11-05 15:00:58.000000000 +0000
    435 +++ firewalld-0.3.8-magellan/po/ru.po 2013-12-12 11:02:29.601000000 +0000
    436 @@ -1542,7 +1542,7 @@
    437 #: ../src/firewall-offline-cmd:192
    438 msgid ""
    439 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    440 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    441 +"filter:/etc/conf.d/ipv4_filter_addon)"
    442 msgstr ""
    443
    444 #: ../src/firewall-offline-cmd:196
    445 diff -Naur firewalld-0.3.8/po/sk.po firewalld-0.3.8-magellan/po/sk.po
    446 --- firewalld-0.3.8/po/sk.po 2013-11-05 15:00:58.000000000 +0000
    447 +++ firewalld-0.3.8-magellan/po/sk.po 2013-12-12 11:02:29.622000000 +0000
    448 @@ -1535,7 +1535,7 @@
    449 #: ../src/firewall-offline-cmd:192
    450 msgid ""
    451 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    452 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    453 +"filter:/etc/conf.d/ipv4_filter_addon)"
    454 msgstr ""
    455
    456 #: ../src/firewall-offline-cmd:196
    457 diff -Naur firewalld-0.3.8/po/sr@latin.po firewalld-0.3.8-magellan/po/sr@latin.po
    458 --- firewalld-0.3.8/po/sr@latin.po 2013-11-05 15:00:58.000000000 +0000
    459 +++ firewalld-0.3.8-magellan/po/sr@latin.po 2013-12-12 11:02:29.643000000 +0000
    460 @@ -1519,7 +1519,7 @@
    461 #: ../src/firewall-offline-cmd:192
    462 msgid ""
    463 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    464 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    465 +"filter:/etc/conf.d/ipv4_filter_addon)"
    466 msgstr ""
    467
    468 #: ../src/firewall-offline-cmd:196
    469 diff -Naur firewalld-0.3.8/po/sr.po firewalld-0.3.8-magellan/po/sr.po
    470 --- firewalld-0.3.8/po/sr.po 2013-11-05 15:00:58.000000000 +0000
    471 +++ firewalld-0.3.8-magellan/po/sr.po 2013-12-12 11:02:29.664000000 +0000
    472 @@ -1518,7 +1518,7 @@
    473 #: ../src/firewall-offline-cmd:192
    474 msgid ""
    475 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    476 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    477 +"filter:/etc/conf.d/ipv4_filter_addon)"
    478 msgstr ""
    479
    480 #: ../src/firewall-offline-cmd:196
    481 diff -Naur firewalld-0.3.8/po/sv.po firewalld-0.3.8-magellan/po/sv.po
    482 --- firewalld-0.3.8/po/sv.po 2013-11-05 15:00:58.000000000 +0000
    483 +++ firewalld-0.3.8-magellan/po/sv.po 2013-12-12 11:02:29.685000000 +0000
    484 @@ -1536,7 +1536,7 @@
    485 #: ../src/firewall-offline-cmd:192
    486 msgid ""
    487 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    488 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    489 +"filter:/etc/conf.d/ipv4_filter_addon)"
    490 msgstr ""
    491
    492 #: ../src/firewall-offline-cmd:196
    493 diff -Naur firewalld-0.3.8/po/ta.po firewalld-0.3.8-magellan/po/ta.po
    494 --- firewalld-0.3.8/po/ta.po 2013-11-05 15:00:59.000000000 +0000
    495 +++ firewalld-0.3.8-magellan/po/ta.po 2013-12-12 11:02:29.707000000 +0000
    496 @@ -1601,10 +1601,10 @@
    497 #: ../src/firewall-offline-cmd:192
    498 msgid ""
    499 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    500 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    501 +"filter:/etc/conf.d/ipv4_filter_addon)"
    502 msgstr ""
    503 "விருப்பம் புறக்கணிக்கப்பட்டது. ஃபயர்வாலுக்கு தனிப்பயன் விதியைச் சேர்க்கப் பயன்படுத்தப்பட்டது "
    504 -"(எடுத்துக்காட்டு: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    505 +"(எடுத்துக்காட்டு: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    506
    507 #: ../src/firewall-offline-cmd:196
    508 msgid ""
    509 diff -Naur firewalld-0.3.8/po/te.po firewalld-0.3.8-magellan/po/te.po
    510 --- firewalld-0.3.8/po/te.po 2013-11-05 15:00:59.000000000 +0000
    511 +++ firewalld-0.3.8-magellan/po/te.po 2013-12-12 11:02:29.731000000 +0000
    512 @@ -1556,10 +1556,10 @@
    513 #: ../src/firewall-offline-cmd:192
    514 msgid ""
    515 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    516 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    517 +"filter:/etc/conf.d/ipv4_filter_addon)"
    518 msgstr ""
    519 "విస్మరించిన ఐచ్చికం. ఫైర్‌వాల్‌కు వినియోగదారి మలచిన నియమాలు జతచేయుటకు వుపయోగించబడెను (ఉదాహరణ: ipv4:"
    520 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    521 +"filter:/etc/conf.d/ipv4_filter_addon)"
    522
    523 #: ../src/firewall-offline-cmd:196
    524 msgid ""
    525 diff -Naur firewalld-0.3.8/po/tr.po firewalld-0.3.8-magellan/po/tr.po
    526 --- firewalld-0.3.8/po/tr.po 2013-11-05 15:00:59.000000000 +0000
    527 +++ firewalld-0.3.8-magellan/po/tr.po 2013-12-12 11:02:29.752000000 +0000
    528 @@ -1541,7 +1541,7 @@
    529 #: ../src/firewall-offline-cmd:192
    530 msgid ""
    531 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    532 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    533 +"filter:/etc/conf.d/ipv4_filter_addon)"
    534 msgstr ""
    535
    536 #: ../src/firewall-offline-cmd:196
    537 diff -Naur firewalld-0.3.8/po/uk.po firewalld-0.3.8-magellan/po/uk.po
    538 --- firewalld-0.3.8/po/uk.po 2013-11-05 15:00:59.000000000 +0000
    539 +++ firewalld-0.3.8-magellan/po/uk.po 2013-12-12 11:02:29.774000000 +0000
    540 @@ -1609,10 +1609,10 @@
    541 #: ../src/firewall-offline-cmd:192
    542 msgid ""
    543 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    544 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    545 +"filter:/etc/conf.d/ipv4_filter_addon)"
    546 msgstr ""
    547 "Ігнорований параметр. Використовувався для додавання нетипових правил "
    548 -"обробки брандмауером (Приклад: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"
    549 +"обробки брандмауером (Приклад: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"
    550
    551 #: ../src/firewall-offline-cmd:196
    552 msgid ""
    553 diff -Naur firewalld-0.3.8/po/zh_CN.po firewalld-0.3.8-magellan/po/zh_CN.po
    554 --- firewalld-0.3.8/po/zh_CN.po 2013-11-05 15:00:59.000000000 +0000
    555 +++ firewalld-0.3.8-magellan/po/zh_CN.po 2013-12-12 11:02:29.795000000 +0000
    556 @@ -1541,9 +1541,9 @@
    557 #: ../src/firewall-offline-cmd:192
    558 msgid ""
    559 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    560 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    561 +"filter:/etc/conf.d/ipv4_filter_addon)"
    562 msgstr ""
    563 -"选项已被忽略，曾用于将自定义规则加入防火墙 ( 例： ipv4:filter:/etc/sysconfig/"
    564 +"选项已被忽略，曾用于将自定义规则加入防火墙 ( 例： ipv4:filter:/etc/conf.d/"
    565 "ipv4_filter_addon )"
    566
    567 #: ../src/firewall-offline-cmd:196
    568 diff -Naur firewalld-0.3.8/po/zh_TW.po firewalld-0.3.8-magellan/po/zh_TW.po
    569 --- firewalld-0.3.8/po/zh_TW.po 2013-11-05 15:00:59.000000000 +0000
    570 +++ firewalld-0.3.8-magellan/po/zh_TW.po 2013-12-12 11:02:29.817000000 +0000
    571 @@ -1560,9 +1560,9 @@
    572 #: ../src/firewall-offline-cmd:192
    573 msgid ""
    574 "Ignored option. Was used to add custom rules to the firewall (Example: ipv4:"
    575 -"filter:/etc/sysconfig/ipv4_filter_addon)"
    576 +"filter:/etc/conf.d/ipv4_filter_addon)"
    577 msgstr ""
    578 -"忽略的選項。過去用來將自訂規則加入防火牆中 (範例：ipv4:filter:/etc/sysconfig/"
    579 +"忽略的選項。過去用來將自訂規則加入防火牆中 (範例：ipv4:filter:/etc/conf.d/"
    580 "ipv4_filter_addon)"
    581
    582 #: ../src/firewall-offline-cmd:196
    583 diff -Naur firewalld-0.3.8/src/firewall-offline-cmd firewalld-0.3.8-magellan/src/firewall-offline-cmd
    584 --- firewalld-0.3.8/src/firewall-offline-cmd 2013-10-25 08:04:10.000000000 +0000
    585 +++ firewalld-0.3.8-magellan/src/firewall-offline-cmd 2013-12-12 10:59:08.541000000 +0000
    586 @@ -189,7 +189,7 @@
    587 action="callback", dest="custom_rules", type="rulesfile",
    588 metavar=_("[<type>:][<table>:]<filename>"),
    589 callback=_append_unique,
    590 - help=_("Ignored option. Was used to add custom rules to the firewall (Example: ipv4:filter:/etc/sysconfig/ipv4_filter_addon)"))
    591 + help=_("Ignored option. Was used to add custom rules to the firewall (Example: ipv4:filter:/etc/conf.d/ipv4_filter_addon)"))
    592 parser.add_option("--forward-port",
    593 action="callback", dest="forward_port",
    594 type="forward_port",
    595 @@ -319,7 +319,7 @@
    596 return _parse_args(parser, args, options)
    597
    598 # system-config-firewall: fw_sysconfig
    599 -CONFIG = '/etc/sysconfig/system-config-firewall'
    600 +CONFIG = '/etc/conf.d/system-config-firewall'
    601
    602 def read_sysconfig_args():
    603 filename = None