Fix failures in running firewalld service (#13903)

Author: Sumynwa

SPECS/dbus-python/0001-Move-python-modules-to-architecture-specific-directo.patch

@@ -7,14 +7,14 @@ This is because dbus-python gets dragged in as a dependency of other
 things people want to be multilib-compatible.  As is the Python
 modules conflict.
 ---
- Makefile.am | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+ Makefile.am | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index fd480d4..0859994 100644
+index 8738d57..b6d30c0 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -155,7 +155,8 @@ test_dbus_py_test_la_SOURCES = \
+@@ -176,7 +176,8 @@ test_dbus_py_test_la_SOURCES = \
 
  # === dbus package ===
 
@@ -24,29 +24,23 @@ index fd480d4..0859994 100644
      dbus/bus.py \
      dbus/connection.py \
      dbus/_compat.py \
-@@ -175,12 +176,12 @@ nobase_python_PYTHON = \
+@@ -195,7 +196,7 @@ nobase_python_PYTHON = \
+     dbus/service.py \
      dbus/types.py
 
- if !HAVE_PYTHON_3
--nobase_python_PYTHON += \
-+nobase_dbuspy_DATA += \
-     dbus/gobject_service.py \
-     $(NULL)
- endif
- 
 -check_py_sources = $(nobase_python_PYTHON)
 +check_py_sources = $(nobase_dbuspy_DATA)
  include $(top_srcdir)/tools/check-coding-style.mk
 
  # === Devel stuff ===
-@@ -416,7 +417,7 @@ uninstall-local: uninstall-local-sphinx
+@@ -434,7 +435,7 @@ uninstall-local-pycache:
  if ENABLE_DOCUMENTATION
- all: doc/_build/.stamp
+ all: doc/html/.stamp
 
--doc/_build/.stamp: $(nobase_python_PYTHON) \
-+doc/_build/.stamp: $(nobase_dbuspy_DATA) \
+-doc/html/.stamp: $(nobase_python_PYTHON) \
++doc/html/.stamp: $(nobase_dbuspy_DATA) \
  			_dbus_bindings.la \
  			_dbus_glib_bindings.la \
  			$(sphinx_sources) \
 -- 
-2.17.0
+2.45.3

SPECS/dbus-python/dbus-python.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "dbus-python-1.2.16.tar.gz": "11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4"
+  "dbus-python-1.3.2.tar.gz": "ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8"
  }
-}
+}

SPECS/dbus-python/dbus-python.spec

@@ -1,16 +1,14 @@
 Summary:        D-Bus Python Bindings
 Name:           dbus-python
-Version:        1.2.16
-Release:        3%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://www.freedesktop.org/wiki/Software/DBusBindings/
 Source0:        https://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 # borrow centos7 patch to use sitearch properly
 Patch0:         0001-Move-python-modules-to-architecture-specific-directo.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1788491
-Patch1:         python39.patch
 
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
@@ -28,6 +26,7 @@ Summary:        D-Bus bindings for python3
 BuildRequires:  python3-devel
 # for py3_build
 BuildRequires:  python3dist(setuptools)
+BuildRequires:  python3dist(wheel)
 
 %description -n python3-dbus
 %{summary}.
@@ -46,12 +45,14 @@ bindings.
 autoreconf -vif
 
 %build
+export DBUS_PYTHON_USE_AUTOTOOLS=1
 %set_build_flags
 %py3_build
 %configure PYTHON="%{__python3}"
 %make_build
 
 %install
+export DBUS_PYTHON_USE_AUTOTOOLS=1
 %py3_install
 %make_install
 
@@ -75,6 +76,9 @@ make check -k || (cat test-suite.log && false)
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+* Wed May 28 2025 Sumedh Sharma <sumsharma@microsoft.com> - 1.3.2-1
+- Bump version to 1.3.2
+
 * Fri Jul 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.2.16-3
 - License verified.
 

SPECS/dbus-python/python39.patch

@@ -3,7 +3,7 @@
 Summary:        A firewall daemon with D-Bus interface providing a dynamic firewall
 Name:           firewalld
 Version:        2.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -12,6 +12,7 @@ Source0:        https://github.com/firewalld/firewalld/releases/download/v%{vers
 Source1:        FedoraServer.xml
 Source2:        FedoraWorkstation.xml
 Patch0:         firewalld-only-MDNS-default.patch
+Patch1:         firewalld_fix_testsuite.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -55,7 +56,7 @@ firewall with a D-Bus interface.
 %{?python_provide:%python_provide python3-firewall}
 Summary:        Python3 bindings for firewalld
 
-Requires:       python3-dbus
+Requires:       python3-dbus >= 1.3.2
 Requires:       python3-gobject-base
 Requires:       python3-nftables
 
@@ -72,6 +73,8 @@ are required by other packages that add firewalld configuration files.
 %package -n firewalld-test
 Summary: Firewalld testsuite
 
+Requires:       time
+
 %description -n firewalld-test
 This package provides the firewalld testsuite.
 
@@ -137,6 +140,8 @@ install -c -m 644 %{SOURCE2} %{buildroot}%{_libdir}/firewalld/zones/FedoraWorkst
 # standard firewalld.conf
 mv %{buildroot}%{_sysconfdir}/firewalld/firewalld.conf \
     %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf
+sed -i 's|^IPv6_rpfilter=.*|IPv6_rpfilter=no|g' \
+    %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf
 
 # server firewalld.conf
 cp -a %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf \
@@ -304,6 +309,10 @@ fi
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Mon Jun 16 2025 Sumedh Sharma <sumsharma@microsoft.com> - 2.0.2-3
+- disable ipv6_rpfilter in configuration
+- fix testsuite provided by firewalld-test sub-package
+
 * Sun Feb 04 2024 Dan Streetman <ddstreet@ieee.org> - 2.0.2-2
 - workaround "circular dependencies" from build tooling