diff --git a/0001-deepin-log-viewer-uos-support-education.patch b/0001-deepin-log-viewer-uos-support-education.patch new file mode 100644 index 0000000000000000000000000000000000000000..13a7daa6f29717b8d5edfed614b494f43fa6ecd7 --- /dev/null +++ b/0001-deepin-log-viewer-uos-support-education.patch @@ -0,0 +1,12 @@ +diff -Naur a/application/loglistview.cpp b/application/loglistview.cpp +--- a/application/loglistview.cpp 2024-06-18 17:36:28.000000000 +0800 ++++ b/application/loglistview.cpp 2024-09-04 19:24:35.346065710 +0800 +@@ -150,7 +150,7 @@ + this->setViewportMargins(10, 10, 10, 0); + Dtk::Core::DSysInfo::UosEdition edition = Dtk::Core::DSysInfo::uosEditionType(); + //等于服务器行业版或欧拉版(centos) +- bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition; ++ bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition || Dtk::Core::DSysInfo::UosEducation == edition; + m_pModel = new QStandardItemModel(this); + QStandardItem *item = nullptr; + if (isFileExist("/var/log/journal") || isCentos) { diff --git a/0001-do-not-check-edition.patch b/0001-do-not-check-edition.patch new file mode 100644 index 0000000000000000000000000000000000000000..8b6333dbad29f03246142a02c11a3c98cbf7e87a --- /dev/null +++ b/0001-do-not-check-edition.patch @@ -0,0 +1,52 @@ +From 23feaa56a03bb17b166d7e2cc8cd47acf3ffd16f Mon Sep 17 00:00:00 2001 +From: Super User +Date: Thu, 27 Mar 2025 14:50:20 +0800 +Subject: [PATCH 1/1] do not check edition + +Signed-off-by: Super User +--- + application/logbackend.cpp | 6 ++++-- + application/loglistview.cpp | 3 ++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/application/logbackend.cpp b/application/logbackend.cpp +index a3554d6..653efcb 100644 +--- a/application/logbackend.cpp ++++ b/application/logbackend.cpp +@@ -549,7 +549,8 @@ QStringList LogBackend::getLogTypes() + { + Dtk::Core::DSysInfo::UosEdition edition = Dtk::Core::DSysInfo::uosEditionType(); + //等于服务器行业版或欧拉版(centos) +- bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition; ++ //bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition; ++ bool isCentos = true; + if (QFile::exists("/var/log/journal") || isCentos) { + m_logTypes.push_back(JOUR_TREE_DATA); + } +@@ -1763,7 +1764,8 @@ bool LogBackend::getOutDirPath(const QString &path) + LOG_FLAG LogBackend::type2Flag(const QString &type, QString& error) + { + Dtk::Core::DSysInfo::UosEdition edition = Dtk::Core::DSysInfo::uosEditionType(); +- bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition; ++ //bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition; ++ bool isCentos = true; + + LOG_FLAG flag = NONE; + if (type == TYPE_SYSTEM) +diff --git a/application/loglistview.cpp b/application/loglistview.cpp +index a0230fa..a2ab98b 100644 +--- a/application/loglistview.cpp ++++ b/application/loglistview.cpp +@@ -150,7 +150,8 @@ void LogListView::initUI() + this->setViewportMargins(10, 10, 10, 0); + Dtk::Core::DSysInfo::UosEdition edition = Dtk::Core::DSysInfo::uosEditionType(); + //等于服务器行业版或欧拉版(centos) +- bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition || Dtk::Core::DSysInfo::UosEducation == edition; ++ //bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition || Dtk::Core::DSysInfo::UosEducation == edition; ++ bool isCentos = true; + m_pModel = new QStandardItemModel(this); + QStandardItem *item = nullptr; + if (isFileExist("/var/log/journal") || isCentos) { +-- +2.43.0 + diff --git a/0001-feat-round-master-function.patch b/0001-feat-round-master-function.patch deleted file mode 100644 index cb87c9ecc7d4f87c4ea488073ee1b191ddce8a86..0000000000000000000000000000000000000000 --- a/0001-feat-round-master-function.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9e6687c11f63ae25a3f4520dc22d44cdf94f776a Mon Sep 17 00:00:00 2001 -From: leeffo -Date: Wed, 1 Mar 2023 13:33:26 +0800 -Subject: [PATCH] feat: round master function - ---- - application/loglistview.cpp | 2 +- - logViewerService/logviewerservice.cpp | 11 ++++++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/application/loglistview.cpp b/application/loglistview.cpp -index 7631e03..bbcb19b 100644 ---- a/application/loglistview.cpp -+++ b/application/loglistview.cpp -@@ -146,7 +146,7 @@ void LogListView::initUI() - const QVariant VListViewItemMargin = QVariant::fromValue(ListViweItemMargin); - Dtk::Core::DSysInfo::UosEdition edition = Dtk::Core::DSysInfo::uosEditionType(); - //等于服务器行业版或欧拉版(centos) -- bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition; -+ bool isCentos = Dtk::Core::DSysInfo::UosEuler == edition || Dtk::Core::DSysInfo::UosEnterpriseC == edition || Dtk::Core::DSysInfo::UosMilitaryS == edition; - m_pModel = new QStandardItemModel(this); - QStandardItem *item = nullptr; - QString systemName = DBusManager::getSystemInfo(); -diff --git a/logViewerService/logviewerservice.cpp b/logViewerService/logviewerservice.cpp -index 63cb9db..c1ecd75 100644 ---- a/logViewerService/logviewerservice.cpp -+++ b/logViewerService/logviewerservice.cpp -@@ -40,10 +40,19 @@ LogViewerService::~LogViewerService() - */ - QString LogViewerService::readLog(const QString &filePath) - { -+ if (!isValidInvoker()) { -+ return " "; -+ } -+ - //增加服务黑名单，只允许通过提权接口读取/var/log下，家目录下和临时目录下的文件 -- if ((!filePath.startsWith("/var/log/") && !filePath.startsWith("/tmp") && !filePath.startsWith("/home")) || filePath.contains("..") || !isValidInvoker()) { -+ if ((!filePath.startsWith("/var/log/") && -+ !filePath.startsWith("/tmp") && -+ !filePath.startsWith("/home") && -+ !filePath.startsWith("/root")) || -+ filePath.contains("..")) { - return " "; - } -+ - m_process.start("cat", QStringList() << filePath); - m_process.waitForFinished(-1); - QByteArray byte = m_process.readAllStandardOutput(); --- -2.20.1 - diff --git a/0001-fix-add-root-as-output-path-white-list.patch b/0001-fix-add-root-as-output-path-white-list.patch new file mode 100644 index 0000000000000000000000000000000000000000..982d464f4ec4938ec7931f3e23817dd134e29497 --- /dev/null +++ b/0001-fix-add-root-as-output-path-white-list.patch @@ -0,0 +1,27 @@ +From 5eb4029e167a7ea7051ce141b7042b5887ec7877 Mon Sep 17 00:00:00 2001 +From: Zhang Haidong +Date: Wed, 18 Mar 2026 15:21:35 +0800 +Subject: [PATCH] fix: add root as output path white list + +--- + logViewerService/logviewerservice.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/logViewerService/logviewerservice.cpp b/logViewerService/logviewerservice.cpp +index ec41452..499ef8c 100644 +--- a/logViewerService/logviewerservice.cpp ++++ b/logViewerService/logviewerservice.cpp +@@ -641,6 +641,10 @@ QStringList LogViewerService::getHomePaths() + homeList.push_back(info.absoluteFilePath()); + } + ++ if (getuid() == 0) { ++ homeList.push_back("/root"); ++ } ++ + return homeList; + } + +-- +2.43.0 + diff --git a/0004-deepin-log-viewer-uos-remove-deepin-apt-logfile-display.patch b/0004-deepin-log-viewer-uos-remove-deepin-apt-logfile-display.patch new file mode 100644 index 0000000000000000000000000000000000000000..3bb0caa23184670cf62f1b01813086aedb357466 --- /dev/null +++ b/0004-deepin-log-viewer-uos-remove-deepin-apt-logfile-display.patch @@ -0,0 +1,16 @@ +diff -Nuar deepin-log-viewer-6.1.18/application/logapplicationhelper.cpp deepin-log-viewer-6.1.18.new/application/logapplicationhelper.cpp +--- deepin-log-viewer-6.1.18/application/logapplicationhelper.cpp 2024-06-18 17:36:28.000000000 +0800 ++++ deepin-log-viewer-6.1.18.new/application/logapplicationhelper.cpp 2024-11-22 13:24:46.558249636 +0800 +@@ -79,9 +79,9 @@ + m_other_log_list.clear(); + + QList m_other_log_list_temp; +- m_other_log_list_temp.append(QStringList() << "alternatives.log" << "/var/log/alternatives.log"); +- m_other_log_list_temp.append(QStringList() << "history.log" << "/var/log/apt/history.log"); +- m_other_log_list_temp.append(QStringList() << "term.log" << "/var/log/apt/term.log"); ++ // m_other_log_list_temp.append(QStringList() << "alternatives.log" << "/var/log/alternatives.log"); ++ // m_other_log_list_temp.append(QStringList() << "history.log" << "/var/log/apt/history.log"); ++ // m_other_log_list_temp.append(QStringList() << "term.log" << "/var/log/apt/term.log"); + m_other_log_list_temp.append(QStringList() << "auth.log" << "/var/log/auth.log"); + + m_other_log_list_temp.append(QStringList() << "access_log" << "/var/log/cups/access_log"); diff --git a/0005-deepin-log-viewer-uos-remove-no-need-log.patch b/0005-deepin-log-viewer-uos-remove-no-need-log.patch new file mode 100644 index 0000000000000000000000000000000000000000..5a8c1536bcac195c3ccab394fcfa64fcdd4f887f --- /dev/null +++ b/0005-deepin-log-viewer-uos-remove-no-need-log.patch @@ -0,0 +1,32 @@ +diff -Nuar deepin-log-viewer-6.1.18.3/application/logapplicationhelper.cpp deepin-log-viewer-6.1.18.3.new/application/logapplicationhelper.cpp +--- deepin-log-viewer-6.1.18.3/application/logapplicationhelper.cpp 2025-02-24 13:13:07.933528780 +0800 ++++ deepin-log-viewer-6.1.18.3.new/application/logapplicationhelper.cpp 2025-02-24 11:20:23.216122001 +0800 +@@ -96,9 +96,7 @@ + m_other_log_list_temp.append(QStringList() << "deepin-diskmanager-service" << "/var/log/deepin/deepin-diskmanager-service/Log"); + m_other_log_list_temp.append(QStringList() << "deepin-home-appstore-daemon" << "/var/log/deepin/deepin-home-appstore-daemon"); + m_other_log_list_temp.append(QStringList() << "deepin-log-viewer-service" << "/var/log/deepin/deepin-log-viewer-service/Log"); +- m_other_log_list_temp.append(QStringList() << "deepin-sync-helper_ERROR.log" << "/var/log/deepin-deepinid-daemon/deepin-sync-helper_ERROR.log"); + +- m_other_log_list_temp.append(QStringList() << "deepin-sync-helper.log" << "/var/log/deepin-deepinid-daemon/deepin-sync-helper.log"); + m_other_log_list_temp.append(QStringList() << "deepin-defender-system-daemon.log" << "/var/log/deepin-defender-system-daemon.log"); + m_other_log_list_temp.append(QStringList() << "deepin-face.log" << "/var/log/deepin-face.log"); + m_other_log_list_temp.append(QStringList() << "deepin-installer-first-boot.log" << "/var/log/deepin-installer-first-boot.log"); +@@ -116,8 +114,6 @@ + + m_other_log_list_temp.append(QStringList() << "x-1.log" << "/var/log/lightdm/x-1.log"); + m_other_log_list_temp.append(QStringList() << "messages" << "/var/log/messages"); +- m_other_log_list_temp.append(QStringList() << "udcpg.log" << "/var/log/udcpg/udcpg.log"); +- m_other_log_list_temp.append(QStringList() << "uos-applicense-agent.log" << "/var/log/uos/uos-applicense-agent/uos-applicense-agent.log"); + + m_other_log_list_temp.append(QStringList() << "uos-deviceh-cmd.log" << "/var/log/uos/uos-license-agent/uos-deviceh-cmd.log"); + m_other_log_list_temp.append(QStringList() << "uos-license-agent" << "/var/log/uos/uos-license-agent"); +@@ -128,9 +124,7 @@ + m_other_log_list_temp.append(QStringList() << "wtmp" << "/var/log/wtmp"); + m_other_log_list_temp.append(QStringList() << "dcp_log" << "/var/log/cups/dcp_log"); + m_other_log_list_temp.append(QStringList() << "deepin-graphics-driver-manager-server.log" << "/var/log/deepin-graphics-driver-manager-server.log"); +- m_other_log_list_temp.append(QStringList() << "uos-activator-kms.log" << "/var/log/uos/uos-activator-kms/uos-activator-kms.log"); + +- m_other_log_list_temp.append(QStringList() << "deepin-recovery-gui.log" << "/recovery/deepin-recovery-gui.log"); + m_other_log_list_temp.append(QStringList() << "oem-custom-tool" << "/var/local/oem-custom-tool"); + m_other_log_list_temp.append(QStringList() << "iso-customizer-agent.log" << "/root/.cache/isocustomizer-agent/iso-customizer-agent/iso-customizer-agent.log"); + m_other_log_list_temp.append(QStringList() << "downloader" << "~/.config/uos/downloader/Log"); diff --git a/0006-deepin-log-viewer-uos-remove-other-logs.patch b/0006-deepin-log-viewer-uos-remove-other-logs.patch new file mode 100644 index 0000000000000000000000000000000000000000..d07d06e13eb31bc57fe03b6ebd9eabef4c7f0561 --- /dev/null +++ b/0006-deepin-log-viewer-uos-remove-other-logs.patch @@ -0,0 +1,43 @@ +diff -Nuar deepin-log-viewer-6.1.18.3/application/logapplicationhelper.cpp deepin-log-viewer-6.1.18.3.new/application/logapplicationhelper.cpp +--- deepin-log-viewer-6.1.18.3/application/logapplicationhelper.cpp 2025-03-20 18:29:05.786977848 +0800 ++++ deepin-log-viewer-6.1.18.3.new/application/logapplicationhelper.cpp 2025-03-20 18:28:43.186728511 +0800 +@@ -94,16 +94,11 @@ + m_other_log_list_temp.append(QStringList() << "deepin-boot-maker-service.log" << "/var/log/deepin/deepin-boot-maker-service.log"); + + m_other_log_list_temp.append(QStringList() << "deepin-diskmanager-service" << "/var/log/deepin/deepin-diskmanager-service/Log"); +- m_other_log_list_temp.append(QStringList() << "deepin-home-appstore-daemon" << "/var/log/deepin/deepin-home-appstore-daemon"); + m_other_log_list_temp.append(QStringList() << "deepin-log-viewer-service" << "/var/log/deepin/deepin-log-viewer-service/Log"); + +- m_other_log_list_temp.append(QStringList() << "deepin-defender-system-daemon.log" << "/var/log/deepin-defender-system-daemon.log"); + m_other_log_list_temp.append(QStringList() << "deepin-face.log" << "/var/log/deepin-face.log"); +- m_other_log_list_temp.append(QStringList() << "deepin-installer-first-boot.log" << "/var/log/deepin-installer-first-boot.log"); + +- m_other_log_list_temp.append(QStringList() << "deepin-installer-init.log" << "/var/log/deepin-installer-init.log"); +- m_other_log_list_temp.append(QStringList() << "deepin-installer.log" << "/var/log/deepin-installer.log"); +- m_other_log_list_temp.append(QStringList() << "deepin-monitornetflow.log" << "/var/log/deepin-monitornetflow.log"); ++ + m_other_log_list_temp.append(QStringList() << "faillog" << "/var/log/faillog"); + m_other_log_list_temp.append(QStringList() << "fontconfig.log" << "/var/log/fontconfig.log"); + +@@ -119,19 +114,15 @@ + m_other_log_list_temp.append(QStringList() << "uos-license-agent" << "/var/log/uos/uos-license-agent"); + m_other_log_list_temp.append(QStringList() << "uos-license-upgrade" << "/var/log/uos/uos-license-upgrade"); + m_other_log_list_temp.append(QStringList() << "user.log" << "/var/log/user.log"); +- m_other_log_list_temp.append(QStringList() << "vnetlib" << "/var/log/vnetlib"); + + m_other_log_list_temp.append(QStringList() << "wtmp" << "/var/log/wtmp"); + m_other_log_list_temp.append(QStringList() << "dcp_log" << "/var/log/cups/dcp_log"); +- m_other_log_list_temp.append(QStringList() << "deepin-graphics-driver-manager-server.log" << "/var/log/deepin-graphics-driver-manager-server.log"); + +- m_other_log_list_temp.append(QStringList() << "oem-custom-tool" << "/var/local/oem-custom-tool"); +- m_other_log_list_temp.append(QStringList() << "iso-customizer-agent.log" << "/root/.cache/isocustomizer-agent/iso-customizer-agent/iso-customizer-agent.log"); +- m_other_log_list_temp.append(QStringList() << "downloader" << "~/.config/uos/downloader/Log"); ++ + + m_other_log_list_temp.append(QStringList() << ".kwin.log" << "~/.kwin.log"); + m_other_log_list_temp.append(QStringList() << "audit.log" << "/var/log/audit/audit.log"); +- m_other_log_list_temp.append(QStringList() << "udcp-client" << "/var/log/udcp-client"); ++ + + //窗管日志和配置文件监视 + m_other_log_list_temp.append(QStringList() << ".kwin_x11.log" << "~/.kwin_x11.log"); diff --git a/deepin-log-viewer.spec b/deepin-log-viewer.spec index d037325183b517b180557a80323636deab3ef5ed..553914d0d2ed28a8d07cb22309e53613463cc082 100644 --- a/deepin-log-viewer.spec +++ b/deepin-log-viewer.spec @@ -1,13 +1,19 @@ -%define anolis_release 2 -%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} +#disable sw_64 as can not build Name: deepin-log-viewer -Version: 5.9.13 -Release: 2.%{anolis_release}%{?dist} +Version: 6.1.19.23 +Release: 3%{?dist} Summary: Log Viewer is a useful tool for viewing system logs -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-feat-round-master-function.patch +Source0: deepin-log-viewer_6.1.19.23.orig.tar.xz +Patch0001: 0001-deepin-log-viewer-uos-support-education.patch +Patch0002: fix-parse-sig-field.patch +Patch0003: 0004-deepin-log-viewer-uos-remove-deepin-apt-logfile-display.patch +Patch0004: 0005-deepin-log-viewer-uos-remove-no-need-log.patch +Patch0005: 0006-deepin-log-viewer-uos-remove-other-logs.patch +Patch0006: 0001-do-not-check-edition.patch +Patch0007: 0001-fix-add-root-as-output-path-white-list.patch + BuildRequires: qt5-devel BuildRequires: gcc-c++ @@ -26,11 +32,7 @@ BuildRequires: kf5-kcodecs-devel BuildRequires: libzip-devel BuildRequires: xerces-c-devel BuildRequires: boost-devel -%if 0%{?openeuler} BuildRequires: minizip-devel -%else -BuildRequires: minizip1.2-devel -%endif BuildRequires: rapidjson-devel BuildRequires: libtool-ltdl-devel BuildRequires: fftw-libs @@ -39,10 +41,28 @@ BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtsvg-devel BuildRequires: zlib-devel BuildRequires: polkit-qt5-1-devel +BuildRequires: gsettings-qt-devel +BuildRequires: gio-qt gio-qt-devel + +Requires: dde-common >= 2026 %description Log Viewer is a useful tool for viewing system logs. +%package plugin +Summary: Log Viewer Plugin library. +Requires: %name = %{version}-%{release} + +%description plugin +Log Viewer Plugin library. + +%package plugin-devel +Summary: Log Viewer Plugin library development headers. +Requires: %{name}-plugin + +%description plugin-devel +Log Viewer Plugin library development headers. + %prep %autosetup -p1 @@ -64,6 +84,7 @@ popd %{_bindir}/%{name} %{_bindir}/logViewerAuth %{_bindir}/logViewerTruncate +%{_bindir}/deepin-logger %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/translations/*.qm %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg @@ -73,14 +94,68 @@ popd %{_datadir}/dbus-1/system-services/com.deepin.logviewer.service %{_datadir}/dbus-1/system.d/com.deepin.logviewer.conf %{_datadir}/%{name}/DocxTemplate/*.dfw +%{_datadir}/%{name}/auditRule.conf +%{_datadir}/dsg/configs/org.deepin.log.viewer/org.deepin.log.viewer.json +%{_datadir}/glib-2.0/schemas/*.gschema.xml +%{_datadir}/deepin-debug-config/deepin-debug-config.d/org.deepin.log.viewer.json +%{_datadir}/%{name}/deepin-log.conf.d/deepin-log-viewer.json +%{_unitdir}/deepin-log-viewer-daemon.service +%{_userunitdir}/coredump-reporter.service +%{_userunitdir}/coredump-reporter.timer + +%files plugin +%{_libdir}/liblogviewerplugin.so.* +%{_libdir}/liblogviewerplugin.so + +%files plugin-devel +%{_includedir}/liblogviewerplugin/*.h +%{_includedir}/liblogviewerplugin/plugininterfaces/*.h +%{_includedir}/liblogviewerplugin/plugins/*.h +%{_libdir}/pkgconfig/liblogviewerplugin.pc %changelog -* Tue Nov 07 2023 yangxianzhao - 5.9.13-2.2 -- rebuild for qt +* Wed Mar 18 2026 zhanghaidong - 6.1.19.23-3 +- spec: add root as output path white list + +* Fri Dec 19 2025 liweigang - 6.1.19.23-2 +- spec: update license + +* Wed Nov 20 2025 mahailiang - 6.1.19.23-1 +- update: update to 6.1.19.23 + +* Thu Mar 27 2025 lvgenggeng - 6.1.18.3-1.06 +- fix: do not check edition(bugid:303291) + +* Thu Mar 20 2025 lichao - 6.1.18.3-1.05 +- feat: remove other no need log + +* Mon Feb 24 2025 lichao - 6.1.18.3-1.04 +- feat: remove no need log to display + +* Tue Dec 24 2024 mahailiang - 6.1.18.3-1.03 +- spec: add sw_64 + +* Fri Nov 22 2024 lichao - 6.1.18.3-1.02 +- feat: remove deepin log display + +* Sat Nov 09 2024 lvgenggeng - 6.1.18.3-1.01 +- fix: fix parse sig field error(bugid:283085) + +* Mon Oct 21 2024 liweigang - 6.1.18.3-1 +- update: update to version 6.1.18.3 + +* Thu Sep 05 2024 suoyunming - 6.1.18-1.01 +- fix: support education(bugid:271769) + +* Tue Jun 25 2024 liweigang - 6.1.18-1 +- update: update to version 6.1.18(bugid:260777) + +* Mon Oct 09 2023 liweigang - 6.1.1-1 +- update: update to version 6.1.1 -* Tue Sep 26 2023 yangxianzhao - 5.9.13-2.1 -- fix build error on a23 +* Mon Aug 14 2023 liuzhilin - 6.1.0-1 +- update: update to 6.1.0 and add BR gsettings-qt-devel * Wed Mar 01 2023 liweiganga - 5.9.13-2 - feat: round master function diff --git a/deepin-log-viewer-5.9.13.tar.gz b/deepin-log-viewer_6.1.19.23.orig.tar.xz similarity index 61% rename from deepin-log-viewer-5.9.13.tar.gz rename to deepin-log-viewer_6.1.19.23.orig.tar.xz index f61224887a05dd1b388f7a88b8d4b80df749663c..2a12a1fbfaa28fd5cbda644f21657da2484d4aa3 100644 Binary files a/deepin-log-viewer-5.9.13.tar.gz and b/deepin-log-viewer_6.1.19.23.orig.tar.xz differ diff --git a/fix-parse-sig-field.patch b/fix-parse-sig-field.patch new file mode 100644 index 0000000000000000000000000000000000000000..b4c405ccf5727f2226a59b75cb2c6733de422c89 --- /dev/null +++ b/fix-parse-sig-field.patch @@ -0,0 +1,19 @@ +diff -up ./application/logauththread.cpp.old ./application/logauththread.cpp +--- ./application/logauththread.cpp.old 2024-11-09 14:20:10.962175709 +0800 ++++ ./application/logauththread.cpp 2024-11-09 14:23:35.512226089 +0800 +@@ -1207,12 +1207,15 @@ void LogAuthThread::handleCoredump() + } + + // 获取信号名称 ++ coredumpMsg.sig = tmpList[7]; ++#if 0 + int sigId = tmpList[7].toInt(); + if ( sigId <= sigList.size()) { + coredumpMsg.sig = sigList[sigId - 1]; + } else { + coredumpMsg.sig = tmpList[7]; + } ++#endif + //获取用户名 + coredumpMsg.uid = tmpList[5]; + coredumpMsg.userName = Utils::getUserNamebyUID(tmpList[5].toUInt());