Hello community, here is the log from the commit of package firewalld for openSUSE:Factory checked in at 2018-09-13 12:09:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firewalld (Old) and /work/SRC/openSUSE:Factory/.firewalld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "firewalld" Thu Sep 13 12:09:22 2018 rev:35 rq:633723 version:0.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/firewalld/firewalld.changes 2018-08-28 13:36:12.539226249 +0200 +++ /work/SRC/openSUSE:Factory/.firewalld.new/firewalld.changes 2018-09-13 12:09:25.502435008 +0200 @@ -1,0 +2,9 @@ +Sun Sep 2 03:50:37 UTC 2018 - [email protected] + +- Add firewalld-fix-firewalld-config-crash.patch: set + nm_get_zone_of_connection to return 'None' instead of 'False' for + automatically generated connections to avoid firewall-config + crashes. Patch provided by upstream (boo#1106319, + gh#firewalld/firewalld#370). + +------------------------------------------------------------------- New: ---- firewalld-fix-firewalld-config-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firewalld.spec ++++++ --- /var/tmp/diff_new_pack.375U5o/_old 2018-09-13 12:09:26.014434433 +0200 +++ /var/tmp/diff_new_pack.375U5o/_new 2018-09-13 12:09:26.014434433 +0200 @@ -30,6 +30,8 @@ Source: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-SUSE: 0001-firewall-backend-Switch-default-backend-to-iptables.patch (bsc#1102761) Patch0: 0001-firewall-backend-Switch-default-backend-to-iptables.patch +# PATCH-FIX-UPSTREAM firewalld-fix-firewalld-config-crash.patch [email protected] -- fix firewall-config crash when nm_get_zone_of_connection returns "False" +Patch1: firewalld-fix-firewalld-config-crash.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils @@ -112,8 +114,8 @@ %prep %setup -q -# bsc#1102761 - switch to iptables as default %patch0 -p1 +%patch1 -p1 # bsc#1078223 rm config/services/high-availability.xml ++++++ firewalld-fix-firewalld-config-crash.patch ++++++ >From a24ab61eabe24656b457273f54133fa99087f2f6 Mon Sep 17 00:00:00 2001 From: Farenjihn <[email protected]> Date: Fri, 17 Aug 2018 11:58:55 +0200 Subject: [PATCH] firewall/core/fw_nm: nm_get_zone_of_connection should return None or empty string instead of False (cherry picked from commit 5a59a90f449a8bf836e62e2d9ad486301b1aa2bb) --- src/firewall/core/fw_nm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/firewall/core/fw_nm.py b/src/firewall/core/fw_nm.py index 97113d95..37282a1a 100644 --- a/src/firewall/core/fw_nm.py +++ b/src/firewall/core/fw_nm.py @@ -75,21 +75,21 @@ def nm_get_zone_of_connection(connection): con = nm_get_client().get_connection_by_uuid(connection) if con is None: - return False + return None setting_con = con.get_setting_connection() if setting_con is None: - return False + return None try: if con.get_flags() & (NM.SettingsConnectionFlags.NM_GENERATED | NM.SettingsConnectionFlags.NM_VOLATILE): - return False + return "" except AttributeError: # Prior to NetworkManager 1.12, we can only guess # that a connection was generated/volatile. if con.get_unsaved(): - return False + return "" zone = setting_con.get_zone() if zone is None: -- 2.18.0
