From 14c7d65643d9da0fdb0e96583961983c45d2e0c8 Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Fri, 13 Sep 2024 00:11:13 -0500 Subject: [PATCH] firewalld: upgrade 1.3.2 -> 2.2.1 Major/minor release changelogs: - https://firewalld.org/2023/06/firewalld-2-0-0-release - https://firewalld.org/2024/01/firewalld-2-1-0-release - https://github.com/firewalld/firewalld/releases/tag/v2.2.0 (dunno why the website wasn't updated) Stop trying to rewrite /etc/firewalld/*.xml. It appears to be for the sake of /etc/firewalld/lockdown-whitelist.xml, which is not being installed anymore. Add RDEPENDS+=bash. Used by /usr/lib/firewalld/xmlschema/check.sh; adding to avoid a QA failure. Signed-off-by: Rich Tollerton Signed-off-by: Khem Raj --- .../firewalld/{firewalld_1.3.2.bb => firewalld_2.2.1.bb} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/{firewalld_1.3.2.bb => firewalld_2.2.1.bb} (97%) diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb similarity index 97% rename from meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb rename to meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb index 12cc6645b5..0c670a2caa 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb @@ -10,7 +10,7 @@ SRC_URI = "\ file://firewalld.init \ file://run-ptest \ " -SRC_URI[sha256sum] = "aba0d8ce9617b906ea4866bf0bdfb2c2d5312f53b8e9e8e9e4d49bf330da5b5e" +SRC_URI[sha256sum] = "5215ba30236ee1e3df2c2292465a9ff605b9c445dcab2e37da4961cb27c7f36e" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 DEPENDS = "intltool-native glib-2.0-native nftables" @@ -159,10 +159,10 @@ do_install:append() { # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. if [ ${PN} != "${BPN}-native" ]; then sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + ${D}${bindir}/* ${D}${sbindir}/* fi sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + ${D}${bindir}/* ${D}${sbindir}/* # This file contains Red Hat-isms. Modules get loaded without it. rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf @@ -274,6 +274,7 @@ FILES:${PN} += "\ ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \ " RDEPENDS:${PN} += "\ + bash \ python3-firewall \ iptables \ python3-core \