diff --git a/0001-fix-config-Specify-the-translation-encoding-format-a.patch b/0001-fix-config-Specify-the-translation-encoding-format-a.patch deleted file mode 100644 index 0a760543498be7b17605f9a01871ffc36bf5dfe4..0000000000000000000000000000000000000000 --- a/0001-fix-config-Specify-the-translation-encoding-format-a.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8e018f450b57f7ab1c0eec258d81816f75cd97de Mon Sep 17 00:00:00 2001 -From: luoqing -Date: Mon, 14 Nov 2022 16:21:25 +0800 -Subject: [PATCH] fix(config):Specify the translation encoding format as UTF-8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 指定翻译编码格式为UTF-8 ---- - src/firewall/config/__init__.py | 2 ++ - src/firewall/config/__init__.py.in | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/firewall/config/__init__.py b/src/firewall/config/__init__.py -index 1dc34d5..cf6b63c 100644 ---- a/src/firewall/config/__init__.py -+++ b/src/firewall/config/__init__.py -@@ -22,10 +22,12 @@ - import locale - try: - locale.setlocale(locale.LC_ALL, "") -+ locale.bind_textdomain_codeset("firewalld","UTF-8") - except locale.Error: - import os - os.environ['LC_ALL'] = 'C' - locale.setlocale(locale.LC_ALL, "") -+ locale.bind_textdomain_codeset("firewalld","UTF-8") - - DOMAIN = 'firewalld' - import gettext -diff --git a/src/firewall/config/__init__.py.in b/src/firewall/config/__init__.py.in -index 6322334..0b5804f 100644 ---- a/src/firewall/config/__init__.py.in -+++ b/src/firewall/config/__init__.py.in -@@ -22,10 +22,12 @@ - import locale - try: - locale.setlocale(locale.LC_ALL, "") -+ locale.bind_textdomain_codeset("firewalld","UTF-8") - except locale.Error: - import os - os.environ['LC_ALL'] = 'C' - locale.setlocale(locale.LC_ALL, "") -+ locale.bind_textdomain_codeset("firewalld","UTF-8") - - DOMAIN = 'firewalld' - import gettext --- -2.33.0 - diff --git a/add-Restart-on-failure-on-firewalld.service.patch b/add-Restart-on-failure-on-firewalld.service.patch deleted file mode 100644 index 71b44d9da9bdbbf99772dbd7dd561a739ff7a72b..0000000000000000000000000000000000000000 --- a/add-Restart-on-failure-on-firewalld.service.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 63fe76dfcaad171c1eaa8c13ccae1f5b5c98d110 Mon Sep 17 00:00:00 2001 -From: hanzhijun -Date: Fri, 18 Sep 2020 09:46:37 +0800 -Subject: [PATCH] add Restart=on-failure on firewalld.service - ---- - config/firewalld.service.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/firewalld.service.in b/config/firewalld.service.in -index b757a08..4cfed7c 100644 ---- a/config/firewalld.service.in -+++ b/config/firewalld.service.in -@@ -17,6 +17,7 @@ StandardError=null - Type=dbus - BusName=org.fedoraproject.FirewallD1 - KillMode=mixed -+Restart=on-failure - - [Install] - WantedBy=multi-user.target --- -2.23.0 \ No newline at end of file diff --git a/firewalld-1.2.6.tar.gz b/firewalld-1.2.6.tar.gz deleted file mode 100644 index 3e3ddf935af0df5757fc787b319b8063e23d09c1..0000000000000000000000000000000000000000 Binary files a/firewalld-1.2.6.tar.gz and /dev/null differ diff --git a/firewalld-2.1.1.tar.bz2 b/firewalld-2.1.1.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..8124f863c7746b32d14949b1c6431f830856a6e1 Binary files /dev/null and b/firewalld-2.1.1.tar.bz2 differ diff --git a/firewalld.spec b/firewalld.spec index 26a1b33efeaf8dbf8f71f6387dd7bda50d62661b..56710453c148c306efb04f25c59ff5492bd67e20 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,15 +1,12 @@ Name: firewalld -Version: 1.2.6 +Version: 2.1.1 Release: 1 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall License: GPLv2+ URL: http://www.firewalld.org -Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/%{name}-%{version}.tar.bz2 Patch0: firewalld-0.2.6-MDNS-default.patch -Patch1: repair-test-cases.patch -Patch2: add-Restart-on-failure-on-firewalld.service.patch -Patch3: 0001-fix-config-Specify-the-translation-encoding-format-a.patch BuildArch: noarch BuildRequires: autoconf automake desktop-file-utils gettext intltool glib2 glib2-devel systemd-units docbook-style-xsl @@ -177,9 +174,6 @@ fi %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.server.policy.choice %ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy %{_sysconfdir}/modprobe.d/firewalld-sysctls.conf -%if %{!?openEuler:1}0 -%attr (0700,root,root) %{_datadir}/firewalld/firewalld-tmp-mmap -%endif %config(noreplace) %{_sysconfdir}/logrotate.d/firewalld %{_rpmconfigdir}/macros.d/macros.firewalld @@ -193,7 +187,6 @@ fi %if %{?openEuler:1}0 %defattr(0644,root,root) -%attr (0700,root,root) %{_datadir}/firewalld/firewalld-tmp-mmap %{_datadir}/firewalld/* %{_datadir}/applications/firewall-config.desktop %{_datadir}/metainfo/firewall-config.appdata.xml @@ -228,9 +221,14 @@ fi %{_datadir}/firewalld/testsuite/python/firewalld_config.py %{_datadir}/firewalld/testsuite/python/firewalld_direct.py %{_datadir}/firewalld/testsuite/python/firewalld_rich.py -%{_datadir}/firewalld/testsuite/python/firewalld_test.py %changelog +* Wed Apr 10 2024 liweigang - 2.1.1-1 +- Type: requirement +- ID: NA +- SUG: NA +- DESC: update to 2.1.1 + * Sat Jan 06 2024 zhanghao - 1.2.6-1 - Type:requirement - ID:NA diff --git a/repair-test-cases.patch b/repair-test-cases.patch deleted file mode 100644 index 5b23d1c99ac2c9a6f997a92e2513f4f46df9c357..0000000000000000000000000000000000000000 --- a/repair-test-cases.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9904b48fdce1e28b122d8f64961d2dda81d4c546 Mon Sep 17 00:00:00 2001 -From: sherlock2010 <15151851377@163.com> -Date: Wed, 29 Jul 2020 17:29:59 +0800 -Subject: [PATCH 3/3] third commit - ---- - src/tests/regression/gh366.at | 1 + - src/tests/regression/rhbz1514043.at | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/tests/regression/gh366.at b/src/tests/regression/gh366.at -index 1441a6b..be33ed7 100644 ---- a/src/tests/regression/gh366.at -+++ b/src/tests/regression/gh366.at -@@ -22,6 +22,7 @@ ACCEPT udp ::/0 fe80::/64 udp dpt:546 ctstate NEW,UNTRACKED - ACCEPT udp ::/0 ff02::fb udp dpt:5353 ctstate NEW,UNTRACKED - ])]) - -+FWD_CHECK([-q --zone=public --remove-service=mdns]) - FWD_CHECK([-q --zone=public --add-service=mdns]) - check_firewall_backend_output - FWD_CHECK([-q --zone=public --remove-service=mdns]) -diff --git a/src/tests/regression/rhbz1514043.at b/src/tests/regression/rhbz1514043.at -index efc33e0..694a198 100644 ---- a/src/tests/regression/rhbz1514043.at -+++ b/src/tests/regression/rhbz1514043.at -@@ -5,7 +5,7 @@ FWD_CHECK([-q --set-log-denied=all]) - FWD_CHECK([-q --permanent --zone=public --add-service=samba]) - FWD_RELOAD - FWD_CHECK([--zone=public --list-all | TRIM | grep ^services], 0, [dnl --services: dhcpv6-client samba ssh -+services: ssh mdns dhcpv6-client samba - ]) - - dnl check that log denied actually took effect --- -1.8.3.1 -