packages/firewalld
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!45 sync 22.03 to fix(config):Specify the translation encoding format as UTF-8

Browse Source 
From: @yangl777 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2023-01-03 03:39:19 +00:00 committed by Gitee
commit 11511fa8a1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firewalld.spec
View File

@ -1,6 +1,6 @@
Name: firewalld
Version: 0.6.6
Release: 5
Release: 7
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
License: GPLv2+
URL: http://www.firewalld.org
@ -10,6 +10,7 @@ Patch0: firewalld-0.2.6-MDNS-default.patch
#backport from Eric Garver <e@erig.me>
Patch1: 0001-fedora-patch-to-default-to-iptables-backend.patch
Patch2: add-Restart-on-failure-on-firewalld.service.patch
Patch3: 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
@ -194,19 +195,25 @@ fi
%changelog
* Sat Jan 22 2022 yanglu<yanglu72@huawei.com> - 0.9.6-5
* Thu Dec 29 2022 yanglu <yanglu72@h-partners.com> - 0.6.6-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Specify the translation encoding format as UTF-8
* Sat Jan 22 2022 yanglu<yanglu72@huawei.com> - 0.6.6-6
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add-Restart-on-failure-on-firewalld.service.patch
* Fri May 21 2021 xihaochen<xihaochen@huawei.com> - 0.9.6-4
* Fri May 21 2021 xihaochen<xihaochen@huawei.com> - 0.6.6-5
- Type:requirement
- ID:NA
- SUG:NA
- DESC:drop Requires:kernel
* Wed Dec 23 2020 Anakin Zhang <benjamin93@163.com> - 0.9.6-3
* Wed Dec 23 2020 Anakin Zhang <benjamin93@163.com> - 0.6.6-4
- Type:requirement
- ID:NA
- SUG:NA

51
fix-config-Specify-the-translation-encoding-format-a.patch Normal file
View File

@ -0,0 +1,51 @@
From 8e018f450b57f7ab1c0eec258d81816f75cd97de Mon Sep 17 00:00:00 2001
From: luoqing <luoqing@kylinsec.com.cn>
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