From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- app-admin/abrt/files/abrt-2.14.6-glib270.patch | 32 ------------ .../abrt/files/abrt-2.14.6-lazy-imports.patch | 57 ---------------------- 2 files changed, 89 deletions(-) delete mode 100644 app-admin/abrt/files/abrt-2.14.6-glib270.patch delete mode 100644 app-admin/abrt/files/abrt-2.14.6-lazy-imports.patch (limited to 'app-admin/abrt/files') diff --git a/app-admin/abrt/files/abrt-2.14.6-glib270.patch b/app-admin/abrt/files/abrt-2.14.6-glib270.patch deleted file mode 100644 index 673a31e0a212..000000000000 --- a/app-admin/abrt/files/abrt-2.14.6-glib270.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a6297858575780b9ed3d14cc42983348924d6048 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Tue, 5 Oct 2021 15:53:48 +0200 -Subject: [PATCH] abrt-dbus: do not try to free session data twice - -We free session data in on_g_signal() function, which is also -invoked when client disappears. Therefore, we don't need to register the -same free function in g_bus_watch_name_on_connection(). - -glib2 2.69.2 changed (fixed?) how/when g_bus_watch_name_on_connection() -calls the provided free function and it uncovered this problem in abrt-dbus. - -See rhbz#1997315 for more details. - -Signed-off-by: Michal Srb ---- - src/dbus/abrt_problems2_service.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/dbus/abrt_problems2_service.c b/src/dbus/abrt_problems2_service.c -index 8d543f443..004c7aeb2 100644 ---- a/src/dbus/abrt_problems2_service.c -+++ b/src/dbus/abrt_problems2_service.c -@@ -571,7 +571,7 @@ static AbrtP2Object *session_object_register(AbrtP2Service *service, - obj->owner_watcher_id = g_bus_watch_name_on_connection(connection, caller, - G_BUS_NAME_WATCHER_FLAGS_NONE, - NULL, abrt_p2_service_on_session_owner_vanished, -- obj, (GDestroyNotify)abrt_p2_object_destroy); -+ obj, NULL); - - return obj; - } diff --git a/app-admin/abrt/files/abrt-2.14.6-lazy-imports.patch b/app-admin/abrt/files/abrt-2.14.6-lazy-imports.patch deleted file mode 100644 index 5c892a8ecab8..000000000000 --- a/app-admin/abrt/files/abrt-2.14.6-lazy-imports.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4755f2171aa50a72d8ec03260c8cbc602263a6c0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -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 - -- cgit v1.2.3