diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /app-admin/abrt | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'app-admin/abrt')
-rw-r--r-- | app-admin/abrt/Manifest | 6 | ||||
-rw-r--r-- | app-admin/abrt/abrt-2.15.1.ebuild (renamed from app-admin/abrt/abrt-2.14.6-r1.ebuild) | 15 | ||||
-rw-r--r-- | app-admin/abrt/files/abrt-2.14.6-glib270.patch | 32 | ||||
-rw-r--r-- | app-admin/abrt/files/abrt-2.14.6-lazy-imports.patch | 57 |
4 files changed, 6 insertions, 104 deletions
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest index ce0b48b8954e..be2606b48b2d 100644 --- a/app-admin/abrt/Manifest +++ b/app-admin/abrt/Manifest @@ -1,9 +1,7 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81 -AUX abrt-2.14.6-glib270.patch 1498 BLAKE2B c6d15a5d32bc1aa939d2b024d452fffada34b2cb1eb6e828f882242858eef64be8810f775726f837c7cc095943997fc310a2643957c47c274a88cabf73ed518f SHA512 91c42149f2689be2f2865c5f2972afd62ae7111673a0ebf8451a3a122cd290cddf3720c62f8ee5c28af9dd1b7805552f533bafd0aec936a3142699ef8d4c1fe5 -AUX abrt-2.14.6-lazy-imports.patch 1727 BLAKE2B dfb918555e02ba320aa9c785fe5c9a12826870d4bd0fd4dfb6cc9ceded057dccb81e501d208858f3bb7c0fd63248b910df12e54cd760b720a74f39e7f71a7daf SHA512 c8141624883227548ac34600d9e6604d103a7b0f91ee9c2190744b7c88209eba73d81f06135d1422c53f9cf12a5edf26e5f659d56c70b1d77aa9c75e273bfab4 -DIST abrt-2.14.6.tar.gz 6057661 BLAKE2B 2ef74203181c89818f283a801c4a1a0f22a01c92ca2415d245dc180ee721b3e29cb75c95e45d738f88b6bbf339fe8bef4e499ab6fecad33399dc8a5af8f98d4c SHA512 eb1ba2f624d51eeccd203bb23060493347f5a9142fad7d0570d46134071d870a9c66b4fbfb8210e7d6f87c0c039f31eb486d18a36b10fba318e2180aa09df9fe DIST abrt-2.15.0.tar.gz 6122114 BLAKE2B ac075a15d4621596bbe3009bf2e4725040139d78077f85bd4daebbe86504f9aa0a12dcedcf3b5b65404bc2851e93e6b1113dcc37923832c826d572ab9810ef94 SHA512 2d6c1287c1f01990aeb30f956f465c7a6399a6e53dc667602e263c136f94bc4090b58876acba678b29671c0db89ae8e7dd6994cf8d0d2d9fbc375f54ae6cd935 -EBUILD abrt-2.14.6-r1.ebuild 3405 BLAKE2B ec5bf02b52d1d2bf0ce773ca1ffc83145848296110551cac2678b10c8c45bfe20f1f30d91184a728afc4cbf8056f1c1f2b74e7168372190e9d7fd14e03ab1005 SHA512 88e33f8d777cd05b50b0a6fce28cc4b0685e0985f45249cadd236f8c5507b9019ffd47592e013ba625096ea3d1a365958a51b174af821f919145f2160e614c55 +DIST abrt-2.15.1.tar.gz 6122174 BLAKE2B e3b767929cc2303dcf90a935e0c9ba30641638666925d4707fb0dbed135d8635cd0a58c712f2965969218c64856a5fa3bd20a79410c0e6a5f176a7e82059dda0 SHA512 745c513969b78ee7c76c310a8c2fc0bafd1e50375130fa773ad950bf123ee50cfa237da9b331f2c0af2851b35b162cbc908f2e00d59283867ed8ffd72236d0ea EBUILD abrt-2.15.0.ebuild 3217 BLAKE2B f8ef650d66cd1f3103ed2063553dba6022568e03ec2c7d0056d98dbc025005fb1df0d8f595aef0355e0c12ffc0c39a71bb4fa5e137c126b993b1cb45777f27e5 SHA512 4f1551dbb6afbe2e6b5c56c5ae32206b7a77d815d3c91b73c6405be957e4c4fb4db4820354ca3fbe53c5c35d1d59237a30234b1582749319f83c5c512cfe9ad7 +EBUILD abrt-2.15.1.ebuild 3217 BLAKE2B f8ef650d66cd1f3103ed2063553dba6022568e03ec2c7d0056d98dbc025005fb1df0d8f595aef0355e0c12ffc0c39a71bb4fa5e137c126b993b1cb45777f27e5 SHA512 4f1551dbb6afbe2e6b5c56c5ae32206b7a77d815d3c91b73c6405be957e4c4fb4db4820354ca3fbe53c5c35d1d59237a30234b1582749319f83c5c512cfe9ad7 MISC metadata.xml 318 BLAKE2B 09afc80150b955861543909cf2b31829ee72a6cf2ccb265fadf855d36f0d7666b9a4fc53c68ca47c3e72002ea70ec338186bee5808f65e2a8586ce5965711c46 SHA512 033123dd526fad2b3f7affc739255d15e806de3e7fe9fa1da56197288b5da997bbdc8025b0354a655ab6d4e5b77e2e72865955dffe5b7ebb8c037182d6ce4deb diff --git a/app-admin/abrt/abrt-2.14.6-r1.ebuild b/app-admin/abrt/abrt-2.15.1.ebuild index c5c616459b44..6a77875e2603 100644 --- a/app-admin/abrt/abrt-2.14.6-r1.ebuild +++ b/app-admin/abrt/abrt-2.15.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools python-single-r1 tmpfiles xdg @@ -31,6 +31,7 @@ DEPEND="${PYTHON_DEPS} sys-libs/libcap sys-fs/inotify-tools x11-libs/gtk+:3 + x11-libs/libnotify " RDEPEND="${DEPEND} acct-user/abrt @@ -60,14 +61,6 @@ BDEPEND=" >=sys-devel/gettext-0.17 " -PATCHES=( - # https://github.com/abrt/abrt/commit/a6297858575780b9ed3d14cc42983348924d6048 - "${FILESDIR}/${P}-glib270.patch" - - # https://github.com/abrt/abrt/pull/1580 - "${FILESDIR}/${P}-lazy-imports.patch" -) - pkg_setup() { python-single-r1_pkg_setup } 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 <michal@redhat.com> -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 <michal@redhat.com> ---- - 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?= <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 - |