diff options
author | Callaghan, Dan <dan.callaghan@opengear.com> | 2019-10-04 13:12:26 +1000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-10-04 19:11:55 -0700 |
commit | 1eaeb89b9443298295943bc76af00dde00173e66 (patch) | |
tree | 840b1ee8a338ca489a647abcd586577470add1a7 | |
parent | 6ce65dc3fbf1f97db6f01fccc6205db243577662 (diff) | |
download | meta-openembedded-1eaeb89b9443298295943bc76af00dde00173e66.tar.gz |
firewalld: update to 0.7.1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch | 68 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb (renamed from meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb) | 17 |
2 files changed, 10 insertions, 75 deletions
diff --git a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch b/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch deleted file mode 100644 index 28d590242..000000000 --- a/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | firewalld: fix building in a separate directory outside the source tree | ||
2 | |||
3 | Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456] | ||
4 | Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com> | ||
5 | |||
6 | --- a/config/Makefile.am | ||
7 | +++ b/config/Makefile.am | ||
8 | @@ -377,11 +377,11 @@ install-config: | ||
9 | $(MKDIR_P) $(DESTDIR)$(sconfdir)/zones | ||
10 | $(MKDIR_P) $(DESTDIR)$(sconfdir)/helpers | ||
11 | $(MKDIR_P) $(DESTDIR)$(prefixlibdir) | ||
12 | - cp -r icmptypes $(DESTDIR)$(prefixlibdir) | ||
13 | - cp -r ipsets $(DESTDIR)$(prefixlibdir) | ||
14 | - cp -r services $(DESTDIR)$(prefixlibdir) | ||
15 | - cp -r zones $(DESTDIR)$(prefixlibdir) | ||
16 | - cp -r helpers $(DESTDIR)$(prefixlibdir) | ||
17 | + cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir) | ||
18 | + cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir) | ||
19 | + cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir) | ||
20 | + cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir) | ||
21 | + cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir) | ||
22 | |||
23 | uninstall-config: | ||
24 | rmdir $(DESTDIR)$(sconfdir)/icmptypes | ||
25 | --- a/doc/xml/Makefile.am | ||
26 | +++ b/doc/xml/Makefile.am | ||
27 | @@ -69,7 +69,8 @@ edit = sed \ | ||
28 | -e 's|\@PREFIX\@|$(prefix)|' \ | ||
29 | -e 's|\@SYSCONFDIR\@|$(sysconfdir)|' \ | ||
30 | -e 's|\@PACKAGE_STRING\@|$(PACKAGE_STRING)|' \ | ||
31 | - -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' | ||
32 | + -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' \ | ||
33 | + -e 's|@SRCDIR@|$(srcdir)|' | ||
34 | |||
35 | transform-man.xsl: transform-man.xsl.in | ||
36 | $(edit) $< >$@ | ||
37 | --- a/doc/xml/firewall-cmd.xml.in | ||
38 | +++ b/doc/xml/firewall-cmd.xml.in | ||
39 | @@ -1,10 +1,10 @@ | ||
40 | <?xml version="1.0" encoding="utf-8"?> | ||
41 | <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | ||
42 | [ | ||
43 | -<!ENTITY authors SYSTEM "authors.xml"> | ||
44 | -<!ENTITY seealso SYSTEM "seealso.xml"> | ||
45 | -<!ENTITY notes SYSTEM "notes.xml"> | ||
46 | -<!ENTITY errorcodes SYSTEM "errorcodes.xml"> | ||
47 | +<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> | ||
48 | +<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> | ||
49 | +<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> | ||
50 | +<!ENTITY errorcodes SYSTEM "@SRCDIR@/errorcodes.xml"> | ||
51 | ]> | ||
52 | |||
53 | <!-- | ||
54 | --- a/doc/xml/firewalld.xml.in | ||
55 | +++ b/doc/xml/firewalld.xml.in | ||
56 | @@ -1,9 +1,9 @@ | ||
57 | <?xml version="1.0" encoding="utf-8"?> | ||
58 | <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | ||
59 | [ | ||
60 | -<!ENTITY authors SYSTEM "authors.xml"> | ||
61 | -<!ENTITY seealso SYSTEM "seealso.xml"> | ||
62 | -<!ENTITY notes SYSTEM "notes.xml"> | ||
63 | +<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> | ||
64 | +<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> | ||
65 | +<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> | ||
66 | ]> | ||
67 | |||
68 | <!-- | ||
diff --git a/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb index d9d5cad75..fab27f1ee 100644 --- a/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb +++ b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb | |||
@@ -6,20 +6,20 @@ LICENSE = "GPLv2+" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
7 | 7 | ||
8 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ | 8 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ |
9 | file://0001-fix-building-in-a-separate-directory-outside-the-sou.patch \ | ||
10 | file://firewalld.init \ | 9 | file://firewalld.init \ |
11 | " | 10 | " |
12 | SRC_URI[md5sum] = "e63bdd65a4d2f6338f60b31e91bb5525" | 11 | SRC_URI[md5sum] = "32c16df3f6cc859d0df627baf5ee8401" |
13 | SRC_URI[sha256sum] = "5a82a72fd9ad4cbbfb805bae615faa9b91a27855245de0fef3bcb06439394852" | 12 | SRC_URI[sha256sum] = "88bc63a011209ac046fb5d7bfc73ddcc0bc616ddf3013bbb6bf1a421cb497f76" |
14 | 13 | ||
15 | # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 | 14 | # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 |
16 | # xmlto-native is needed to populate /etc/xml/catalog.xml in the sysroot so that xsltproc finds the docbook xslt | 15 | DEPENDS = "intltool-native glib-2.0-native libxslt-native docbook-xsl-stylesheets-native" |
17 | DEPENDS = "intltool-native glib-2.0-native libxslt-native docbook-xsl-stylesheets-native xmlto-native" | ||
18 | 16 | ||
19 | inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d | 17 | inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d |
20 | 18 | ||
21 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
22 | PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_unitdir}/system/,--disable-systemd" | 20 | PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" |
21 | |||
22 | PACKAGES += "${PN}-zsh-completion" | ||
23 | 23 | ||
24 | # iptables, ip6tables, ebtables, and ipset *should* be unnecessary | 24 | # iptables, ip6tables, ebtables, and ipset *should* be unnecessary |
25 | # when the nftables backend is available, because nftables supersedes all of them. | 25 | # when the nftables backend is available, because nftables supersedes all of them. |
@@ -37,10 +37,11 @@ EXTRA_OECONF = "\ | |||
37 | --without-ebtables \ | 37 | --without-ebtables \ |
38 | --without-ebtables-restore \ | 38 | --without-ebtables-restore \ |
39 | --disable-sysconfig \ | 39 | --disable-sysconfig \ |
40 | --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog \ | ||
40 | " | 41 | " |
41 | 42 | ||
42 | INITSCRIPT_NAME = "firewalld" | 43 | INITSCRIPT_NAME = "firewalld" |
43 | SYSTEMD_SERVICE = "firewalld.service" | 44 | SYSTEMD_SERVICE_${PN} = "firewalld.service" |
44 | 45 | ||
45 | do_install_append() { | 46 | do_install_append() { |
46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 47 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
@@ -65,9 +66,11 @@ do_install_append() { | |||
65 | 66 | ||
66 | FILES_${PN} += "\ | 67 | FILES_${PN} += "\ |
67 | ${PYTHON_SITEPACKAGES_DIR}/firewall \ | 68 | ${PYTHON_SITEPACKAGES_DIR}/firewall \ |
69 | ${datadir}/dbus-1 \ | ||
68 | ${datadir}/polkit-1 \ | 70 | ${datadir}/polkit-1 \ |
69 | ${datadir}/metainfo \ | 71 | ${datadir}/metainfo \ |
70 | " | 72 | " |
73 | FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" | ||
71 | 74 | ||
72 | RDEPENDS_${PN} = "\ | 75 | RDEPENDS_${PN} = "\ |
73 | nftables \ | 76 | nftables \ |