!23 [sync] PR-21: fix CVE-2023-2091

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0001-CVE-2023-2091.patch

@@ -0,0 +1,35 @@
+From bf35ca1d06f748d9255fa939ee69b411aaf0131e Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Wed, 24 Apr 2024 10:52:48 +0800
+Subject: [PATCH] CVE-2023-2091
+
+---
+ kyasDbus/systemdaemon/kacpufm.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/kyasDbus/systemdaemon/kacpufm.py b/kyasDbus/systemdaemon/kacpufm.py
+index f6b5883..8e39321 100644
+--- a/kyasDbus/systemdaemon/kacpufm.py
++++ b/kyasDbus/systemdaemon/kacpufm.py
+@@ -153,6 +153,18 @@ class KACpuFM(dbus.service.Object):
+         origin = {Cpufm_Average_Corefreq:""}
+ 
+         if(not os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq")):
++            # 存在机型没有开启动态调频，默认为cpu频率方案移植
++            if(os.path.exists("/proc/cpuinfo")):
++                args = ["cat /proc/cpuinfo | grep -i 'cpu MHz'"]
++                pipe = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE , shell=True)
++                output = pipe.stdout.readlines()
++
++                cpuFreq = ""
++                if len(output) != 0:
++                    cpuFreq = bytes.decode(output[0],"utf-8","ignore")
++                    if "cpu mhz" in cpuFreq.lower():
++                       cpuFreq = cpuFreq.split(":")[-1].strip()
++                       origin[Cpufm_Average_Corefreq] = self.num_convert(str(int(float(cpuFreq)*1000)));
+             return origin
+ 
+         v = 0 
+-- 
+2.43.0
+

0001-fix-compile-error-of-youker-assistant.patch

@@ -0,0 +1,43 @@
+From e32410f8b949a63684c5b0868e5d95f831fce684 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 5 Dec 2022 16:31:59 +0800
+Subject: [PATCH] fix compile error of youker-assistant
+
+---
+ kylin-assistant.pro | 6 ++++++
+ src/src.pro         | 6 +++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/kylin-assistant.pro b/kylin-assistant.pro
+index fc58122..f54d63e 100644
+--- a/kylin-assistant.pro
++++ b/kylin-assistant.pro
+@@ -15,3 +15,9 @@ TRANSLATIONS += \
+ CONFIG += qt
+ 
+ QT += widgets
++
++man.files += man/*
++man.path = /usr/share/man/man1/
++
++INSTALLS += man
++			                                             
+diff --git a/src/src.pro b/src/src.pro
+index 03f783c..5cd4b2a 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -74,6 +74,10 @@ desktop.path = /usr/share/applications
+ target.source += $$TARGET
+ target.path = /usr/bin
+ 
++translation.files += translation/*.qm
++translation.path = /usr/share/youker-assistant/translations
++
+ INSTALLS +=  \
+             target  \
+-            desktop
++            desktop \
++            translation
+-- 
+2.33.0
+

0002-modify-version-of-youker-assistant-is-null.patch

@@ -17,7 +17,7 @@ index 911f56b..21061a4 100644
      QStringList options;
 -    options << "-l" << "|" << "grep" << "youker-assistant";
 -    proc.start("dpkg", options);
-+    options << "-qa" << "|" << "grep" << "youker-assistant";
++    options << "-q" << "youker-assistant";
 +    proc.start("rpm", options);
      proc.waitForFinished();
      QString dpkgInfo = proc.readAll();

0003-Repairing-data-transfer-failure-of-DBUS-service.patch

@@ -0,0 +1,22 @@
+From 0bf08c8c43194de1f4704e221a1450c46f5ec2b6 Mon Sep 17 00:00:00 2001
+From: huayadong <huayadong@kylinos.cn>
+Date: Fri, 26 Aug 2022 11:35:10 +0800
+Subject: [PATCH]  Repairing data transfer failure of DBUS service
+
+---
+ .../systemdaemon/conf/com.kylin.assistant.systemdaemon.service  | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service b/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service
+index 7d019d1..75349e0 100644
+--- a/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service
++++ b/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=com.kylin.assistant.systemdaemon
+-Exec=/usr/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/kasystemdbusmain.py
++Exec=/usr/bin/python3 /usr/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/kasystemdbusmain.py
+ User=root
+-- 
+2.36.1
+

youker-assistant.spec

@@ -1,6 +1,5 @@
-%define debug_package %{nil}
 Name:          youker-assistant
-Version:       3.0.3
+Version:       3.0.4
 Release:       4
 Summary:       youker-assistant
 License:       GPL-2+ and GPL-3
@@ -8,8 +7,10 @@ URL:           https://github.com/UbuntuKylin/youker-assistant
 Source0:       %{name}-%{version}.tar.gz
 Patch01:       0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch
 Patch02:       0002-modify-version-of-youker-assistant-is-null.patch
+Patch03:       0003-Repairing-data-transfer-failure-of-DBUS-service.patch
+Patch04:       0001-fix-compile-error-of-youker-assistant.patch
+Patch05:       0001-CVE-2023-2091.patch 
 
-BuildRequires: python3-devel python3-lxml python3-dbus python3-pyxdg
 BuildRequires: qt5-qtcharts qt5-qtcharts-devel
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-qtsvg-devel
@@ -24,11 +25,11 @@ BuildRequires: qt5-qtx11extras-devel
 BuildRequires: libXrandr-devel
 BuildRequires: systemd-devel
 BuildRequires: ukui-interface
-
+BuildRequires: SDL2-devel
+BuildRequires: libepoxy-devel
 Requires:      python3-dbus python3-psutil python3-lxml python-psutil python3-pillow python3-i2c-tools python3-pyxdg
 Requires:      util-linux hdparm lm_sensors lshw xorg-x11-utils dmidecode pciutils ukui-interface hwinfo smartmontools net-tools 
 
-
 %description
 Integrated tool to aid in routine system maintenance tasks
 Kylin Assistant is a tool designed to help Ubuntu and Ubuntu Kylin
@@ -41,6 +42,9 @@ user experience.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 export PATH=%{_qt5_bindir}:$PATH
@@ -55,20 +59,46 @@ pushd qmake-build
 %{make_install} INSTALL_ROOT=%{buildroot}
 popd 
 
+mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide
+
+cp -r %{_builddir}/%{name}-%{version}/data/toolkit %{buildroot}/usr/share/kylin-user-guide/data/guide
+
 %files
 %{_sysconfdir}/dbus-1/system.d/com.kylin.assistant.systemdaemon.conf
 %{_bindir}/kylin-assistant
 %{_prefix}/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/*
+%{_prefix}/lib/python3/dist-packages/kylin-assistant-daemon/sessiondaemon/*
 %{_libdir}/kylin-assistant/libdrivemanage.so
 %{_libdir}/kylin-assistant/libhwmonitor.so
 %{_libdir}/kylin-assistant/libhwparam.so
 %{_libdir}/kylin-assistant/libmachineinfo.so
+%{_datadir}/man/man1/*
 %{_datadir}/youker-assistant/translations/*.qm
 %{_datadir}/applications/kylin-assistant.desktop
 %{_datadir}/dbus-1/system-services/com.kylin.assistant.systemdaemon.service
+%{_datadir}/dbus-1/services/com.kylin.assistant.sessiondaemon.service
 %{_datadir}/polkit-1/actions/com.kylin.assistant.systemdaemon.policy
+%{_datadir}/kylin-user-guide/data/guide
 
 %changelog
+* Wed Apr 24 2024 peijiankang <peijiankang@kylinos.cn> - 3.0.4-4
+- add 0001-CVE-2023-2091.patch
+
+* Wed Mar 22 2023 peijiankang <peijiankang@kylinos.cn> - 3.0.4-3
+- fix version of youker-assistant is debugsource
+
+* Fri Dec 09 2022 wangyueliang <wangyueliang@kylinos.cn> - 3.0.4-2
+- Fix unsafe compile option STRIP
+
+* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-1
+- update version to 3.0.4
+
+* Fri Aug 26 2022 huayadong <huayadong@kylinos.cn> - 3.0.3-6
+- Repairing data transfer failure of DBUS service 
+
+* Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-5
+- add kylin-user-guide files
+
 * Mon May 30 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-4
 - modify version of youker-assistant is null