Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1770 - (show annotations) (download)
    Tue May 8 22:02:04 2012 UTC (12 years, 5 months ago) by niro
    File size: 2752 byte(s) 
    -rediffed patch
    1 diff -Naur firewalld-0.2.5/config/firewalld.init firewalld-0.2.5-magellan/config/firewalld.init
    2 --- firewalld-0.2.5/config/firewalld.init 2012-04-20 21:24:57.000000000 +0200
    3 +++ firewalld-0.2.5-magellan/config/firewalld.init 2012-05-09 00:56:00.137982523 +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.2.5/config/firewalld.service firewalld-0.2.5-magellan/config/firewalld.service
    14 --- firewalld-0.2.5/config/firewalld.service 2012-04-20 21:24:57.000000000 +0200
    15 +++ firewalld-0.2.5-magellan/config/firewalld.service 2012-05-09 00:56:20.634982523 +0200
    16 @@ -8,7 +8,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=/usr/sbin/firewalld --nofork $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.2.5/config/Makefile.am firewalld-0.2.5-magellan/config/Makefile.am
    26 --- firewalld-0.2.5/config/Makefile.am 2012-04-20 21:24:57.000000000 +0200
    27 +++ firewalld-0.2.5-magellan/config/Makefile.am 2012-05-09 00:57:36.059982524 +0200
    28 @@ -54,11 +54,11 @@
    29 endif
    30
    31 install-sysconfig:
    32 - mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig
    33 - $(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
    34 + mkdir -p $(DESTDIR)$(sysconfdir)/conf.d
    35 + $(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld
    36
    37 uninstall-sysconfig:
    38 - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
    39 + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
    40
    41 install-init: firewalld.init firewalld.sysconfig
    42 mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
    43 @@ -66,7 +66,7 @@
    44
    45 uninstall-init:
    46 rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/firewalld
    47 - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld
    48 + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld
    49
    50 install-service:
    51 mkdir -p $(DESTDIR)$(SYSTEMD_UNITDIR)
    52 diff -Naur firewalld-0.2.5/firewalld.spec firewalld-0.2.5-magellan/firewalld.spec
    53 --- firewalld-0.2.5/firewalld.spec 2012-04-20 21:24:57.000000000 +0200
    54 +++ firewalld-0.2.5-magellan/firewalld.spec 2012-05-09 00:58:25.230982524 +0200
    55 @@ -147,7 +147,7 @@
    56 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
    57 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
    58 %defattr(0644,root,root)
    59 -%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
    60 +%config(noreplace) %{_sysconfdir}/conf.d/firewalld
    61 #%attr(0755,root,root) %{_initrddir}/firewalld
    62 %{_unitdir}/firewalld.service
    63 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf