mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

firewalld: update to 0.7.1

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Callaghan, Dan
2019-10-04 13:12:26 +10:00
committed by Khem Raj
parent 6ce65dc3fb
commit 1eaeb89b94
2 changed files with 10 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch
-68
View File
@@ -1,68 +0,0 @@
firewalld: fix building in a separate directory outside the source tree
Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456]
Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com>
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -377,11 +377,11 @@ install-config:
$(MKDIR_P) $(DESTDIR)$(sconfdir)/zones
$(MKDIR_P) $(DESTDIR)$(sconfdir)/helpers
$(MKDIR_P) $(DESTDIR)$(prefixlibdir)
- cp -r icmptypes $(DESTDIR)$(prefixlibdir)
- cp -r ipsets $(DESTDIR)$(prefixlibdir)
- cp -r services $(DESTDIR)$(prefixlibdir)
- cp -r zones $(DESTDIR)$(prefixlibdir)
- cp -r helpers $(DESTDIR)$(prefixlibdir)
+ cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir)
+ cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir)
+ cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir)
+ cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir)
+ cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir)
uninstall-config:
rmdir $(DESTDIR)$(sconfdir)/icmptypes
--- a/doc/xml/Makefile.am
+++ b/doc/xml/Makefile.am
@@ -69,7 +69,8 @@ edit = sed \
-e 's|\@PREFIX\@|$(prefix)|' \
-e 's|\@SYSCONFDIR\@|$(sysconfdir)|' \
-e 's|\@PACKAGE_STRING\@|$(PACKAGE_STRING)|' \
- -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|'
+ -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' \
+ -e 's|@SRCDIR@|$(srcdir)|'
transform-man.xsl: transform-man.xsl.in
$(edit) $< >$@
--- a/doc/xml/firewall-cmd.xml.in
+++ b/doc/xml/firewall-cmd.xml.in
@@ -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 "@SRCDIR@/errorcodes.xml">
]>
<!--
--- a/doc/xml/firewalld.xml.in
+++ b/doc/xml/firewalld.xml.in
@@ -1,9 +1,9 @@
<?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 authors SYSTEM "@SRCDIR@/authors.xml">
+<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml">
+<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml">
]>
<!--
meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb → meta-networking/recipes-connectivity/firewalld/firewalld_0.7.1.bb
+10 -7
View File
@@ -6,20 +6,20 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
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] = "e63bdd65a4d2f6338f60b31e91bb5525"
SRC_URI[sha256sum] = "5a82a72fd9ad4cbbfb805bae615faa9b91a27855245de0fef3bcb06439394852"
SRC_URI[md5sum] = "32c16df3f6cc859d0df627baf5ee8401"
SRC_URI[sha256sum] = "88bc63a011209ac046fb5d7bfc73ddcc0bc616ddf3013bbb6bf1a421cb497f76"
# 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
DEPENDS = "intltool-native glib-2.0-native libxslt-native docbook-xsl-stylesheets-native xmlto-native"
DEPENDS = "intltool-native glib-2.0-native libxslt-native docbook-xsl-stylesheets-native"
inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_unitdir}/system/,--disable-systemd"
PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd"
PACKAGES += "${PN}-zsh-completion"
# iptables, ip6tables, ebtables, and ipset *should* be unnecessary
# when the nftables backend is available, because nftables supersedes all of them.
@@ -37,10 +37,11 @@ EXTRA_OECONF = "\
--without-ebtables \
--without-ebtables-restore \
--disable-sysconfig \
--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog \
"
INITSCRIPT_NAME = "firewalld"
SYSTEMD_SERVICE = "firewalld.service"
SYSTEMD_SERVICE_${PN} = "firewalld.service"
do_install_append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
@@ -65,9 +66,11 @@ do_install_append() {
FILES_${PN} += "\
${PYTHON_SITEPACKAGES_DIR}/firewall \
${datadir}/dbus-1 \
${datadir}/polkit-1 \
${datadir}/metainfo \
"
FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions"
RDEPENDS_${PN} = "\
nftables \