!35 Update to 2.16.1

From: @lyn1001 
Reviewed-by: @Lostwayzxc, @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-05-09 11:47:37 +00:00 committed by Gitee
commit c59602e625
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 11 additions and 84 deletions

View File

@ -1,57 +0,0 @@
From 4755f2171aa50a72d8ec03260c8cbc602263a6c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 24 Sep 2021 17:48:07 +0200
Subject: [PATCH] Use lazy imports in abrt_exception_handler3
The abrt_exception_handler3 module is always imported when Python starts,
but all the modules imported from it (except sys) are only used during crashes.
Especially the systemd.journal import is really expensive.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2007664
---
src/hooks/abrt_exception_handler3.py.in | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/hooks/abrt_exception_handler3.py.in b/src/hooks/abrt_exception_handler3.py.in
index 89e2474b..0bc548e0 100644
--- a/src/hooks/abrt_exception_handler3.py.in
+++ b/src/hooks/abrt_exception_handler3.py.in
@@ -20,13 +20,15 @@
Module for the ABRT exception handling hook
"""
+# Avoid importing anything but sys here, use lazy imports.
+# This file is imported on every Python startup,
+# all unused imports only increase the startup time and memory usage.
import sys
-import os
-from systemd import journal
def syslog(msg):
"""Log message to system logger (journal)"""
+ from systemd import journal
journal.send(msg)
@@ -68,6 +70,8 @@ def send(data):
def write_dump(tb_text, tb):
+ import os
+
if sys.argv[0][0] == "/":
executable = os.path.abspath(sys.argv[0])
else:
@@ -118,6 +122,7 @@ def handle_exception(etype, value, tb):
sys.excepthook = sys.__excepthook__ # pylint: disable-msg=E1101
import errno
+ import os
# Ignore Ctrl-C
# SystemExit rhbz#636913 -> this exception is not an error
--
2.31.1

Binary file not shown.

BIN
abrt-2.16.1.tar.gz Normal file

Binary file not shown.

View File

@ -1,22 +1,19 @@
Name: abrt Name: abrt
Version: 2.14.6 Version: 2.16.1
Release: 1 Release: 1
Summary: A tool for automatic bug detection and reporting Summary: A tool for automatic bug detection and reporting
License: GPL-2.0 and GPL-2.0+ License: GPL-2.0-or-later
URL: https://github.com/abrt/abrt/ URL: https://github.com/abrt/abrt/
Source: https://github.com/abrt/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0001: 0001-Use-lazy-imports-in-abrt_exception_handler3.patch
BuildRequires: git-core dbus-devel hostname gtk3-devel glib2-devel >= 2.43.4 rpm-devel >= 4.6 BuildRequires: git-core dbus-devel hostname gtk3-devel glib2-devel >= 2.43.4 rpm-devel >= 4.6
BuildRequires: desktop-file-utils libnotify-devel gettext libxml2-devel intltool libtool BuildRequires: desktop-file-utils libnotify-devel gettext libxml2-devel intltool libtool
BuildRequires: libsoup-devel asciidoc doxygen xmlto libreport-devel >= 2.13.0 python3-pytest BuildRequires: libsoup3-devel asciidoc doxygen xmlto libreport-devel >= 2.13.0 python3-pytest
BuildRequires: satyr-devel >= 0.24 augeas libselinux-devel python3-devel python3-systemd BuildRequires: satyr-devel >= 0.24 augeas libselinux-devel python3-devel python3-systemd
BuildRequires: python3-nose2 python3-sphinx python3-libreport python3-devel python3-argcomplete BuildRequires: python3-nose2 python3-sphinx python3-libreport python3-devel python3-argcomplete
BuildRequires: libreport-gtk-devel >= 2.13.0 gsettings-desktop-schemas-devel >= 3.15 BuildRequires: libreport-gtk-devel >= 2.13.0 gsettings-desktop-schemas-devel >= 3.15
BuildRequires: gdb-headless libcap-devel systemd-devel json-c-devel gdb-headless polkit-devel python3-dbus BuildRequires: gdb-headless libcap-devel systemd-devel json-c-devel gdb-headless polkit-devel python3-dbus
Requires: libreport >= 2.13.0 satyr >= 0.24 Requires: libreport >= 2.13.0 satyr >= 0.24
Requires: systemd python3-%{name} = %{version}-%{release} python3-augeas python3-dbus Requires: systemd python3-%{name} = %{version}-%{release} python3-augeas python3-dbus
Requires: dmidecode Requires: dmidecode
@ -74,8 +71,9 @@ This package contains development and header files for abrt-gui.
%package addon-ccpp %package addon-ccpp
Summary: C/C++ addon module for abrt Summary: C/C++ addon module for abrt
Requires: cpio gdb-headless elfutils %{name} = %{version}-%{release} python3-libreport Requires: cpio gdb-headless elfutils %{name} = %{version}-%{release} python3-libreport
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} elfutils-debuginfod-client
Obsoletes: abrt-addon-coredump-helper <= 2.12.2 Obsoletes: abrt-addon-coredump-helper <= 2.12.2
Obsoletes: abrt-retrace-client <= 2.15.1
%description addon-ccpp %description addon-ccpp
C/C++ analyzer plugin for abrt. C/C++ analyzer plugin for abrt.
@ -88,13 +86,6 @@ Requires: %{name}-libs = %{version}-%{release}
%description addon-upload-watch %description addon-upload-watch
This addon-upload-watch package provides hook for uploaded problems. This addon-upload-watch package provides hook for uploaded problems.
%package retrace-client
Summary: retrace client module for abrt
Requires: %{name} = %{version}-%{release} xz tar p11-kit-trust libsoup
%description retrace-client
Retrace server's client application that helps to analyze C/C++ crashes remotely.
%package addon-kerneloops %package addon-kerneloops
Summary: Kerneloops addon for abrt Summary: Kerneloops addon for abrt
Requires: curl %{name} = %{version}-%{release} Requires: curl %{name} = %{version}-%{release}
@ -142,6 +133,7 @@ uncaught exception in python3 programs.
%package -n python3-abrt-container-addon %package -n python3-abrt-container-addon
Summary: Container addon for catching Python3 exceptions for abrt Summary: Container addon for catching Python3 exceptions for abrt
BuildArch: noarch
Conflicts: python3-abrt-addon Conflicts: python3-abrt-addon
Requires: container-exception-logger Requires: container-exception-logger
@ -159,6 +151,7 @@ automatic generation of machine_id.
%package tui %package tui
Summary: Command line interface of abrt Summary: Command line interface of abrt
BuildArch: noarch
Requires: %{name} = %{version}-%{release} libreport-cli >= 2.10.0 Requires: %{name} = %{version}-%{release} libreport-cli >= 2.10.0
Requires: %{name}-libs = %{version}-%{release} abrt-dbus python3-abrt Requires: %{name}-libs = %{version}-%{release} abrt-dbus python3-abrt
Requires: abrt-addon-ccpp python3-argcomplete Requires: abrt-addon-ccpp python3-argcomplete
@ -473,19 +466,13 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_libexecdir}/abrt-gdb-exploitable %{_libexecdir}/abrt-gdb-exploitable
%{_journalcatalogdir}/abrt_ccpp.catalog %{_journalcatalogdir}/abrt_ccpp.catalog
%{_unitdir}/abrt-journal-core.service %{_unitdir}/abrt-journal-core.service
%attr(6755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache
%{_bindir}/abrt-action-analyze-c %{_bindir}/abrt-action-analyze-c
%{_bindir}/abrt-action-trim-files %{_bindir}/abrt-action-trim-files
%{_bindir}/abrt-action-analyze-core
%{_bindir}/abrt-action-analyze-vulnerability %{_bindir}/abrt-action-analyze-vulnerability
%{_bindir}/abrt-action-install-debuginfo
%{_bindir}/abrt-action-generate-backtrace %{_bindir}/abrt-action-generate-backtrace
%{_bindir}/abrt-action-generate-core-backtrace %{_bindir}/abrt-action-generate-core-backtrace
%{_bindir}/abrt-action-analyze-backtrace %{_bindir}/abrt-action-analyze-backtrace
%{_bindir}/abrt-action-list-dsos %{_bindir}/abrt-action-list-dsos
%{_bindir}/abrt-action-perform-ccpp-analysis
%{_bindir}/abrt-action-analyze-ccpp-local %{_bindir}/abrt-action-analyze-ccpp-local
%{_bindir}/abrt-dump-journal-core %{_bindir}/abrt-dump-journal-core
%config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
@ -495,7 +482,6 @@ killall abrt-dbus >/dev/null 2>&1 || :
%config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf
%{_datadir}/libreport/events/analyze_CCpp.xml %{_datadir}/libreport/events/analyze_CCpp.xml
%{_datadir}/libreport/events/analyze_LocalGDB.xml %{_datadir}/libreport/events/analyze_LocalGDB.xml
%{_datadir}/libreport/events/analyze_RetraceServer.xml
%{_datadir}/libreport/events/collect_*.xml %{_datadir}/libreport/events/collect_*.xml
%{_datadir}/libreport/events/post_report.xml %{_datadir}/libreport/events/post_report.xml
@ -503,10 +489,6 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_sbindir}/abrt-upload-watch %{_sbindir}/abrt-upload-watch
%{_unitdir}/abrt-upload-watch.service %{_unitdir}/abrt-upload-watch.service
%files retrace-client
%{_bindir}/abrt-retrace-client
%config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf
%files addon-kerneloops %files addon-kerneloops
%{_unitdir}/abrt-oops.service %{_unitdir}/abrt-oops.service
%{_journalcatalogdir}/abrt_koops.catalog %{_journalcatalogdir}/abrt_koops.catalog
@ -560,7 +542,6 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_libexecdir}/abrt-action-generate-machine-id %{_libexecdir}/abrt-action-generate-machine-id
%files tui %files tui
%config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion
%{_bindir}/abrt %{_bindir}/abrt
%{_bindir}/abrt-cli %{_bindir}/abrt-cli
%{python3_sitelib}/abrtcli/ %{python3_sitelib}/abrtcli/
@ -596,6 +577,9 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Tue May 9 2023 liyanan <thistleslyn@163.com> - 2.16.1-1
- update to 2.16.1
* Thu Apr 07 2022 yangping <yangping69@h-partners.com> - 2.14.6-1 * Thu Apr 07 2022 yangping <yangping69@h-partners.com> - 2.14.6-1
- update to v2.14.6 - update to v2.14.6