Contents of /trunk/firewalld/patches/firewalld-0.5.2-confd.patch
Parent Directory | Revision Log
Revision 3462 -
(show annotations)
(download)
Mon Oct 21 10:33:34 2019 UTC (4 years, 11 months ago) by niro
File size: 4250 byte(s)
Mon Oct 21 10:33:34 2019 UTC (4 years, 11 months ago) by niro
File size: 4250 byte(s)
-re-diffed for 0.5.2
1 | diff -Naur firewalld-0.5.2/config/firewalld.init firewalld-0.5.2-confd/config/firewalld.init |
2 | --- firewalld-0.5.2/config/firewalld.init 2018-03-13 18:41:50.000000000 +0100 |
3 | +++ firewalld-0.5.2-confd/config/firewalld.init 2019-10-21 12:27:37.172641608 +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.5.2/config/firewalld.service.in firewalld-0.5.2-confd/config/firewalld.service.in |
14 | --- firewalld-0.5.2/config/firewalld.service.in 2018-03-13 18:41:50.000000000 +0100 |
15 | +++ firewalld-0.5.2-confd/config/firewalld.service.in 2019-10-21 12:27:55.546379153 +0200 |
16 | @@ -8,7 +8,7 @@ |
17 | Documentation=man:firewalld(1) |
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.5.2/config/Makefile.am firewalld-0.5.2-confd/config/Makefile.am |
26 | --- firewalld-0.5.2/config/Makefile.am 2018-03-13 18:41:50.000000000 +0100 |
27 | +++ firewalld-0.5.2-confd/config/Makefile.am 2019-10-21 12:32:31.663430037 +0200 |
28 | @@ -308,12 +308,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.5.2/doc/xml/firewall-offline-cmd.xml firewalld-0.5.2-confd/doc/xml/firewall-offline-cmd.xml |
46 | --- firewalld-0.5.2/doc/xml/firewall-offline-cmd.xml 2018-03-13 18:41:50.000000000 +0100 |
47 | +++ firewalld-0.5.2-confd/doc/xml/firewall-offline-cmd.xml 2019-10-21 12:28:31.836860611 +0200 |
48 | @@ -68,7 +68,7 @@ |
49 | <refsect1 id="options"> |
50 | <title>Options</title> |
51 | <para> |
52 | - If no options are given, configuration from <command>/etc/sysconfig/system-config-firewall</command> will be migrated. |
53 | + If no options are given, configuration from <command>/etc/conf.d/system-config-firewall</command> will be migrated. |
54 | </para> |
55 | |
56 | <para> |
57 | diff -Naur firewalld-0.5.2/src/firewall/config/__init__.py.in firewalld-0.5.2-confd/src/firewall/config/__init__.py.in |
58 | --- firewalld-0.5.2/src/firewall/config/__init__.py.in 2018-03-13 18:41:50.000000000 +0100 |
59 | +++ firewalld-0.5.2-confd/src/firewall/config/__init__.py.in 2019-10-21 12:29:49.577749272 +0200 |
60 | @@ -96,7 +96,7 @@ |
61 | |
62 | FIREWALLD_TEMPDIR = '/run/firewalld' |
63 | |
64 | -SYSCONFIGDIR = '/etc/sysconfig' |
65 | +SYSCONFIGDIR = '/etc/conf.d' |
66 | IFCFGDIR = "@IFCFGDIR@" |
67 | |
68 | SYSCTL_CONFIG = '/etc/sysctl.conf' |
69 | diff -Naur firewalld-0.5.2/src/tests/firewall-offline-cmd.at firewalld-0.5.2-confd/src/tests/firewall-offline-cmd.at |
70 | --- firewalld-0.5.2/src/tests/firewall-offline-cmd.at 2018-03-13 18:41:50.000000000 +0100 |
71 | +++ firewalld-0.5.2-confd/src/tests/firewall-offline-cmd.at 2019-10-21 12:29:19.815174824 +0200 |
72 | @@ -19,7 +19,7 @@ |
73 | FWD_CHECK([--addmodule=abc --addmodule=efg --removemodule=xyz dnl |
74 | --trust=eth+ --trust=em0 dnl |
75 | --masq=tun+ --masq=tap+ --port=7:tcp --port=666:udp dnl |
76 | - --custom-rules=ipv4:mangle:/etc/sysconfig/ebtables-config dnl |
77 | + --custom-rules=ipv4:mangle:/etc/conf.d/ebtables-config dnl |
78 | --service=dns --service=ftp --remove-service=dhcpv6-client dnl |
79 | --block-icmp=router-advertisement --block-icmp=router-solicitation dnl |
80 | --forward-port=if=ippp+:port=13:proto=tcp:toport=15:toaddr=1.2.3.4 dnl |
81 | @@ -45,7 +45,7 @@ |
82 | --masq=tap+ |
83 | --port=7:tcp |
84 | --port=666:udp |
85 | - --custom-rules=ipv4:mangle:/etc/sysconfig/ebtables-config |
86 | + --custom-rules=ipv4:mangle:/etc/conf.d/ebtables-config |
87 | --service=dns |
88 | --service=ftp |
89 | --remove-service=dhcpv6-client |