diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-07-20 20:32:32 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-07-21 09:40:20 -0700 |
commit | 07db1c40eec5cb7abf8e5a63acf311edc7754676 (patch) | |
tree | e03763fa19f781bd35aa16381a6427295176f134 /meta-networking | |
parent | ed399faf315e67d8ea6ac937ef40b0224e3112a6 (diff) | |
download | meta-openembedded-contrib-07db1c40eec5cb7abf8e5a63acf311edc7754676.tar.gz |
firewalld: Update to 0.6.3->0.6.4
Forward port patch to work with 0.6.4 and update the status
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch | 19 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb (renamed from meta-networking/recipes-connectivity/firewalld/firewalld_0.6.3.bb) | 8 |
2 files changed, 9 insertions, 18 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 index 3f34ff2e4c..28d5902429 100644 --- 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 @@ -1,10 +1,8 @@ firewalld: fix building in a separate directory outside the source tree -Upstream-Status: Submitted [https://github.com/firewalld/firewalld/pull/456] +Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456] Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com> -diff --git a/config/Makefile.am b/config/Makefile.am -index 7048d2ee..5270d408 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -377,11 +377,11 @@ install-config: @@ -24,8 +22,6 @@ index 7048d2ee..5270d408 100644 uninstall-config: rmdir $(DESTDIR)$(sconfdir)/icmptypes -diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am -index 8c93ab9c..d0313e3e 100644 --- a/doc/xml/Makefile.am +++ b/doc/xml/Makefile.am @@ -69,7 +69,8 @@ edit = sed \ @@ -38,25 +34,23 @@ index 8c93ab9c..d0313e3e 100644 transform-man.xsl: transform-man.xsl.in $(edit) $< >$@ -diff --git a/doc/xml/firewall-cmd.xml.in b/doc/xml/firewall-cmd.xml.in -index c2606553..24d77858 100644 --- a/doc/xml/firewall-cmd.xml.in +++ b/doc/xml/firewall-cmd.xml.in -@@ -1,9 +1,9 @@ +@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY authors SYSTEM "authors.xml"> -<!ENTITY seealso SYSTEM "seealso.xml"> -<!ENTITY notes SYSTEM "notes.xml"> +-<!ENTITY errorcodes SYSTEM "errorcodes.xml"> +<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> +<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> +<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> - <!ENTITY errorcodes SYSTEM "errorcodes.xml"> ++<!ENTITY errorcodes SYSTEM "@SRCDIR@/errorcodes.xml"> ]> -diff --git a/doc/xml/firewalld.xml.in b/doc/xml/firewalld.xml.in -index de802059..3d319b04 100644 + <!-- --- a/doc/xml/firewalld.xml.in +++ b/doc/xml/firewalld.xml.in @@ -1,9 +1,9 @@ @@ -72,6 +66,3 @@ index de802059..3d319b04 100644 ]> <!-- --- -2.20.1 - diff --git a/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.3.bb b/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb index e999fa7a5d..5955072f15 100644 --- a/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.3.bb +++ b/meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb @@ -4,12 +4,12 @@ BUGTRACKER = "https://github.com/firewalld/firewalld/issues" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://github.com/firewalld/firewalld/archive/v${PV}.tar.gz \ - file://firewalld.init \ +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://0001-fix-building-in-a-separate-directory-outside-the-sou.patch \ + file://firewalld.init \ " -SRC_URI[md5sum] = "5ef954d9b6b244ffeabcd226be1867a0" -SRC_URI[sha256sum] = "039ad56ea6d6553aadf33243ea5b39802d73519e46a89c80c648b2bd1ec78aeb" +SRC_URI[md5sum] = "e63bdd65a4d2f6338f60b31e91bb5525" +SRC_URI[sha256sum] = "5a82a72fd9ad4cbbfb805bae615faa9b91a27855245de0fef3bcb06439394852" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 # xmlto-native is needed to populate /etc/xml/catalog.xml in the sysroot so that xsltproc finds the docbook xslt |