Skip to content

Commit

Permalink
firewalld: upgrade 1.3.2 -> 2.2.1
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
  • Loading branch information
rtollert authored and kraj committed Oct 7, 2024
1 parent 7fe2259 commit 14c7d65
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -274,6 +274,7 @@ FILES:${PN} += "\
${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \
"
RDEPENDS:${PN} += "\
bash \
python3-firewall \
iptables \
python3-core \
Expand Down

0 comments on commit 14c7d65

Please sign in to comment.