Magellan Linux

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

    Annotation of /trunk/firewalld/patches/firewalld-0.3.12-confd.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2508 - (hide annotations) (download)
    Tue Oct 21 12:12:57 2014 UTC (9 years, 7 months ago) by niro
    File size: 11422 byte(s) 
    -re-worked for 0.3.12
    1 niro 2508 diff -Naur firewalld-0.3.12/config/firewalld.init firewalld-0.3.12-magellan/config/firewalld.init
    2     --- firewalld-0.3.12/config/firewalld.init 2013-05-10 12:50:44.000000000 +0200
    3     +++ firewalld-0.3.12-magellan/config/firewalld.init 2014-10-21 15:31:27.806408130 +0200
    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.12/config/firewalld.service.in firewalld-0.3.12-magellan/config/firewalld.service.in
    14     --- firewalld-0.3.12/config/firewalld.service.in 2014-07-23 19:00:38.000000000 +0200
    15     +++ firewalld-0.3.12-magellan/config/firewalld.service.in 2014-10-21 15:32:20.214412080 +0200
    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.12/config/Makefile.am firewalld-0.3.12-magellan/config/Makefile.am
    26     --- firewalld-0.3.12/config/Makefile.am 2014-10-14 13:02:26.000000000 +0200
    27     +++ firewalld-0.3.12-magellan/config/Makefile.am 2014-10-21 15:33:36.560417834 +0200
    28     @@ -172,12 +172,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-rpmmacros:
    44     $(MKDIR_P) $(DESTDIR)$(prefix)/lib/rpm/macros.d
    45     diff -Naur firewalld-0.3.12/config/Makefile.in firewalld-0.3.12-magellan/config/Makefile.in
    46     --- firewalld-0.3.12/config/Makefile.in 2014-10-14 18:03:37.000000000 +0200
    47     +++ firewalld-0.3.12-magellan/config/Makefile.in 2014-10-21 15:34:16.271420827 +0200
    48     @@ -767,12 +767,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-rpmmacros:
    64     $(MKDIR_P) $(DESTDIR)$(prefix)/lib/rpm/macros.d
    65     diff -Naur firewalld-0.3.12/doc/man/man1/firewall-cmd.1 firewalld-0.3.12-magellan/doc/man/man1/firewall-cmd.1
    66     --- firewalld-0.3.12/doc/man/man1/firewall-cmd.1 2014-10-14 18:05:35.000000000 +0200
    67     +++ firewalld-0.3.12-magellan/doc/man/man1/firewall-cmd.1 2014-10-21 15:39:17.538443534 +0200
    68     @@ -597,7 +597,7 @@
    69     As a end user you don\*(Aqt need this in most cases, because NetworkManager (or legacy network service) adds interfaces into zones automatically (according to
    70     \fBZONE=\fR
    71     option from ifcfg\-\fIinterface\fR
    72     -file)\&. You should do it only if there\*(Aqs no /etc/sysconfig/network\-scripts/ifcfg\-\fIinterface\fR
    73     +file)\&. You should do it only if there\*(Aqs no /etc/conf.d/network\-scripts/ifcfg\-\fIinterface\fR
    74     file\&. If there is such file and you add interface to zone with this
    75     \fB\-\-add\-interface\fR
    76     option, make sure the zone is the same in both cases, otherwise the behaviour would be undefined\&. For permanent association of interface with a zone, see also \*(AqHow to set or change a zone for a connection?\*(Aq in
    77     diff -Naur firewalld-0.3.12/doc/man/man1/firewalld.1 firewalld-0.3.12-magellan/doc/man/man1/firewalld.1
    78     --- firewalld-0.3.12/doc/man/man1/firewalld.1 2014-10-14 18:03:46.000000000 +0200
    79     +++ firewalld-0.3.12-magellan/doc/man/man1/firewalld.1 2014-10-21 16:07:46.235572318 +0200
    80     @@ -78,7 +78,7 @@
    81     the section called \(lqDIRECTORIES\(rq)\&.
    82     .PP
    83     If NetworkManager is not used, there are some limitations: firewalld will not get notified about network device renames\&. If firewalld gets started after the network is already up, the connections and manually created interfaces are not bound to a zone\&. You can add them to a zone with
    84     -\fBfirewall\-cmd [\-\-permanent] \-\-zone=\fR\fB\fIzone\fR\fR\fB \-\-add\-interface=\fR\fB\fIinterface\fR\fR, but make sure that if there\*(Aqs a /etc/sysconfig/network\-scripts/ifcfg\-\fIinterface\fR, the zone specified there with ZONE=\fIzone\fR
    85     +\fBfirewall\-cmd [\-\-permanent] \-\-zone=\fR\fB\fIzone\fR\fR\fB \-\-add\-interface=\fR\fB\fIinterface\fR\fR, but make sure that if there\*(Aqs a /etc/conf.d/network\-scripts/ifcfg\-\fIinterface\fR, the zone specified there with ZONE=\fIzone\fR
    86     is the same (or both are empty/missing for default zone), otherwise the behaviour would be undefined\&.
    87     .SS "Zones"
    88     .PP
    89     diff -Naur firewalld-0.3.12/doc/man/man1/firewall-offline-cmd.1 firewalld-0.3.12-magellan/doc/man/man1/firewall-offline-cmd.1
    90     --- firewalld-0.3.12/doc/man/man1/firewall-offline-cmd.1 2014-10-14 18:03:46.000000000 +0200
    91     +++ firewalld-0.3.12-magellan/doc/man/man1/firewall-offline-cmd.1 2014-10-21 15:34:40.849422680 +0200
    92     @@ -42,7 +42,7 @@
    93     .SH "OPTIONS"
    94     .PP
    95     If no options are given, configuration from
    96     -\fB/etc/sysconfig/system\-config\-firewall\fR
    97     +\fB/etc/conf.d/system\-config\-firewall\fR
    98     will be migrated\&.
    99     .PP
    100     The following options are supported:
    101     diff -Naur firewalld-0.3.12/doc/xml/firewall-cmd.xml firewalld-0.3.12-magellan/doc/xml/firewall-cmd.xml
    102     --- firewalld-0.3.12/doc/xml/firewall-cmd.xml 2014-10-14 13:02:26.000000000 +0200
    103     +++ firewalld-0.3.12-magellan/doc/xml/firewall-cmd.xml 2014-10-21 15:38:00.409437720 +0200
    104     @@ -649,7 +649,7 @@
    105     </para>
    106     <para>
    107     As a end user you don't need this in most cases, because NetworkManager (or legacy network service) adds interfaces into zones automatically (according to <option>ZONE=</option> option from ifcfg-<replaceable>interface</replaceable> file).
    108     - You should do it only if there's no /etc/sysconfig/network-scripts/ifcfg-<replaceable>interface</replaceable> file.
    109     + You should do it only if there's no /etc/conf.d/network-scripts/ifcfg-<replaceable>interface</replaceable> file.
    110     If there is such file and you add interface to zone with this <option>--add-interface</option> option, make sure the zone is the same in both cases, otherwise the behaviour would be undefined.
    111     For permanent association of interface with a zone, see also 'How to set or change a zone for a connection?' in <citerefentry><refentrytitle>firewalld.zones</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
    112     </para>
    113     diff -Naur firewalld-0.3.12/doc/xml/firewalld.xml firewalld-0.3.12-magellan/doc/xml/firewalld.xml
    114     --- firewalld-0.3.12/doc/xml/firewalld.xml 2014-09-17 14:06:35.000000000 +0200
    115     +++ firewalld-0.3.12-magellan/doc/xml/firewalld.xml 2014-10-21 15:37:28.762435335 +0200
    116     @@ -126,7 +126,7 @@
    117     If NetworkManager is not used, there are some limitations: firewalld will not get notified about network device renames.
    118     If firewalld gets started after the network is already up, the connections and manually created interfaces are not bound to a zone.
    119     You can add them to a zone with <command>firewall-cmd [--permanent] --zone=<replaceable>zone</replaceable> --add-interface=<replaceable>interface</replaceable></command>,
    120     - but make sure that if there's a /etc/sysconfig/network-scripts/ifcfg-<replaceable>interface</replaceable>,
    121     + but make sure that if there's a /etc/conf.d/network-scripts/ifcfg-<replaceable>interface</replaceable>,
    122     the zone specified there with ZONE=<replaceable>zone</replaceable>
    123     is the same (or both are empty/missing for default zone), otherwise the behaviour would be undefined.
    124     </para>
    125     diff -Naur firewalld-0.3.12/doc/xml/firewall-offline-cmd.xml firewalld-0.3.12-magellan/doc/xml/firewall-offline-cmd.xml
    126     --- firewalld-0.3.12/doc/xml/firewall-offline-cmd.xml 2014-09-17 14:06:35.000000000 +0200
    127     +++ firewalld-0.3.12-magellan/doc/xml/firewall-offline-cmd.xml 2014-10-21 15:35:01.944424270 +0200
    128     @@ -68,7 +68,7 @@
    129     <refsect1 id="options">
    130     <title>Options</title>
    131     <para>
    132     - If no options are given, configuration from <command>/etc/sysconfig/system-config-firewall</command> will be migrated.
    133     + If no options are given, configuration from <command>/etc/conf.d/system-config-firewall</command> will be migrated.
    134     </para>
    135     <para>
    136     The following options are supported:
    137     diff -Naur firewalld-0.3.12/firewalld.spec firewalld-0.3.12-magellan/firewalld.spec
    138     --- firewalld-0.3.12/firewalld.spec 2014-10-14 18:01:53.000000000 +0200
    139     +++ firewalld-0.3.12-magellan/firewalld.spec 2014-10-21 15:35:25.513426046 +0200
    140     @@ -131,7 +131,7 @@
    141     %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
    142     %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
    143     %defattr(0644,root,root)
    144     -%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
    145     +%config(noreplace) %{_sysconfdir}/conf.d/firewalld
    146     #%attr(0755,root,root) %{_initrddir}/firewalld
    147     %{_unitdir}/firewalld.service
    148     %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
    149     diff -Naur firewalld-0.3.12/src/firewall-offline-cmd firewalld-0.3.12-magellan/src/firewall-offline-cmd
    150     --- firewalld-0.3.12/src/firewall-offline-cmd 2014-09-17 14:06:35.000000000 +0200
    151     +++ firewalld-0.3.12-magellan/src/firewall-offline-cmd 2014-10-21 15:36:53.666432690 +0200
    152     @@ -44,7 +44,7 @@
    153     print ("""
    154     Usage: firewall-offline-cmd [OPTIONS...]
    155    
    156     -If no options are given, configuration from '/etc/sysconfig/system-config-firewall' will be migrated.
    157     +If no options are given, configuration from '/etc/conf.d/system-config-firewall' will be migrated.
    158    
    159     General Options
    160     -h, --help Prints a short help text and exists
    161     @@ -70,7 +70,7 @@
    162     --custom-rules=[<type>:][<table>:]<filename>
    163     Ignored option. Was used to add custom rules to the
    164     firewall (Example:
    165     - ipv4:filter:/etc/sysconfig/ipv4_filter_addon)
    166     + ipv4:filter:/etc/conf.d/ipv4_filter_addon)
    167     --forward-port=if=<interface>:port=<port>:proto=<protocol>[:toport=<destination port>][:toaddr=<destination address>]
    168     Forward the port with protocol for the interface to
    169     either another local destination port (no destination
    170     @@ -376,7 +376,7 @@
    171     __fail('no such file '+_PK_DIR+_PK_NAME+product+'.policy')
    172    
    173     # system-config-firewall: fw_sysconfig
    174     -CONFIG = '/etc/sysconfig/system-config-firewall'
    175     +CONFIG = '/etc/conf.d/system-config-firewall'
    176     def read_sysconfig_args():
    177     filename = None
    178     if os.path.exists(CONFIG) and os.path.isfile(CONFIG):
    179     @@ -562,7 +562,7 @@
    180     args.append(joinArgs(aux_args[i+1:])) # add <args> as one arg
    181     a = parser.parse_args(args)
    182     else:
    183     - # migrate configuration from /etc/sysconfig/system-config-firewall
    184     + # migrate configuration from /etc/conf.d/system-config-firewall
    185     args = read_sysconfig_args()
    186     if args:
    187     a = parser.parse_args(args)