diff --git a/0001-add-more-zh_CN-translation-for-i18n.patch b/0001-add-more-zh_CN-translation-for-i18n.patch new file mode 100644 index 0000000000000000000000000000000000000000..5b72693a6493c9ba95344341547d751089184dc6 --- /dev/null +++ b/0001-add-more-zh_CN-translation-for-i18n.patch @@ -0,0 +1,692 @@ +From 30e1e26186f10210c9b65cca0b014ea376162c0e Mon Sep 17 00:00:00 2001 +From: hanjinpeng +Date: Fri, 15 Jul 2022 21:03:17 +0800 +Subject: [PATCH] add more zh_CN translation for i18n + +--- + dist/systemd/po.zh_CN.js | 192 +++++++++++++++++++-------------------- + 1 file changed, 96 insertions(+), 96 deletions(-) + +diff --git a/dist/systemd/po.zh_CN.js b/dist/systemd/po.zh_CN.js +index eb45f32..31b7059 100644 +--- a/dist/systemd/po.zh_CN.js ++++ b/dist/systemd/po.zh_CN.js +@@ -81,7 +81,7 @@ return plural; + ], + "$0 is not available from any repository.": [ + null, +- "" ++ "$0 在任何一个仓库不可使用" + ], + "$0 minute": [ + "$0 minutes", +@@ -97,7 +97,7 @@ return plural; + ], + "$0 will be installed.": [ + null, +- "" ++ "$0 将要被安装" + ], + "$0 year": [ + "$0 years", +@@ -289,11 +289,11 @@ return plural; + ], + "Additional packages:": [ + null, +- "" ++ "附加包" + ], + "Advanced TCA": [ + null, +- "" ++ "高级 TCA" + ], + "After": [ + null, +@@ -305,11 +305,11 @@ return plural; + ], + "Alert and above": [ + null, +- "" ++ "Alert 及更高级别" + ], + "All In One": [ + null, +- "" ++ "多合一" + ], + "Asset Tag": [ + null, +@@ -329,43 +329,43 @@ return plural; + ], + "BIOS": [ + null, +- "" ++ "BIOS" + ], + "BIOS date": [ + null, +- "" ++ "BIOS日期" + ], + "BIOS version": [ + null, +- "" ++ "BIOS版本" + ], + "Before": [ + null, +- "" ++ "之前" + ], + "Binds To": [ + null, +- "" ++ "绑定到" + ], + "Blade": [ + null, +- "" ++ "刀片" + ], + "Blade enclosure": [ + null, +- "" ++ "刀片机箱" + ], + "Bound By": [ + null, +- "" ++ "边界为" + ], + "Bug Fix Updates Available": [ + null, +- "" ++ "可利用的bug修复" + ], + "Bus Expansion Chassis": [ + null, +- "" ++ "总线扩展机箱" + ], + "CPU": [ + null, +@@ -397,19 +397,19 @@ return plural; + ], + "Checking for updates…": [ + null, +- "" ++ "检查更新" + ], + "Checking installed software": [ + null, +- "" ++ "检查安装的软件" + ], + "Class": [ + null, +- "" ++ "分类" + ], + "Click to see system hardware information": [ + null, +- "" ++ "点击查看系统硬件信息" + ], + "Close": [ + null, +@@ -421,7 +421,7 @@ return plural; + ], + "Compact PCI": [ + null, +- "" ++ "紧凑型 PCI" + ], + "Condition $0=$1 was not met": [ + null, +@@ -433,19 +433,19 @@ return plural; + ], + "Conflicted By": [ + null, +- "" ++ "冲突于" + ], + "Conflicts": [ + null, +- "" ++ "冲突" + ], + "Consists Of": [ + null, +- "" ++ "组成" + ], + "Convertible": [ + null, +- "" ++ "可转换" + ], + "Create Timer": [ + null, +@@ -457,7 +457,7 @@ return plural; + ], + "Critical and above": [ + null, +- "" ++ "Critical 及更高级别" + ], + "Current boot": [ + null, +@@ -465,7 +465,7 @@ return plural; + ], + "Debug and above": [ + null, +- "" ++ "Debug 及更高级别" + ], + "Delay": [ + null, +@@ -477,11 +477,11 @@ return plural; + ], + "Desktop": [ + null, +- "" ++ "桌面" + ], + "Detachable": [ + null, +- "" ++ "可拆卸" + ], + "Disable": [ + null, +@@ -497,7 +497,7 @@ return plural; + ], + "Docking Station": [ + null, +- "" ++ "扩展坞" + ], + "Domain": [ + null, +@@ -509,11 +509,11 @@ return plural; + ], + "Downloading $0": [ + null, +- "" ++ "正在下载 $0" + ], + "Embedded PC": [ + null, +- "" ++ "嵌入式 PC" + ], + "Enable": [ + null, +@@ -525,7 +525,7 @@ return plural; + ], + "Enable persistent metrics…": [ + null, +- "" ++ "启用持久性指标..." + ], + "Enabled": [ + null, +@@ -533,7 +533,7 @@ return plural; + ], + "Enhancement Updates Available": [ + null, +- "" ++ "增强可利用的更新" + ], + "Entry": [ + null, +@@ -545,7 +545,7 @@ return plural; + ], + "Error and above": [ + null, +- "" ++ "Error 及更高级别" + ], + "Everything": [ + null, +@@ -553,7 +553,7 @@ return plural; + ], + "Expansion Chassis": [ + null, +- "" ++ "总线扩展机箱" + ], + "Free": [ + null, +@@ -577,7 +577,7 @@ return plural; + ], + "Hand Held": [ + null, +- "" ++ "手持式" + ], + "Hardware": [ + null, +@@ -585,7 +585,7 @@ return plural; + ], + "Hardware Information": [ + null, +- "" ++ "硬件信息" + ], + "Host Name": [ + null, +@@ -613,7 +613,7 @@ return plural; + ], + "Info and above": [ + null, +- "" ++ "Info 及更高级别" + ], + "Install": [ + null, +@@ -621,11 +621,11 @@ return plural; + ], + "Install Software": [ + null, +- "" ++ "安装的软件" + ], + "Installing $0": [ + null, +- "" ++ "正在安装 $0" + ], + "Instantiate": [ + null, +@@ -657,11 +657,11 @@ return plural; + ], + "IoT Gateway": [ + null, +- "" ++ "IoT 网关" + ], + "Joins Namespace Of": [ + null, +- "" ++ "加入命名空间" + ], + "Journal": [ + null, +@@ -681,7 +681,7 @@ return plural; + ], + "Laptop": [ + null, +- "" ++ "笔记本电脑" + ], + "Last 24 hours": [ + null, +@@ -713,11 +713,11 @@ return plural; + ], + "Low Profile Desktop": [ + null, +- "" ++ "低调桌面" + ], + "Lunch Box": [ + null, +- "" ++ "主机类型" + ], + "Machine ID": [ + null, +@@ -729,7 +729,7 @@ return plural; + ], + "Main Server Chassis": [ + null, +- "" ++ "主服务器机箱" + ], + "Manually": [ + null, +@@ -753,11 +753,11 @@ return plural; + ], + "Mini PC": [ + null, +- "" ++ "迷你 PC" + ], + "Mini Tower": [ + null, +- "" ++ "迷你电脑" + ], + "Minute needs to be a number between 0-59": [ + null, +@@ -769,7 +769,7 @@ return plural; + ], + "Model": [ + null, +- "" ++ "型号" + ], + "Monday": [ + null, +@@ -825,11 +825,11 @@ return plural; + ], + "Notebook": [ + null, +- "" ++ "笔记本" + ], + "Notice and above": [ + null, +- "" ++ "Notice 及更高级别" + ], + "Off": [ + null, +@@ -849,7 +849,7 @@ return plural; + ], + "Only Emergency": [ + null, +- "" ++ "只有紧急情况" + ], + "Only alphabets, numbers, : , _ , . , @ , - are allowed.": [ + null, +@@ -861,11 +861,11 @@ return plural; + ], + "Other": [ + null, +- "" ++ "其他" + ], + "PCI": [ + null, +- "" ++ "PCI" + ], + "PackageKit crashed": [ + null, +@@ -873,7 +873,7 @@ return plural; + ], + "Part Of": [ + null, +- "" ++ "部分" + ], + "Paths": [ + null, +@@ -885,15 +885,15 @@ return plural; + ], + "Peripheral Chassis": [ + null, +- "" ++ "外设机箱" + ], + "Pizza Box": [ + null, +- "" ++ "披萨盒" + ], + "Portable": [ + null, +- "" ++ "可移植" + ], + "Power Options": [ + null, +@@ -913,23 +913,23 @@ return plural; + ], + "Problem details": [ + null, +- "" ++ "问题详情" + ], + "Problem info": [ + null, +- "" ++ "问题信息" + ], + "Propagates Reload To": [ + null, +- "" ++ "传播重新加载到" + ], + "RAID Chassis": [ + null, +- "" ++ "RAID 机箱" + ], + "Rack Mount Chassis": [ + null, +- "" ++ "机架式机箱" + ], + "Real Host Name": [ + null, +@@ -957,15 +957,15 @@ return plural; + ], + "Reload Propagated From": [ + null, +- "" ++ "重新加载的传播来自" + ], + "Removals:": [ + null, +- "" ++ "移除" + ], + "Removing $0": [ + null, +- "" ++ "正在删除 $0" + ], + "Repeat Daily": [ + null, +@@ -989,11 +989,11 @@ return plural; + ], + "Report": [ + null, +- "" ++ "报告" + ], + "Reported": [ + null, +- "" ++ "已报告" + ], + "Reporter 'reporter-ureport' not found.": [ + null, +@@ -1005,19 +1005,19 @@ return plural; + ], + "Required By": [ + null, +- "" ++ "要求自" + ], + "Requires": [ + null, +- "" ++ "要求" + ], + "Requisite": [ + null, +- "" ++ "必要" + ], + "Requisite Of": [ + null, +- "" ++ "必备的" + ], + "Reset": [ + null, +@@ -1041,7 +1041,7 @@ return plural; + ], + "Sealed-case PC": [ + null, +- "" ++ "密封式 PC" + ], + "Seconds": [ + null, +@@ -1053,7 +1053,7 @@ return plural; + ], + "Security Updates Available": [ + null, +- "" ++ "可利用的安全更新" + ], + "Service Logs": [ + null, +@@ -1093,7 +1093,7 @@ return plural; + ], + "Slot": [ + null, +- "" ++ "槽" + ], + "Sockets": [ + null, +@@ -1101,7 +1101,7 @@ return plural; + ], + "Space-saving Computer": [ + null, +- "" ++ "节省空间的计算机" + ], + "Specific Time": [ + null, +@@ -1121,7 +1121,7 @@ return plural; + ], + "Stick PC": [ + null, +- "" ++ "PC 棒" + ], + "Stop": [ + null, +@@ -1133,11 +1133,11 @@ return plural; + ], + "Sub Chassis": [ + null, +- "" ++ "子机箱" + ], + "Sub Notebook": [ + null, +- "" ++ "子笔记本" + ], + "Sunday": [ + null, +@@ -1161,11 +1161,11 @@ return plural; + ], + "System Information": [ + null, +- "" ++ "系统信息" + ], + "System Not Registered": [ + null, +- "" ++ "系统没有注册" + ], + "System Services": [ + null, +@@ -1177,11 +1177,11 @@ return plural; + ], + "System Up To Date": [ + null, +- "" ++ "系统最新" + ], + "Tablet": [ + null, +- "" ++ "平板" + ], + "Targets": [ + null, +@@ -1197,11 +1197,11 @@ return plural; + ], + "The user $0 is not permitted to change the system time": [ + null, +- "" ++ "用户 $0 不允许改变系统时间" + ], + "The user $0 is not permitted to enable or disable services": [ + null, +- "" ++ "用户 $0 不允许启用或者禁用服务" + ], + "The user $0 is not permitted to modify hostnames": [ + null, +@@ -1245,15 +1245,15 @@ return plural; + ], + "Total size: $0": [ + null, +- "" ++ "总大小: $0" + ], + "Tower": [ + null, +- "" ++ "塔" + ], + "Triggered By": [ + null, +- "" ++ "被触发" + ], + "Triggers": [ + null, +@@ -1281,11 +1281,11 @@ return plural; + ], + "Updates Available": [ + null, +- "" ++ "可利用更新" + ], + "Usage of $0 CPU core": [ + "Usage of $0 CPU cores", +- "" ++ "$0 CPU核心的使用量" + ], + "Used": [ + null, +@@ -1297,7 +1297,7 @@ return plural; + ], + "Vendor": [ + null, +- "" ++ "厂商" + ], + "Version": [ + null, +@@ -1305,19 +1305,19 @@ return plural; + ], + "Waiting for other software management operations to finish": [ + null, +- "" ++ "等待其他软件管理操作完成" + ], + "Wanted By": [ + null, +- "" ++ "需要于" + ], + "Wants": [ + null, +- "" ++ "需要" + ], + "Warning and above": [ + null, +- "" ++ "Warning 及更高级别" + ], + "Wednesday": [ + null, +-- +2.27.0 + diff --git a/cockpit.spec b/cockpit.spec index c4742ab1721083174a200ef623cb94784a9c890e..5f052fb58fbd76155c4207fd2ca6f2072a797ddb 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,7 +1,7 @@ %bcond_with pcp Name: cockpit Version: 178 -Release: 11 +Release: 12 Summary: A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ @@ -10,7 +10,9 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v Patch6000: CVE-2019-3804.patch Patch6001: backport-0001-CVE-2021-3660.patch Patch6002: backport-0002-CVE-2021-3660.patch -Patch6003: backport-CVE-2020-35850.patch + +Patch6003: 0001-add-more-zh_CN-translation-for-i18n.patch +Patch6004: backport-CVE-2020-35850.patch BuildRequires: pkgconfig(gio-unix-2.0) pkgconfig(json-glib-1.0) pkgconfig(polkit-agent-1) >= 0.105 pam-devel BuildRequires: autoconf automake python3 intltool libssh-devel >= 0.7.1 openssl-devel zlib-devel krb5-devel @@ -207,18 +209,24 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz} %changelog -* Sun Apr 28 2024 lingsheng - 178-11 +* Sun Apr 28 2024 lingsheng - 178-12 - Type:CVE - ID:CVE-2020-35850 - SUG:restart - DESC:fix CVE-2020-35850 -* Thu Jan 12 2023 zhangpan - 178-10 +* Thu Jan 12 2023 zhangpan - 178-11 - Type:NA - Id:NA - SUG:NA - DESC:Splits subpackages cockpit-machines cockpit-machines-ovirt +* Fri Jul 15 2022 hanjinpeng - 178-10 +- Type:NA +- Id:NA +- SUG:NA +- DESC: add more zh_CN translation for i18n + * Fri Sep 24 2021 wangkerong - 178-9 - Type:CVE - Id:CVE-2021-3660