From 92d12039171a61dfbb7f837f5c45d55103648c95 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Mon, 8 Oct 2018 15:19:17 +0200 Subject: [PATCH 001/125] New upstream release 2.11.0 Signed-off-by: Martin Kutlak --- .gitignore | 1 + ...-and-e-parameter-into-abrt-hook-ccpp.patch | 133 ------------------ ...-deprecated-g_type_class_add_private.patch | 62 -------- ...ix-missing-argument-error-during-del.patch | 42 ------ ...the-syntax-for-gdb-backtrace-command.patch | 41 ------ abrt.spec | 24 ++-- sources | 2 +- 7 files changed, 16 insertions(+), 289 deletions(-) delete mode 100644 0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch delete mode 100644 0001-gui-Replace-deprecated-g_type_class_add_private.patch delete mode 100644 0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch delete mode 100644 0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch diff --git a/.gitignore b/.gitignore index 5cb8def..e2076f2 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.8.tar.gz /abrt-2.10.9.tar.gz /abrt-2.10.10.tar.gz +/abrt-2.11.0.tar.gz diff --git a/0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch b/0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch deleted file mode 100644 index 6edf224..0000000 --- a/0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 94dc5d2783133cea27b1ae804d5b8a2da06808c5 Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -Date: Wed, 6 Jun 2018 14:04:09 +0200 -Subject: [PATCH] ccpp: add %h and %e parameter into abrt-hook-ccpp - -Without this commit core_pattern's parameter %h and %e was not -translated at all. - -If there is a white space in executable filename, %e replaced only by -the first part of executable name (till the space). Hence we decided -to get executable name from /proc/PID/exe symlink exist. - -Example: -If 'core_pattern = core.%h.%p.%t.%e' the result was -core.%h.26284.1469805542.sleep not -core.myshostmane.26284.1469805542.sleep with spaces - -Related to #1587891 - -Signed-off-by: Matej Habrnal ---- - src/hooks/abrt-hook-ccpp.c | 36 +++++++++++++++++++---------- - src/hooks/abrt-install-ccpp-hook.in | 2 +- - 2 files changed, 25 insertions(+), 13 deletions(-) - -diff --git a/src/hooks/abrt-hook-ccpp.c b/src/hooks/abrt-hook-ccpp.c -index 1c4e45e5..40117fc8 100644 ---- a/src/hooks/abrt-hook-ccpp.c -+++ b/src/hooks/abrt-hook-ccpp.c -@@ -65,13 +65,13 @@ static struct dump_dir *dd; - * %t - UNIX time of dump - * %P - global pid - * %I - crash thread tid -- * %e - executable filename (can contain white spaces) -+ * %h - hostname -+ * %e - executable filename (can contain white spaces, must be placed at the end) - * %% - output one "%" - */ - /* Hook must be installed with exactly the same sequence of %c specifiers. -- * Last one, %h, may be omitted (we can find it out). - */ --static const char percent_specifiers[] = "%scpugtePi"; -+static const char percent_specifiers[] = "%scpugtPIhe"; - static char *core_basename = (char*) "core"; - - static DIR *open_cwd(pid_t pid) -@@ -146,7 +146,8 @@ static int setfscreatecon_raw(security_context_t context) - } - #endif - --static int open_user_core(uid_t uid, uid_t fsuid, gid_t fsgid, pid_t pid, char **percent_values) -+static int open_user_core(uid_t uid, uid_t fsuid, gid_t fsgid, pid_t pid, -+ char **percent_values, const char *executable_filename) - { - proc_cwd = open_cwd(pid); - if (proc_cwd == NULL) -@@ -196,7 +197,13 @@ static int open_user_core(uid_t uid, uid_t fsuid, gid_t fsgid, pid_t pid, char * - { - const char *val = "%"; - if (specifier_num > 0) /* not %% */ -+ { - val = percent_values[specifier_num - 1]; -+ /* if %e (executable filename), use executable from -+ * /proc/PID/exe symlink if exists */ -+ if (percent_specifiers[specifier_num] == 'e' && executable_filename) -+ val = executable_filename; -+ } - //log_warning("c:'%c'", c); - //log_warning("val:'%s'", val); - -@@ -917,9 +924,9 @@ int main(int argc, char** argv) - - if (argc < 8) - { -- /* percent specifier: %s %c %p %u %g %t %P %T */ -- /* argv: [0] [1] [2] [3] [4] [5] [6] [7] [8] */ -- error_msg_and_die("Usage: %s SIGNO CORE_SIZE_LIMIT PID UID GID TIME GLOBAL_PID GLOBAL_TID", argv[0]); -+ /* percent specifier: %s %c %p %u %g %t %P %I %h %e */ -+ /* argv: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] */ -+ error_msg_and_die("Usage: %s SIGNO CORE_SIZE_LIMIT PID UID GID TIME GLOBAL_PID GLOBAL_TID HOSTNAME BINARY_NAME", argv[0]); - } - - /* Not needed on 2.6.30. -@@ -1016,13 +1023,21 @@ int main(int argc, char** argv) - - snprintf(path, sizeof(path), "%s/last-ccpp", g_settings_dump_location); - -+ char *executable = get_executable_at(pid_proc_fd); -+ const char *last_slash = NULL; -+ if (executable) -+ { -+ last_slash = strrchr(executable, '/'); -+ /* if the last_slash was found, skip it */ -+ if (last_slash) ++last_slash; -+ } -+ - /* Open a fd to compat coredump, if requested and is possible */ - int user_core_fd = -1; - if (setting_MakeCompatCore && ulimit_c != 0) - /* note: checks "user_pwd == NULL" inside; updates core_basename */ -- user_core_fd = open_user_core(uid, fsuid, fsgid, pid, &argv[1]); -+ user_core_fd = open_user_core(uid, fsuid, fsgid, pid, &argv[1], (const char *)last_slash); - -- char *executable = get_executable_at(pid_proc_fd); - if (executable == NULL) - { - /* readlink on /proc/$PID/exe failed, don't create abrt dump dir */ -@@ -1031,9 +1046,6 @@ int main(int argc, char** argv) - return create_user_core(user_core_fd, pid, ulimit_c); - } - -- const char *last_slash = strrchr(executable, '/'); -- /* if the last_slash was found, skip it */ -- if (last_slash) ++last_slash; - - /* ignoring crashes */ - if (executable && is_path_ignored(setting_ignored_paths, executable)) -diff --git a/src/hooks/abrt-install-ccpp-hook.in b/src/hooks/abrt-install-ccpp-hook.in -index 660c2091..f8c0c610 100755 ---- a/src/hooks/abrt-install-ccpp-hook.in -+++ b/src/hooks/abrt-install-ccpp-hook.in -@@ -11,7 +11,7 @@ SAVED_PATTERN_DIR="@VAR_RUN@/abrt" - SAVED_PATTERN_FILE="@VAR_RUN@/abrt/saved_core_pattern" - HOOK_BIN="@libexecdir@/abrt-hook-ccpp" - # Must match percent_specifiers[] order in abrt-hook-ccpp.c: --PATTERN="|$HOOK_BIN %s %c %p %u %g %t %P %I" -+PATTERN="|$HOOK_BIN %s %c %p %u %g %t %P %I %h %e" - - # core_pipe_limit specifies how many dump_helpers can run at the same time - # 0 - means unlimited, but it's not guaranteed that /proc/ of crashing --- -2.19.0 - diff --git a/0001-gui-Replace-deprecated-g_type_class_add_private.patch b/0001-gui-Replace-deprecated-g_type_class_add_private.patch deleted file mode 100644 index c2aa22c..0000000 --- a/0001-gui-Replace-deprecated-g_type_class_add_private.patch +++ /dev/null @@ -1,62 +0,0 @@ -From af51c51636eb0ca318e62d4c712f2ba3e60ed9b0 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Tue, 28 Aug 2018 10:26:47 +0200 -Subject: [PATCH] gui: Replace deprecated g_type_class_add_private - -g_type_class_add_private will be deprecated in Glib 2.58 [1]. - -There is a G_DEFINE_TYPE_WITH_PRIVATE macro that can replace -the deprecated function and it is backwards compatible [2]. - -[1] blog.gtk.org/2018/07/11/news-from-glib-2-58 -[2] bassi.io/articles/2013/06/21/the-king-is-dead - -Signed-off-by: Martin Kutlak ---- - src/configuration-gui/abrt-config-widget.c | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c -index 62910db6..aa3b5c01 100644 ---- a/src/configuration-gui/abrt-config-widget.c -+++ b/src/configuration-gui/abrt-config-widget.c -@@ -27,9 +27,6 @@ - #include "libabrt.h" - #include - --#define ABRT_CONFIG_WIDGET_GET_PRIVATE(o) \ -- (G_TYPE_INSTANCE_GET_PRIVATE((o), TYPE_ABRT_CONFIG_WIDGET, AbrtConfigWidgetPrivate)) -- - #define WID(s) GTK_WIDGET(gtk_builder_get_object(self->priv->builder, s)) - - #define UI_FILE_NAME "abrt-config-widget.glade" -@@ -107,7 +104,7 @@ struct AbrtConfigWidgetPrivate { - AbrtConfigWidgetOption options[_ABRT_OPT_END_]; - }; - --G_DEFINE_TYPE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX) -+G_DEFINE_TYPE_WITH_PRIVATE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX) - - enum { - SN_CHANGED, -@@ -214,8 +211,6 @@ abrt_config_widget_class_init(AbrtConfigWidgetClass *klass) - - object_class->finalize = abrt_config_widget_finalize; - -- g_type_class_add_private(klass, sizeof(AbrtConfigWidgetPrivate)); -- - s_signals[SN_CHANGED] = g_signal_new ("changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, -@@ -413,7 +408,7 @@ abrt_config_widget_init(AbrtConfigWidget *self) - { - GError *error = NULL; - -- self->priv = ABRT_CONFIG_WIDGET_GET_PRIVATE(self); -+ self->priv = abrt_config_widget_get_instance_private(self); - - self->priv->builder = gtk_builder_new(); - gtk_builder_set_translation_domain(self->priv->builder, GETTEXT_PACKAGE); --- -2.19.0 - diff --git a/0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch b/0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch deleted file mode 100644 index 80ceab8..0000000 --- a/0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 179843d3800f4dd66b143968792a81668a7b172a Mon Sep 17 00:00:00 2001 -From: Jake Daryll Obina -Date: Mon, 25 Jun 2018 11:52:11 +0800 -Subject: [PATCH] harvest_vmcore: Fix missing argument error during - delete_and_close() - -delete_and_close() requires a directory name argument and it is being called -without one. This argument is really not necessary though since the directory -name is already saved in the directory object (can be queried via the directory -object's name attribute), and it is the saved directory that is always deleted -regardless of the argument passed in. - -Signed-off-by: Jake Daryll Obina ---- - src/hooks/abrt_harvest_vmcore.py.in | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/hooks/abrt_harvest_vmcore.py.in b/src/hooks/abrt_harvest_vmcore.py.in -index 7d4bba52..66c3ad37 100644 ---- a/src/hooks/abrt_harvest_vmcore.py.in -+++ b/src/hooks/abrt_harvest_vmcore.py.in -@@ -128,13 +128,15 @@ def create_abrtd_info(dest, uuid): - return dd - - --def delete_and_close(dd, dd_dirname): -+def delete_and_close(dd): - """ - Deletes the given dump directory and closes it. - - dd - dump directory object -- dd_dirname - full path to dump directory - """ -+ # Save the directory name as the directory object could be destroyed during -+ # delete(). -+ dd_dirname = dd.name - if not dd.delete() == 0: - sys.stderr.write("Unable to delete '%s'\n" % (dd_dirname)) - return --- -2.19.0 - diff --git a/0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch b/0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch deleted file mode 100644 index 4b72a1a..0000000 --- a/0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 057f8b0395a37765b856737cb25186c52b300389 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Tue, 24 Jul 2018 10:17:05 +0200 -Subject: [PATCH] lib: Correct the syntax for gdb backtrace command - -abrt-action-generate-backtrace generates backtraces with error message: -A syntax error in expression, near `full'. - -According to the GDB documentation the correct syntax for backtrace -command is: -backtrace [n] -backtrace full [n] - -- sourceware.org/gdb/onlinedocs/gdb/Backtrace.html - -Signed-off-by: Martin Kutlak ---- - src/lib/hooklib.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c -index 135c7cde..b66fc119 100644 ---- a/src/lib/hooklib.c -+++ b/src/lib/hooklib.c -@@ -353,11 +353,11 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - /* Limit bt depth. With no limit, gdb sometimes OOMs the machine */ - unsigned bt_depth = 1024; - const char *thread_apply_all = "thread apply all -ascending"; -- const char *full = " full"; -+ const char *full = "full "; - char *bt = NULL; - while (1) - { -- args[bt_cmd_index] = xasprintf("%s backtrace %u%s", thread_apply_all, bt_depth, full); -+ args[bt_cmd_index] = xasprintf("%s backtrace %s%u", thread_apply_all, full, bt_depth); - bt = exec_vp(args, /*redirect_stderr:*/ 1, timeout_sec, NULL); - free(args[bt_cmd_index]); - if ((bt && strnlen(bt, 256*1024) < 256*1024) || bt_depth <= 32) --- -2.19.0 - diff --git a/abrt.spec b/abrt.spec index e68abcf..b56cf15 100644 --- a/abrt.spec +++ b/abrt.spec @@ -60,19 +60,11 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.10 -Release: 5%{?dist} +Version: 2.11.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# Backported fix for https://bugzilla.redhat.com/show_bug.cgi?id=1629408 -Patch0: 0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch -# Backport: fix use of deprecated function (breaks build, as -Werror is used) -Patch1: 0001-gui-Replace-deprecated-g_type_class_add_private.patch -# Backport: fix missing argument error in harvest_vmcore -Patch2: 0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch -# Backport: ccpp: add %h and %e parameter into abrt-hook-ccpp -Patch3: 0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel BuildRequires: glib2-devel >= 2.43 @@ -1267,6 +1259,18 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Oct 08 2018 Martin Kutlak 2.11.0-1 +- Translation updates +- plugins: Allow abrt-retrace-client to be optional at build time +- daemon: Fix double closed fd race condition +- sosreport: plugin "general" split into two new plugins +- plugins: Replace vfork with posix_spawn +- gui-config: Remove deprecated GTK functions +- abrtd.service: force abrt-dbus to load changes from conf +- spec: Build python*-abrt-addon packages as noarch +- spec: remove duplicated python3-devel +- spec: set PYTHON variable because of ./py-compile + * Sat Sep 15 2018 Adam Williamson - 2.10.10-5 - Backport fix for RHBZ #1629408 (failed gdb backtrace generation) - Backport fix for deprecated function use (broke build) diff --git a/sources b/sources index 6e603ef..455b996 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.10.tar.gz) = 1a9183346257bde09d69b2da032472d16661637124635e4959f47d1ec3272b550651f584e6e2c16893b25b906458c86379c3ee6cdbd1cba025bc9a71018048df +SHA512 (abrt-2.11.0.tar.gz) = 1c322fcc1cabda687bc428cfe8e717cc060409996c3c19172426b5718fe3cb18836924f4b0f99adf8adabba984d9d92df96e8f17c9e0d537bfb6cd4c7aac7c33 From 8dd747fdeddc6d535bfb1d33f34241a092bb1d5e Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Mon, 8 Oct 2018 15:30:32 +0200 Subject: [PATCH 002/125] Remove omitted patches Forgot to remove these in 92d12039171a61dfbb7f837f5c45d55103648c95 Signed-off-by: Martin Kutlak --- abrt.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/abrt.spec b/abrt.spec index b56cf15..ec33193 100644 --- a/abrt.spec +++ b/abrt.spec @@ -604,10 +604,6 @@ to the shell %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build autoconf From 582b311842f10861403ff56a29565c9bfbb2d96c Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Mon, 8 Oct 2018 15:19:17 +0200 Subject: [PATCH 003/125] New upstream release 2.11.0 Signed-off-by: Martin Kutlak --- .gitignore | 1 + ...-and-e-parameter-into-abrt-hook-ccpp.patch | 133 ------------------ ...-deprecated-g_type_class_add_private.patch | 62 -------- ...ix-missing-argument-error-during-del.patch | 42 ------ ...the-syntax-for-gdb-backtrace-command.patch | 41 ------ abrt.spec | 28 ++-- sources | 2 +- 7 files changed, 16 insertions(+), 293 deletions(-) delete mode 100644 0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch delete mode 100644 0001-gui-Replace-deprecated-g_type_class_add_private.patch delete mode 100644 0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch delete mode 100644 0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch diff --git a/.gitignore b/.gitignore index 5cb8def..e2076f2 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.8.tar.gz /abrt-2.10.9.tar.gz /abrt-2.10.10.tar.gz +/abrt-2.11.0.tar.gz diff --git a/0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch b/0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch deleted file mode 100644 index 6edf224..0000000 --- a/0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 94dc5d2783133cea27b1ae804d5b8a2da06808c5 Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -Date: Wed, 6 Jun 2018 14:04:09 +0200 -Subject: [PATCH] ccpp: add %h and %e parameter into abrt-hook-ccpp - -Without this commit core_pattern's parameter %h and %e was not -translated at all. - -If there is a white space in executable filename, %e replaced only by -the first part of executable name (till the space). Hence we decided -to get executable name from /proc/PID/exe symlink exist. - -Example: -If 'core_pattern = core.%h.%p.%t.%e' the result was -core.%h.26284.1469805542.sleep not -core.myshostmane.26284.1469805542.sleep with spaces - -Related to #1587891 - -Signed-off-by: Matej Habrnal ---- - src/hooks/abrt-hook-ccpp.c | 36 +++++++++++++++++++---------- - src/hooks/abrt-install-ccpp-hook.in | 2 +- - 2 files changed, 25 insertions(+), 13 deletions(-) - -diff --git a/src/hooks/abrt-hook-ccpp.c b/src/hooks/abrt-hook-ccpp.c -index 1c4e45e5..40117fc8 100644 ---- a/src/hooks/abrt-hook-ccpp.c -+++ b/src/hooks/abrt-hook-ccpp.c -@@ -65,13 +65,13 @@ static struct dump_dir *dd; - * %t - UNIX time of dump - * %P - global pid - * %I - crash thread tid -- * %e - executable filename (can contain white spaces) -+ * %h - hostname -+ * %e - executable filename (can contain white spaces, must be placed at the end) - * %% - output one "%" - */ - /* Hook must be installed with exactly the same sequence of %c specifiers. -- * Last one, %h, may be omitted (we can find it out). - */ --static const char percent_specifiers[] = "%scpugtePi"; -+static const char percent_specifiers[] = "%scpugtPIhe"; - static char *core_basename = (char*) "core"; - - static DIR *open_cwd(pid_t pid) -@@ -146,7 +146,8 @@ static int setfscreatecon_raw(security_context_t context) - } - #endif - --static int open_user_core(uid_t uid, uid_t fsuid, gid_t fsgid, pid_t pid, char **percent_values) -+static int open_user_core(uid_t uid, uid_t fsuid, gid_t fsgid, pid_t pid, -+ char **percent_values, const char *executable_filename) - { - proc_cwd = open_cwd(pid); - if (proc_cwd == NULL) -@@ -196,7 +197,13 @@ static int open_user_core(uid_t uid, uid_t fsuid, gid_t fsgid, pid_t pid, char * - { - const char *val = "%"; - if (specifier_num > 0) /* not %% */ -+ { - val = percent_values[specifier_num - 1]; -+ /* if %e (executable filename), use executable from -+ * /proc/PID/exe symlink if exists */ -+ if (percent_specifiers[specifier_num] == 'e' && executable_filename) -+ val = executable_filename; -+ } - //log_warning("c:'%c'", c); - //log_warning("val:'%s'", val); - -@@ -917,9 +924,9 @@ int main(int argc, char** argv) - - if (argc < 8) - { -- /* percent specifier: %s %c %p %u %g %t %P %T */ -- /* argv: [0] [1] [2] [3] [4] [5] [6] [7] [8] */ -- error_msg_and_die("Usage: %s SIGNO CORE_SIZE_LIMIT PID UID GID TIME GLOBAL_PID GLOBAL_TID", argv[0]); -+ /* percent specifier: %s %c %p %u %g %t %P %I %h %e */ -+ /* argv: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] */ -+ error_msg_and_die("Usage: %s SIGNO CORE_SIZE_LIMIT PID UID GID TIME GLOBAL_PID GLOBAL_TID HOSTNAME BINARY_NAME", argv[0]); - } - - /* Not needed on 2.6.30. -@@ -1016,13 +1023,21 @@ int main(int argc, char** argv) - - snprintf(path, sizeof(path), "%s/last-ccpp", g_settings_dump_location); - -+ char *executable = get_executable_at(pid_proc_fd); -+ const char *last_slash = NULL; -+ if (executable) -+ { -+ last_slash = strrchr(executable, '/'); -+ /* if the last_slash was found, skip it */ -+ if (last_slash) ++last_slash; -+ } -+ - /* Open a fd to compat coredump, if requested and is possible */ - int user_core_fd = -1; - if (setting_MakeCompatCore && ulimit_c != 0) - /* note: checks "user_pwd == NULL" inside; updates core_basename */ -- user_core_fd = open_user_core(uid, fsuid, fsgid, pid, &argv[1]); -+ user_core_fd = open_user_core(uid, fsuid, fsgid, pid, &argv[1], (const char *)last_slash); - -- char *executable = get_executable_at(pid_proc_fd); - if (executable == NULL) - { - /* readlink on /proc/$PID/exe failed, don't create abrt dump dir */ -@@ -1031,9 +1046,6 @@ int main(int argc, char** argv) - return create_user_core(user_core_fd, pid, ulimit_c); - } - -- const char *last_slash = strrchr(executable, '/'); -- /* if the last_slash was found, skip it */ -- if (last_slash) ++last_slash; - - /* ignoring crashes */ - if (executable && is_path_ignored(setting_ignored_paths, executable)) -diff --git a/src/hooks/abrt-install-ccpp-hook.in b/src/hooks/abrt-install-ccpp-hook.in -index 660c2091..f8c0c610 100755 ---- a/src/hooks/abrt-install-ccpp-hook.in -+++ b/src/hooks/abrt-install-ccpp-hook.in -@@ -11,7 +11,7 @@ SAVED_PATTERN_DIR="@VAR_RUN@/abrt" - SAVED_PATTERN_FILE="@VAR_RUN@/abrt/saved_core_pattern" - HOOK_BIN="@libexecdir@/abrt-hook-ccpp" - # Must match percent_specifiers[] order in abrt-hook-ccpp.c: --PATTERN="|$HOOK_BIN %s %c %p %u %g %t %P %I" -+PATTERN="|$HOOK_BIN %s %c %p %u %g %t %P %I %h %e" - - # core_pipe_limit specifies how many dump_helpers can run at the same time - # 0 - means unlimited, but it's not guaranteed that /proc/ of crashing --- -2.19.0 - diff --git a/0001-gui-Replace-deprecated-g_type_class_add_private.patch b/0001-gui-Replace-deprecated-g_type_class_add_private.patch deleted file mode 100644 index c2aa22c..0000000 --- a/0001-gui-Replace-deprecated-g_type_class_add_private.patch +++ /dev/null @@ -1,62 +0,0 @@ -From af51c51636eb0ca318e62d4c712f2ba3e60ed9b0 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Tue, 28 Aug 2018 10:26:47 +0200 -Subject: [PATCH] gui: Replace deprecated g_type_class_add_private - -g_type_class_add_private will be deprecated in Glib 2.58 [1]. - -There is a G_DEFINE_TYPE_WITH_PRIVATE macro that can replace -the deprecated function and it is backwards compatible [2]. - -[1] blog.gtk.org/2018/07/11/news-from-glib-2-58 -[2] bassi.io/articles/2013/06/21/the-king-is-dead - -Signed-off-by: Martin Kutlak ---- - src/configuration-gui/abrt-config-widget.c | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c -index 62910db6..aa3b5c01 100644 ---- a/src/configuration-gui/abrt-config-widget.c -+++ b/src/configuration-gui/abrt-config-widget.c -@@ -27,9 +27,6 @@ - #include "libabrt.h" - #include - --#define ABRT_CONFIG_WIDGET_GET_PRIVATE(o) \ -- (G_TYPE_INSTANCE_GET_PRIVATE((o), TYPE_ABRT_CONFIG_WIDGET, AbrtConfigWidgetPrivate)) -- - #define WID(s) GTK_WIDGET(gtk_builder_get_object(self->priv->builder, s)) - - #define UI_FILE_NAME "abrt-config-widget.glade" -@@ -107,7 +104,7 @@ struct AbrtConfigWidgetPrivate { - AbrtConfigWidgetOption options[_ABRT_OPT_END_]; - }; - --G_DEFINE_TYPE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX) -+G_DEFINE_TYPE_WITH_PRIVATE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX) - - enum { - SN_CHANGED, -@@ -214,8 +211,6 @@ abrt_config_widget_class_init(AbrtConfigWidgetClass *klass) - - object_class->finalize = abrt_config_widget_finalize; - -- g_type_class_add_private(klass, sizeof(AbrtConfigWidgetPrivate)); -- - s_signals[SN_CHANGED] = g_signal_new ("changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, -@@ -413,7 +408,7 @@ abrt_config_widget_init(AbrtConfigWidget *self) - { - GError *error = NULL; - -- self->priv = ABRT_CONFIG_WIDGET_GET_PRIVATE(self); -+ self->priv = abrt_config_widget_get_instance_private(self); - - self->priv->builder = gtk_builder_new(); - gtk_builder_set_translation_domain(self->priv->builder, GETTEXT_PACKAGE); --- -2.19.0 - diff --git a/0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch b/0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch deleted file mode 100644 index 80ceab8..0000000 --- a/0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 179843d3800f4dd66b143968792a81668a7b172a Mon Sep 17 00:00:00 2001 -From: Jake Daryll Obina -Date: Mon, 25 Jun 2018 11:52:11 +0800 -Subject: [PATCH] harvest_vmcore: Fix missing argument error during - delete_and_close() - -delete_and_close() requires a directory name argument and it is being called -without one. This argument is really not necessary though since the directory -name is already saved in the directory object (can be queried via the directory -object's name attribute), and it is the saved directory that is always deleted -regardless of the argument passed in. - -Signed-off-by: Jake Daryll Obina ---- - src/hooks/abrt_harvest_vmcore.py.in | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/hooks/abrt_harvest_vmcore.py.in b/src/hooks/abrt_harvest_vmcore.py.in -index 7d4bba52..66c3ad37 100644 ---- a/src/hooks/abrt_harvest_vmcore.py.in -+++ b/src/hooks/abrt_harvest_vmcore.py.in -@@ -128,13 +128,15 @@ def create_abrtd_info(dest, uuid): - return dd - - --def delete_and_close(dd, dd_dirname): -+def delete_and_close(dd): - """ - Deletes the given dump directory and closes it. - - dd - dump directory object -- dd_dirname - full path to dump directory - """ -+ # Save the directory name as the directory object could be destroyed during -+ # delete(). -+ dd_dirname = dd.name - if not dd.delete() == 0: - sys.stderr.write("Unable to delete '%s'\n" % (dd_dirname)) - return --- -2.19.0 - diff --git a/0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch b/0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch deleted file mode 100644 index 4b72a1a..0000000 --- a/0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 057f8b0395a37765b856737cb25186c52b300389 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Tue, 24 Jul 2018 10:17:05 +0200 -Subject: [PATCH] lib: Correct the syntax for gdb backtrace command - -abrt-action-generate-backtrace generates backtraces with error message: -A syntax error in expression, near `full'. - -According to the GDB documentation the correct syntax for backtrace -command is: -backtrace [n] -backtrace full [n] - -- sourceware.org/gdb/onlinedocs/gdb/Backtrace.html - -Signed-off-by: Martin Kutlak ---- - src/lib/hooklib.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c -index 135c7cde..b66fc119 100644 ---- a/src/lib/hooklib.c -+++ b/src/lib/hooklib.c -@@ -353,11 +353,11 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char - /* Limit bt depth. With no limit, gdb sometimes OOMs the machine */ - unsigned bt_depth = 1024; - const char *thread_apply_all = "thread apply all -ascending"; -- const char *full = " full"; -+ const char *full = "full "; - char *bt = NULL; - while (1) - { -- args[bt_cmd_index] = xasprintf("%s backtrace %u%s", thread_apply_all, bt_depth, full); -+ args[bt_cmd_index] = xasprintf("%s backtrace %s%u", thread_apply_all, full, bt_depth); - bt = exec_vp(args, /*redirect_stderr:*/ 1, timeout_sec, NULL); - free(args[bt_cmd_index]); - if ((bt && strnlen(bt, 256*1024) < 256*1024) || bt_depth <= 32) --- -2.19.0 - diff --git a/abrt.spec b/abrt.spec index e68abcf..ec33193 100644 --- a/abrt.spec +++ b/abrt.spec @@ -60,19 +60,11 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.10 -Release: 5%{?dist} +Version: 2.11.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# Backported fix for https://bugzilla.redhat.com/show_bug.cgi?id=1629408 -Patch0: 0001-lib-Correct-the-syntax-for-gdb-backtrace-command.patch -# Backport: fix use of deprecated function (breaks build, as -Werror is used) -Patch1: 0001-gui-Replace-deprecated-g_type_class_add_private.patch -# Backport: fix missing argument error in harvest_vmcore -Patch2: 0001-harvest_vmcore-Fix-missing-argument-error-during-del.patch -# Backport: ccpp: add %h and %e parameter into abrt-hook-ccpp -Patch3: 0001-ccpp-add-h-and-e-parameter-into-abrt-hook-ccpp.patch BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel BuildRequires: glib2-devel >= 2.43 @@ -612,10 +604,6 @@ to the shell %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build autoconf @@ -1267,6 +1255,18 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Oct 08 2018 Martin Kutlak 2.11.0-1 +- Translation updates +- plugins: Allow abrt-retrace-client to be optional at build time +- daemon: Fix double closed fd race condition +- sosreport: plugin "general" split into two new plugins +- plugins: Replace vfork with posix_spawn +- gui-config: Remove deprecated GTK functions +- abrtd.service: force abrt-dbus to load changes from conf +- spec: Build python*-abrt-addon packages as noarch +- spec: remove duplicated python3-devel +- spec: set PYTHON variable because of ./py-compile + * Sat Sep 15 2018 Adam Williamson - 2.10.10-5 - Backport fix for RHBZ #1629408 (failed gdb backtrace generation) - Backport fix for deprecated function use (broke build) diff --git a/sources b/sources index 6e603ef..455b996 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.10.tar.gz) = 1a9183346257bde09d69b2da032472d16661637124635e4959f47d1ec3272b550651f584e6e2c16893b25b906458c86379c3ee6cdbd1cba025bc9a71018048df +SHA512 (abrt-2.11.0.tar.gz) = 1c322fcc1cabda687bc428cfe8e717cc060409996c3c19172426b5718fe3cb18836924f4b0f99adf8adabba984d9d92df96e8f17c9e0d537bfb6cd4c7aac7c33 From 50039757c0fe0ab5d19207ac0035c78588c7aafc Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Tue, 8 Jan 2019 11:19:43 +0100 Subject: [PATCH 004/125] New upstream release Signed-off-by: Matej Marusak --- .gitignore | 1 + abrt.spec | 89 ++++++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index e2076f2..7bd2baf 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.9.tar.gz /abrt-2.10.10.tar.gz /abrt-2.11.0.tar.gz +/abrt-2.11.1.tar.gz diff --git a/abrt.spec b/abrt.spec index ec33193..2d39a36 100644 --- a/abrt.spec +++ b/abrt.spec @@ -25,12 +25,6 @@ # build abrt-atomic subpackage %bcond_without atomic -%ifarch aarch64 -%define have_kexec_tools 0 -%else -%define have_kexec_tools 1 -%endif - # rpmbuild --define 'desktopvendor mystring' %if "x%{desktopvendor}" == "x" %define desktopvendor %(source /etc/os-release; echo ${ID}) @@ -39,12 +33,10 @@ %if 0%{?suse_version} %define dbus_devel dbus-1-devel %define libjson_devel libjson-devel -%define nss_devel mozilla-nss-devel %define shadow_utils pwdutils %else %define dbus_devel dbus-devel %define libjson_devel json-c-devel -%define nss_devel nss-devel %define shadow_utils shadow-utils %endif @@ -55,17 +47,18 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.3 +%define libreport_ver 2.9.7 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: %{dbus_devel} +BuildRequires: hostname BuildRequires: gtk3-devel BuildRequires: glib2-devel >= 2.43 BuildRequires: rpm-devel >= 4.6 @@ -76,7 +69,7 @@ BuildRequires: gettext BuildRequires: libxml2-devel BuildRequires: intltool BuildRequires: libtool -BuildRequires: %{nss_devel} +BuildRequires: libsoup-devel BuildRequires: asciidoc BuildRequires: doxygen BuildRequires: xmlto @@ -187,6 +180,7 @@ Development libraries and headers for %{name}. %package gui-libs Summary: Libraries for %{name}-gui +Requires: %{name}-libs = %{version}-%{release} %description gui-libs Libraries for %{name}-gui. @@ -241,6 +235,7 @@ Requires: python2-libreport %endif # with python2 %endif # with python3 + %description addon-ccpp This package contains %{name}'s C/C++ analyzer plugin. @@ -258,6 +253,7 @@ Requires: %{name} = %{version}-%{release} Requires: xz Requires: tar Requires: p11-kit-trust +Requires: libsoup %description retrace-client This package contains the client application for Retrace server @@ -286,7 +282,6 @@ Requires: abrt-libs = %{version}-%{release} This package contains plugin for collecting Xorg crash information from Xorg log. -%if %{?have_kexec_tools} == 1 %package addon-vmcore Summary: %{name}'s vmcore addon Requires: %{name} = %{version}-%{release} @@ -306,7 +301,6 @@ Requires: util-linux %description addon-vmcore This package contains plugin for collecting kernel crash information from vmcore files. -%endif %package addon-pstoreoops Summary: %{name}'s pstore oops addon @@ -381,7 +375,7 @@ programs in container. %package plugin-sosreport Summary: %{name}'s plugin for building automatic sosreports -Requires: sos +Requires: sos >= 3.6 Requires: %{name} = %{version}-%{release} %description plugin-sosreport @@ -430,9 +424,7 @@ Requires: %{name} = %{version}-%{release} Requires: abrt-tui Requires: abrt-addon-kerneloops Requires: abrt-addon-pstoreoops -%if %{?have_kexec_tools} == 1 Requires: abrt-addon-vmcore -%endif Requires: abrt-addon-ccpp %if %{with python3} Requires: python3-abrt-addon @@ -470,9 +462,7 @@ Summary: Virtual package to make easy default installation on desktop environmen Requires: %{name} = %{version}-%{release} Requires: abrt-addon-kerneloops Requires: abrt-addon-pstoreoops -%if %{?have_kexec_tools} == 1 Requires: abrt-addon-vmcore -%endif Requires: abrt-addon-ccpp %if %{with python3} Requires: python3-abrt-addon @@ -509,6 +499,7 @@ environment. %package atomic Summary: Package to make easy default installation on Atomic hosts. Requires: %{name}-addon-coredump-helper = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Conflicts: %{name}-addon-ccpp %description atomic @@ -627,11 +618,8 @@ CFLAGS="%{optflags} -Werror" %configure \ --enable-suggest-autoreporting \ --enable-authenticated-autoreporting \ %endif -%ifnarch arm armhfp armv7hl armv7l aarch64 +%ifnarch %{arm} --enable-native-unwinder \ -%endif -%if %{?have_kexec_tools} == 0 - --disable-addon-vmcore \ %endif --with-defaultdumplocation=/var/%{var_base_dir}/abrt \ --enable-doxygen-docs \ @@ -642,7 +630,9 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT \ +%if %{with python3} PYTHON=%{__python3} \ +%endif # with python3 mandir=%{_mandir} \ dbusabrtdocdir=%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ @@ -665,9 +655,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/abrt desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - src/applet/abrt-applet.desktop + src/applet/org.freedesktop.problems.applet.desktop -ln -sf %{_datadir}/applications/abrt-applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir @@ -718,11 +708,9 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %journal_catalog_update %endif # with python3 -%if %{?have_kexec_tools} == 1 %post addon-vmcore %systemd_post abrt-vmcore.service %journal_catalog_update -%endif %post addon-pstoreoops %systemd_post abrt-pstoreoops.service @@ -743,10 +731,8 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %preun addon-xorg %systemd_preun abrt-xorg.service -%if %{?have_kexec_tools} == 1 %preun addon-vmcore %systemd_preun abrt-vmcore.service -%endif %preun addon-pstoreoops %systemd_preun abrt-pstoreoops.service @@ -767,10 +753,8 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %postun addon-xorg %systemd_postun_with_restart abrt-xorg.service -%if %{?have_kexec_tools} == 1 %postun addon-vmcore %systemd_postun_with_restart abrt-vmcore.service -%endif %postun addon-pstoreoops %systemd_postun_with_restart abrt-pstoreoops.service @@ -874,7 +858,6 @@ service abrt-oops condrestart >/dev/null 2>&1 || : %posttrans addon-xorg service abrt-xorg condrestart >/dev/null 2>&1 || : -%if %{?have_kexec_tools} == 1 %posttrans addon-vmcore service abrt-vmcore condrestart >/dev/null 2>&1 || : # Copy the configuration file to plugin's directory @@ -883,7 +866,6 @@ test -f /etc/abrt/abrt-harvest-vmcore.conf && { mv -b /etc/abrt/abrt-harvest-vmcore.conf /etc/abrt/plugins/vmcore.conf } exit 0 -%endif %posttrans addon-pstoreoops service abrt-pstoreoops condrestart >/dev/null 2>&1 || : @@ -990,8 +972,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-applet %{_bindir}/system-config-abrt #%%{_bindir}/test-report -%{_datadir}/applications/abrt-applet.desktop -%config(noreplace) %{_sysconfdir}/xdg/autostart/abrt-applet.desktop +%{_datadir}/applications/org.freedesktop.problems.applet.desktop +%config(noreplace) %{_sysconfdir}/xdg/autostart/org.freedesktop.problems.applet.desktop +%{_datadir}/dbus-1/services/org.freedesktop.problems.applet.service %{_mandir}/man1/abrt-applet.1* %{_mandir}/man1/system-config-abrt.1* @@ -1098,7 +1081,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-dump-xorg.1* %{_mandir}/man1/abrt-dump-journal-xorg.1* -%if %{?have_kexec_tools} == 1 %files addon-vmcore %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf %{_mandir}/man5/vmcore_event.conf.5* @@ -1116,7 +1098,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-action-check-oops-for-hw-error.1* %{_journalcatalogdir}/abrt_vmcore.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_vmcore_format.conf -%endif %files addon-pstoreoops %{_unitdir}/abrt-pstoreoops.service @@ -1219,10 +1200,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml +%if %{with python2} %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python.xml -%if %{?have_kexec_tools} == 1 +%endif # with python2 +%if %{with python3} +%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml +%endif # with python3 %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.vmcore.xml -%endif %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xorg.xml %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service %{_datadir}/dbus-1/system-services/com.redhat.problems.configuration.service @@ -1239,7 +1223,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man5/abrt-python.5* %files -n python2-abrt-doc -%{python2_sitelib}/problem_examples +%{python_sitelib}/problem_examples %endif # with python2 %if %{with python3} @@ -1255,6 +1239,33 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jan 08 2019 Matej Marusak 2.11.1-1 +- Translation updates +- a-a-install-debuginfo: Clean cache if we need space +- shellcheck: Use command instead of type +- shellcheck: Check exit code directly with if mycmd +- shellcheck: Suppress shellcheck warning SC1090 +- shellcheck: Use $(...) instead of legacy backticked +- cli: Add a shebang +- applet: Port to GApplication/GNotification +- spec: Add explicit package-version requirement of abrt-libs +- Introduce pylintrc +- augeas: Adjust testsuite to changes in libreport +- signal_is_fatal: generate problem reports for SIGSYS +- plugins: retrace-client: Port to libsoup +- plugins: retrace-client: Fix copy-paste error +- revert: spec: disable addon-vmcore on aarch64 +- spec: turn on --enable-native-unwinder aarch64 +- configure: Replace sphinx-build check with sphinx-build-3 +- a-a-c-o-f-hw-error: Check systemd-journal for MCE logs +- koops: Filter kernel oopses based on logged hostname +- add hostname BR for tests +- add new prepare-data to dist files +- fix tests names for dist target after making templates from them +- fix for MCE events: Bug 1613182 - abrt-cli ignores rsyslog host info and incorrectly assumes that the receiving host had a problem +- dbus: Add configuration for Python3 +- Add . to etc + * Mon Oct 08 2018 Martin Kutlak 2.11.0-1 - Translation updates - plugins: Allow abrt-retrace-client to be optional at build time diff --git a/sources b/sources index 455b996..e43da5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.11.0.tar.gz) = 1c322fcc1cabda687bc428cfe8e717cc060409996c3c19172426b5718fe3cb18836924f4b0f99adf8adabba984d9d92df96e8f17c9e0d537bfb6cd4c7aac7c33 +SHA512 (abrt-2.11.1.tar.gz) = d2388bb1123e50ef1c8875e2feeeb8ab6830035e13362fe4f30b39207454c866a0c80412deef05e109814f42efc0c2d51eed4ee3fdc468f4b8eb340acff96226 From 746f3887d614881678f841960c8f88c8c75c104d Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Tue, 8 Jan 2019 11:19:43 +0100 Subject: [PATCH 005/125] New upstream release Signed-off-by: Matej Marusak --- .gitignore | 1 + abrt.spec | 89 ++++++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index e2076f2..7bd2baf 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.9.tar.gz /abrt-2.10.10.tar.gz /abrt-2.11.0.tar.gz +/abrt-2.11.1.tar.gz diff --git a/abrt.spec b/abrt.spec index ec33193..2d39a36 100644 --- a/abrt.spec +++ b/abrt.spec @@ -25,12 +25,6 @@ # build abrt-atomic subpackage %bcond_without atomic -%ifarch aarch64 -%define have_kexec_tools 0 -%else -%define have_kexec_tools 1 -%endif - # rpmbuild --define 'desktopvendor mystring' %if "x%{desktopvendor}" == "x" %define desktopvendor %(source /etc/os-release; echo ${ID}) @@ -39,12 +33,10 @@ %if 0%{?suse_version} %define dbus_devel dbus-1-devel %define libjson_devel libjson-devel -%define nss_devel mozilla-nss-devel %define shadow_utils pwdutils %else %define dbus_devel dbus-devel %define libjson_devel json-c-devel -%define nss_devel nss-devel %define shadow_utils shadow-utils %endif @@ -55,17 +47,18 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.3 +%define libreport_ver 2.9.7 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: %{dbus_devel} +BuildRequires: hostname BuildRequires: gtk3-devel BuildRequires: glib2-devel >= 2.43 BuildRequires: rpm-devel >= 4.6 @@ -76,7 +69,7 @@ BuildRequires: gettext BuildRequires: libxml2-devel BuildRequires: intltool BuildRequires: libtool -BuildRequires: %{nss_devel} +BuildRequires: libsoup-devel BuildRequires: asciidoc BuildRequires: doxygen BuildRequires: xmlto @@ -187,6 +180,7 @@ Development libraries and headers for %{name}. %package gui-libs Summary: Libraries for %{name}-gui +Requires: %{name}-libs = %{version}-%{release} %description gui-libs Libraries for %{name}-gui. @@ -241,6 +235,7 @@ Requires: python2-libreport %endif # with python2 %endif # with python3 + %description addon-ccpp This package contains %{name}'s C/C++ analyzer plugin. @@ -258,6 +253,7 @@ Requires: %{name} = %{version}-%{release} Requires: xz Requires: tar Requires: p11-kit-trust +Requires: libsoup %description retrace-client This package contains the client application for Retrace server @@ -286,7 +282,6 @@ Requires: abrt-libs = %{version}-%{release} This package contains plugin for collecting Xorg crash information from Xorg log. -%if %{?have_kexec_tools} == 1 %package addon-vmcore Summary: %{name}'s vmcore addon Requires: %{name} = %{version}-%{release} @@ -306,7 +301,6 @@ Requires: util-linux %description addon-vmcore This package contains plugin for collecting kernel crash information from vmcore files. -%endif %package addon-pstoreoops Summary: %{name}'s pstore oops addon @@ -381,7 +375,7 @@ programs in container. %package plugin-sosreport Summary: %{name}'s plugin for building automatic sosreports -Requires: sos +Requires: sos >= 3.6 Requires: %{name} = %{version}-%{release} %description plugin-sosreport @@ -430,9 +424,7 @@ Requires: %{name} = %{version}-%{release} Requires: abrt-tui Requires: abrt-addon-kerneloops Requires: abrt-addon-pstoreoops -%if %{?have_kexec_tools} == 1 Requires: abrt-addon-vmcore -%endif Requires: abrt-addon-ccpp %if %{with python3} Requires: python3-abrt-addon @@ -470,9 +462,7 @@ Summary: Virtual package to make easy default installation on desktop environmen Requires: %{name} = %{version}-%{release} Requires: abrt-addon-kerneloops Requires: abrt-addon-pstoreoops -%if %{?have_kexec_tools} == 1 Requires: abrt-addon-vmcore -%endif Requires: abrt-addon-ccpp %if %{with python3} Requires: python3-abrt-addon @@ -509,6 +499,7 @@ environment. %package atomic Summary: Package to make easy default installation on Atomic hosts. Requires: %{name}-addon-coredump-helper = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Conflicts: %{name}-addon-ccpp %description atomic @@ -627,11 +618,8 @@ CFLAGS="%{optflags} -Werror" %configure \ --enable-suggest-autoreporting \ --enable-authenticated-autoreporting \ %endif -%ifnarch arm armhfp armv7hl armv7l aarch64 +%ifnarch %{arm} --enable-native-unwinder \ -%endif -%if %{?have_kexec_tools} == 0 - --disable-addon-vmcore \ %endif --with-defaultdumplocation=/var/%{var_base_dir}/abrt \ --enable-doxygen-docs \ @@ -642,7 +630,9 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT \ +%if %{with python3} PYTHON=%{__python3} \ +%endif # with python3 mandir=%{_mandir} \ dbusabrtdocdir=%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ @@ -665,9 +655,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/abrt desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - src/applet/abrt-applet.desktop + src/applet/org.freedesktop.problems.applet.desktop -ln -sf %{_datadir}/applications/abrt-applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir @@ -718,11 +708,9 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %journal_catalog_update %endif # with python3 -%if %{?have_kexec_tools} == 1 %post addon-vmcore %systemd_post abrt-vmcore.service %journal_catalog_update -%endif %post addon-pstoreoops %systemd_post abrt-pstoreoops.service @@ -743,10 +731,8 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %preun addon-xorg %systemd_preun abrt-xorg.service -%if %{?have_kexec_tools} == 1 %preun addon-vmcore %systemd_preun abrt-vmcore.service -%endif %preun addon-pstoreoops %systemd_preun abrt-pstoreoops.service @@ -767,10 +753,8 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %postun addon-xorg %systemd_postun_with_restart abrt-xorg.service -%if %{?have_kexec_tools} == 1 %postun addon-vmcore %systemd_postun_with_restart abrt-vmcore.service -%endif %postun addon-pstoreoops %systemd_postun_with_restart abrt-pstoreoops.service @@ -874,7 +858,6 @@ service abrt-oops condrestart >/dev/null 2>&1 || : %posttrans addon-xorg service abrt-xorg condrestart >/dev/null 2>&1 || : -%if %{?have_kexec_tools} == 1 %posttrans addon-vmcore service abrt-vmcore condrestart >/dev/null 2>&1 || : # Copy the configuration file to plugin's directory @@ -883,7 +866,6 @@ test -f /etc/abrt/abrt-harvest-vmcore.conf && { mv -b /etc/abrt/abrt-harvest-vmcore.conf /etc/abrt/plugins/vmcore.conf } exit 0 -%endif %posttrans addon-pstoreoops service abrt-pstoreoops condrestart >/dev/null 2>&1 || : @@ -990,8 +972,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-applet %{_bindir}/system-config-abrt #%%{_bindir}/test-report -%{_datadir}/applications/abrt-applet.desktop -%config(noreplace) %{_sysconfdir}/xdg/autostart/abrt-applet.desktop +%{_datadir}/applications/org.freedesktop.problems.applet.desktop +%config(noreplace) %{_sysconfdir}/xdg/autostart/org.freedesktop.problems.applet.desktop +%{_datadir}/dbus-1/services/org.freedesktop.problems.applet.service %{_mandir}/man1/abrt-applet.1* %{_mandir}/man1/system-config-abrt.1* @@ -1098,7 +1081,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-dump-xorg.1* %{_mandir}/man1/abrt-dump-journal-xorg.1* -%if %{?have_kexec_tools} == 1 %files addon-vmcore %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf %{_mandir}/man5/vmcore_event.conf.5* @@ -1116,7 +1098,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-action-check-oops-for-hw-error.1* %{_journalcatalogdir}/abrt_vmcore.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_vmcore_format.conf -%endif %files addon-pstoreoops %{_unitdir}/abrt-pstoreoops.service @@ -1219,10 +1200,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml +%if %{with python2} %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python.xml -%if %{?have_kexec_tools} == 1 +%endif # with python2 +%if %{with python3} +%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml +%endif # with python3 %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.vmcore.xml -%endif %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xorg.xml %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service %{_datadir}/dbus-1/system-services/com.redhat.problems.configuration.service @@ -1239,7 +1223,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man5/abrt-python.5* %files -n python2-abrt-doc -%{python2_sitelib}/problem_examples +%{python_sitelib}/problem_examples %endif # with python2 %if %{with python3} @@ -1255,6 +1239,33 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jan 08 2019 Matej Marusak 2.11.1-1 +- Translation updates +- a-a-install-debuginfo: Clean cache if we need space +- shellcheck: Use command instead of type +- shellcheck: Check exit code directly with if mycmd +- shellcheck: Suppress shellcheck warning SC1090 +- shellcheck: Use $(...) instead of legacy backticked +- cli: Add a shebang +- applet: Port to GApplication/GNotification +- spec: Add explicit package-version requirement of abrt-libs +- Introduce pylintrc +- augeas: Adjust testsuite to changes in libreport +- signal_is_fatal: generate problem reports for SIGSYS +- plugins: retrace-client: Port to libsoup +- plugins: retrace-client: Fix copy-paste error +- revert: spec: disable addon-vmcore on aarch64 +- spec: turn on --enable-native-unwinder aarch64 +- configure: Replace sphinx-build check with sphinx-build-3 +- a-a-c-o-f-hw-error: Check systemd-journal for MCE logs +- koops: Filter kernel oopses based on logged hostname +- add hostname BR for tests +- add new prepare-data to dist files +- fix tests names for dist target after making templates from them +- fix for MCE events: Bug 1613182 - abrt-cli ignores rsyslog host info and incorrectly assumes that the receiving host had a problem +- dbus: Add configuration for Python3 +- Add . to etc + * Mon Oct 08 2018 Martin Kutlak 2.11.0-1 - Translation updates - plugins: Allow abrt-retrace-client to be optional at build time diff --git a/sources b/sources index 455b996..e43da5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.11.0.tar.gz) = 1c322fcc1cabda687bc428cfe8e717cc060409996c3c19172426b5718fe3cb18836924f4b0f99adf8adabba984d9d92df96e8f17c9e0d537bfb6cd4c7aac7c33 +SHA512 (abrt-2.11.1.tar.gz) = d2388bb1123e50ef1c8875e2feeeb8ab6830035e13362fe4f30b39207454c866a0c80412deef05e109814f42efc0c2d51eed4ee3fdc468f4b8eb340acff96226 From 09dd0e27177f614d080282b3e4c0cd88199c208f Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Tue, 8 Jan 2019 14:41:38 +0100 Subject: [PATCH 006/125] Update to work with new glib Signed-off-by: Matej Marusak --- ...bus-task-Use-modern-GLib-type-macros.patch | 299 ++++++++++++++++++ abrt.spec | 8 +- 2 files changed, 306 insertions(+), 1 deletion(-) create mode 100644 0001-dbus-task-Use-modern-GLib-type-macros.patch diff --git a/0001-dbus-task-Use-modern-GLib-type-macros.patch b/0001-dbus-task-Use-modern-GLib-type-macros.patch new file mode 100644 index 0000000..f188eeb --- /dev/null +++ b/0001-dbus-task-Use-modern-GLib-type-macros.patch @@ -0,0 +1,299 @@ +From 21bdee77727417b6b16feed7b466953873319b58 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Tue, 8 Jan 2019 14:26:15 +0100 +Subject: [PATCH] dbus: task: Use modern GLib type macros + +Signed-off-by: Ernestas Kulik +--- + src/dbus/abrt_problems2_task.c | 111 ++++++++++++++++++++++++--------- + src/dbus/abrt_problems2_task.h | 26 +------- + 2 files changed, 82 insertions(+), 55 deletions(-) + +diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c +index f40381f6..cba6b469 100644 +--- a/src/dbus/abrt_problems2_task.c ++++ b/src/dbus/abrt_problems2_task.c +@@ -25,6 +25,15 @@ enum { + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + ++struct _AbrtP2TaskPrivate ++{ ++ gint32 p2t_status; ++ GVariant *p2t_details; ++ GVariant *p2t_results; ++ gint32 p2t_code; ++ GCancellable *p2t_cancellable; ++}; ++ + G_DEFINE_TYPE_WITH_PRIVATE(AbrtP2Task, abrt_p2_task, G_TYPE_OBJECT) + + static void abrt_p2_task_finalize(GObject *gobject) +@@ -74,17 +83,24 @@ static void abrt_p2_task_class_init(AbrtP2TaskClass *klass) + + static void abrt_p2_task_init(AbrtP2Task *self) + { +- self->pv = abrt_p2_task_get_instance_private(self); +- self->pv->p2t_details = g_variant_new("a{sv}", NULL); ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(self); ++ ++ pv->p2t_details = g_variant_new("a{sv}", NULL); + } + + static void abrt_p2_task_change_status(AbrtP2Task *task, + AbrtP2TaskStatus status) + { +- if (task->pv->p2t_status == status) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if (pv->p2t_status == status) + return; + +- task->pv->p2t_status = status; ++ pv->p2t_status = status; + + g_signal_emit(task, + s_signals[SN_STATUS_CHANGED], +@@ -94,53 +110,77 @@ static void abrt_p2_task_change_status(AbrtP2Task *task, + + AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task) + { +- return task->pv->p2t_status; ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ return pv->p2t_status; + } + + GVariant *abrt_p2_task_details(AbrtP2Task *task) + { +- return g_variant_ref(task->pv->p2t_details); ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ return g_variant_ref(pv->p2t_details); + } + + void abrt_p2_task_add_detail(AbrtP2Task *task, + const char *key, + GVariant *value) + { ++ AbrtP2TaskPrivate *pv; + GVariantDict dict; +- g_variant_dict_init(&dict, task->pv->p2t_details); ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ g_variant_dict_init(&dict, pv->p2t_details); + g_variant_dict_insert(&dict, key, "v", value); + +- if (task->pv->p2t_details) +- g_variant_unref(task->pv->p2t_details); ++ if (pv->p2t_details) ++ g_variant_unref(pv->p2t_details); + +- task->pv->p2t_details = g_variant_dict_end(&dict); ++ pv->p2t_details = g_variant_dict_end(&dict); + } + + void abrt_p2_task_set_response(AbrtP2Task *task, + GVariant *response) + { +- if (task->pv->p2t_results != NULL) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if (pv->p2t_results != NULL) + log_warning("Task already has response assigned"); + +- task->pv->p2t_results = response; ++ pv->p2t_results = response; + } + + bool abrt_p2_task_is_cancelled(AbrtP2Task *task) + { +- return (task->pv->p2t_cancellable +- && g_cancellable_is_cancelled(task->pv->p2t_cancellable)) +- || task->pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ return (pv->p2t_cancellable ++ && g_cancellable_is_cancelled(pv->p2t_cancellable)) ++ || pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; + } + + void abrt_p2_task_cancel(AbrtP2Task *task, + GError **error) + { ++ AbrtP2TaskPrivate *pv; ++ + if (abrt_p2_task_is_cancelled(task)) + return; + +- if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) +- g_cancellable_cancel(task->pv->p2t_cancellable); +- else if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if (pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) ++ g_cancellable_cancel(pv->p2t_cancellable); ++ else if (pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) + { + ABRT_P2_TASK_VIRTUAL_CANCEL(task, error); + +@@ -157,8 +197,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, + gint32 *code, + GError **error) + { +- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_DONE +- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_DONE ++ && pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) + { + g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, + "Cannot finalize undone task"); +@@ -170,12 +214,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, + if (*error != NULL) + return; + +- if (task->pv->p2t_results) +- *result = g_variant_ref(task->pv->p2t_results); ++ if (pv->p2t_results) ++ *result = g_variant_ref(pv->p2t_results); + else + *result = g_variant_new("a{sv}", NULL); + +- *code = task->pv->p2t_code; ++ *code = pv->p2t_code; + } + + static void abrt_p2_task_finish_gtask(GObject *source_object, +@@ -183,6 +227,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + gpointer user_data) + { + AbrtP2Task *task = ABRT_P2_TASK(source_object); ++ AbrtP2TaskPrivate *pv; + + if (!g_task_is_valid(result, task)) + { +@@ -190,6 +235,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + return; + } + ++ pv = abrt_p2_task_get_instance_private(task); ++ + GError *error = NULL; + const gint32 code = g_task_propagate_int(G_TASK(result), &error); + +@@ -203,7 +250,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + { + log_debug("Task done"); + +- task->pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; ++ pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; + abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_DONE); + } + else if (abrt_p2_task_is_cancelled(task)) +@@ -263,8 +310,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_FAILED); + } + +- g_object_unref(task->pv->p2t_cancellable); +- task->pv->p2t_cancellable = NULL; ++ g_object_unref(pv->p2t_cancellable); ++ pv->p2t_cancellable = NULL; + } + + static void abrt_p2_task_thread(GTask *task, +@@ -289,8 +336,12 @@ void abrt_p2_task_start(AbrtP2Task *task, + GVariant *options, + GError **error) + { +- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_NEW +- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_NEW ++ && pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) + { + g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, + "Cannot start task that is not new or stopped"); +@@ -302,9 +353,9 @@ void abrt_p2_task_start(AbrtP2Task *task, + if (*error != NULL) + return; + +- task->pv->p2t_cancellable = g_cancellable_new(); ++ pv->p2t_cancellable = g_cancellable_new(); + GTask *gtask = g_task_new(task, +- task->pv->p2t_cancellable, ++ pv->p2t_cancellable, + abrt_p2_task_finish_gtask, + NULL); + +diff --git a/src/dbus/abrt_problems2_task.h b/src/dbus/abrt_problems2_task.h +index 71f765d9..717af47b 100644 +--- a/src/dbus/abrt_problems2_task.h ++++ b/src/dbus/abrt_problems2_task.h +@@ -45,21 +45,12 @@ G_BEGIN_DECLS + GType abrt_p2_task_get_type (void); + + #define ABRT_TYPE_P2_TASK (abrt_p2_task_get_type ()) +-#define ABRT_P2_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ABRT_TYPE_P2_TASK, AbrtP2Task)) +-#define ABRT_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) +-#define ABRT_IS_P2_TASK(obj)(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ABRT_TYPE_P2_TASK)) +-#define ABRT_IS_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ABRT_TYPE_P2_TASK)) +-#define ABRT_P2_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) ++G_DECLARE_DERIVABLE_TYPE(AbrtP2Task, abrt_p2_task, ABRT, P2_TASK, GObject) + + typedef struct _AbrtP2Task AbrtP2Task; + typedef struct _AbrtP2TaskClass AbrtP2TaskClass; + typedef struct _AbrtP2TaskPrivate AbrtP2TaskPrivate; + +-static inline void glib_autoptr_cleanup_AbrtP2Task(AbrtP2Task **task) +-{ +- glib_autoptr_cleanup_GObject((GObject **)task); +-} +- + typedef enum { + ABRT_P2_TASK_STATUS_NEW, + ABRT_P2_TASK_STATUS_RUNNING, +@@ -96,21 +87,6 @@ struct _AbrtP2TaskClass + gpointer padding[12]; + }; + +-struct _AbrtP2TaskPrivate +-{ +- gint32 p2t_status; +- GVariant *p2t_details; +- GVariant *p2t_results; +- gint32 p2t_code; +- GCancellable *p2t_cancellable; +-}; +- +-struct _AbrtP2Task +-{ +- GObject parent_instance; +- AbrtP2TaskPrivate *pv; +-}; +- + AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task); + + /* Returns task details in form of key-value entries. +-- +2.20.1 + diff --git a/abrt.spec b/abrt.spec index 2d39a36..7fb2611 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,10 +53,13 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.11.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +# With new glib it is not possible to build in rawhide +# https://github.com/abrt/abrt/commit/21bdee7 +Patch0: 0001-dbus-task-Use-modern-GLib-type-macros.patch BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel @@ -1239,6 +1242,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jan 08 2019 Matej Marusak 2.11.1-2 +- dbus: task: Use modern GLib type macros + * Tue Jan 08 2019 Matej Marusak 2.11.1-1 - Translation updates - a-a-install-debuginfo: Clean cache if we need space From 895d076624616454a8e0061f72bf3dcb1a36d00d Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Tue, 8 Jan 2019 14:41:38 +0100 Subject: [PATCH 007/125] Update to work with new glib Signed-off-by: Matej Marusak --- ...bus-task-Use-modern-GLib-type-macros.patch | 299 ++++++++++++++++++ abrt.spec | 8 +- 2 files changed, 306 insertions(+), 1 deletion(-) create mode 100644 0001-dbus-task-Use-modern-GLib-type-macros.patch diff --git a/0001-dbus-task-Use-modern-GLib-type-macros.patch b/0001-dbus-task-Use-modern-GLib-type-macros.patch new file mode 100644 index 0000000..f188eeb --- /dev/null +++ b/0001-dbus-task-Use-modern-GLib-type-macros.patch @@ -0,0 +1,299 @@ +From 21bdee77727417b6b16feed7b466953873319b58 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Tue, 8 Jan 2019 14:26:15 +0100 +Subject: [PATCH] dbus: task: Use modern GLib type macros + +Signed-off-by: Ernestas Kulik +--- + src/dbus/abrt_problems2_task.c | 111 ++++++++++++++++++++++++--------- + src/dbus/abrt_problems2_task.h | 26 +------- + 2 files changed, 82 insertions(+), 55 deletions(-) + +diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c +index f40381f6..cba6b469 100644 +--- a/src/dbus/abrt_problems2_task.c ++++ b/src/dbus/abrt_problems2_task.c +@@ -25,6 +25,15 @@ enum { + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + ++struct _AbrtP2TaskPrivate ++{ ++ gint32 p2t_status; ++ GVariant *p2t_details; ++ GVariant *p2t_results; ++ gint32 p2t_code; ++ GCancellable *p2t_cancellable; ++}; ++ + G_DEFINE_TYPE_WITH_PRIVATE(AbrtP2Task, abrt_p2_task, G_TYPE_OBJECT) + + static void abrt_p2_task_finalize(GObject *gobject) +@@ -74,17 +83,24 @@ static void abrt_p2_task_class_init(AbrtP2TaskClass *klass) + + static void abrt_p2_task_init(AbrtP2Task *self) + { +- self->pv = abrt_p2_task_get_instance_private(self); +- self->pv->p2t_details = g_variant_new("a{sv}", NULL); ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(self); ++ ++ pv->p2t_details = g_variant_new("a{sv}", NULL); + } + + static void abrt_p2_task_change_status(AbrtP2Task *task, + AbrtP2TaskStatus status) + { +- if (task->pv->p2t_status == status) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if (pv->p2t_status == status) + return; + +- task->pv->p2t_status = status; ++ pv->p2t_status = status; + + g_signal_emit(task, + s_signals[SN_STATUS_CHANGED], +@@ -94,53 +110,77 @@ static void abrt_p2_task_change_status(AbrtP2Task *task, + + AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task) + { +- return task->pv->p2t_status; ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ return pv->p2t_status; + } + + GVariant *abrt_p2_task_details(AbrtP2Task *task) + { +- return g_variant_ref(task->pv->p2t_details); ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ return g_variant_ref(pv->p2t_details); + } + + void abrt_p2_task_add_detail(AbrtP2Task *task, + const char *key, + GVariant *value) + { ++ AbrtP2TaskPrivate *pv; + GVariantDict dict; +- g_variant_dict_init(&dict, task->pv->p2t_details); ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ g_variant_dict_init(&dict, pv->p2t_details); + g_variant_dict_insert(&dict, key, "v", value); + +- if (task->pv->p2t_details) +- g_variant_unref(task->pv->p2t_details); ++ if (pv->p2t_details) ++ g_variant_unref(pv->p2t_details); + +- task->pv->p2t_details = g_variant_dict_end(&dict); ++ pv->p2t_details = g_variant_dict_end(&dict); + } + + void abrt_p2_task_set_response(AbrtP2Task *task, + GVariant *response) + { +- if (task->pv->p2t_results != NULL) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if (pv->p2t_results != NULL) + log_warning("Task already has response assigned"); + +- task->pv->p2t_results = response; ++ pv->p2t_results = response; + } + + bool abrt_p2_task_is_cancelled(AbrtP2Task *task) + { +- return (task->pv->p2t_cancellable +- && g_cancellable_is_cancelled(task->pv->p2t_cancellable)) +- || task->pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ return (pv->p2t_cancellable ++ && g_cancellable_is_cancelled(pv->p2t_cancellable)) ++ || pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; + } + + void abrt_p2_task_cancel(AbrtP2Task *task, + GError **error) + { ++ AbrtP2TaskPrivate *pv; ++ + if (abrt_p2_task_is_cancelled(task)) + return; + +- if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) +- g_cancellable_cancel(task->pv->p2t_cancellable); +- else if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if (pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) ++ g_cancellable_cancel(pv->p2t_cancellable); ++ else if (pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) + { + ABRT_P2_TASK_VIRTUAL_CANCEL(task, error); + +@@ -157,8 +197,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, + gint32 *code, + GError **error) + { +- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_DONE +- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_DONE ++ && pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) + { + g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, + "Cannot finalize undone task"); +@@ -170,12 +214,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, + if (*error != NULL) + return; + +- if (task->pv->p2t_results) +- *result = g_variant_ref(task->pv->p2t_results); ++ if (pv->p2t_results) ++ *result = g_variant_ref(pv->p2t_results); + else + *result = g_variant_new("a{sv}", NULL); + +- *code = task->pv->p2t_code; ++ *code = pv->p2t_code; + } + + static void abrt_p2_task_finish_gtask(GObject *source_object, +@@ -183,6 +227,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + gpointer user_data) + { + AbrtP2Task *task = ABRT_P2_TASK(source_object); ++ AbrtP2TaskPrivate *pv; + + if (!g_task_is_valid(result, task)) + { +@@ -190,6 +235,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + return; + } + ++ pv = abrt_p2_task_get_instance_private(task); ++ + GError *error = NULL; + const gint32 code = g_task_propagate_int(G_TASK(result), &error); + +@@ -203,7 +250,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + { + log_debug("Task done"); + +- task->pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; ++ pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; + abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_DONE); + } + else if (abrt_p2_task_is_cancelled(task)) +@@ -263,8 +310,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, + abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_FAILED); + } + +- g_object_unref(task->pv->p2t_cancellable); +- task->pv->p2t_cancellable = NULL; ++ g_object_unref(pv->p2t_cancellable); ++ pv->p2t_cancellable = NULL; + } + + static void abrt_p2_task_thread(GTask *task, +@@ -289,8 +336,12 @@ void abrt_p2_task_start(AbrtP2Task *task, + GVariant *options, + GError **error) + { +- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_NEW +- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) ++ AbrtP2TaskPrivate *pv; ++ ++ pv = abrt_p2_task_get_instance_private(task); ++ ++ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_NEW ++ && pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) + { + g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, + "Cannot start task that is not new or stopped"); +@@ -302,9 +353,9 @@ void abrt_p2_task_start(AbrtP2Task *task, + if (*error != NULL) + return; + +- task->pv->p2t_cancellable = g_cancellable_new(); ++ pv->p2t_cancellable = g_cancellable_new(); + GTask *gtask = g_task_new(task, +- task->pv->p2t_cancellable, ++ pv->p2t_cancellable, + abrt_p2_task_finish_gtask, + NULL); + +diff --git a/src/dbus/abrt_problems2_task.h b/src/dbus/abrt_problems2_task.h +index 71f765d9..717af47b 100644 +--- a/src/dbus/abrt_problems2_task.h ++++ b/src/dbus/abrt_problems2_task.h +@@ -45,21 +45,12 @@ G_BEGIN_DECLS + GType abrt_p2_task_get_type (void); + + #define ABRT_TYPE_P2_TASK (abrt_p2_task_get_type ()) +-#define ABRT_P2_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ABRT_TYPE_P2_TASK, AbrtP2Task)) +-#define ABRT_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) +-#define ABRT_IS_P2_TASK(obj)(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ABRT_TYPE_P2_TASK)) +-#define ABRT_IS_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ABRT_TYPE_P2_TASK)) +-#define ABRT_P2_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) ++G_DECLARE_DERIVABLE_TYPE(AbrtP2Task, abrt_p2_task, ABRT, P2_TASK, GObject) + + typedef struct _AbrtP2Task AbrtP2Task; + typedef struct _AbrtP2TaskClass AbrtP2TaskClass; + typedef struct _AbrtP2TaskPrivate AbrtP2TaskPrivate; + +-static inline void glib_autoptr_cleanup_AbrtP2Task(AbrtP2Task **task) +-{ +- glib_autoptr_cleanup_GObject((GObject **)task); +-} +- + typedef enum { + ABRT_P2_TASK_STATUS_NEW, + ABRT_P2_TASK_STATUS_RUNNING, +@@ -96,21 +87,6 @@ struct _AbrtP2TaskClass + gpointer padding[12]; + }; + +-struct _AbrtP2TaskPrivate +-{ +- gint32 p2t_status; +- GVariant *p2t_details; +- GVariant *p2t_results; +- gint32 p2t_code; +- GCancellable *p2t_cancellable; +-}; +- +-struct _AbrtP2Task +-{ +- GObject parent_instance; +- AbrtP2TaskPrivate *pv; +-}; +- + AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task); + + /* Returns task details in form of key-value entries. +-- +2.20.1 + diff --git a/abrt.spec b/abrt.spec index 2d39a36..7fb2611 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,10 +53,13 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.11.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +# With new glib it is not possible to build in rawhide +# https://github.com/abrt/abrt/commit/21bdee7 +Patch0: 0001-dbus-task-Use-modern-GLib-type-macros.patch BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel @@ -1239,6 +1242,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jan 08 2019 Matej Marusak 2.11.1-2 +- dbus: task: Use modern GLib type macros + * Tue Jan 08 2019 Matej Marusak 2.11.1-1 - Translation updates - a-a-install-debuginfo: Clean cache if we need space From 509bd67e3d5f50cbd89a843ab409e916537e7cbb Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Tue, 8 Jan 2019 15:02:34 +0100 Subject: [PATCH 008/125] Include forgotten macro Signed-off-by: Matej Marusak --- abrt.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 7fb2611..a029a6f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -597,7 +597,9 @@ A small script which prints a count of detected problems when someone logs in to the shell %prep -%setup -q +%global __scm_apply_git(qp:m:) %{__git} am --exclude doc/design --exclude doc/project/abrt.tex +%autosetup -S git -p 0 + %build autoconf From 8086e64036449dca5f150e9bdb6bfdfae2633cb6 Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Sat, 12 Jan 2019 12:39:07 +0100 Subject: [PATCH 009/125] Fix use after free in applet Fixes BZ#1665521 Signed-off-by: Matej Marusak --- ...pplet-application-Fix-use-after-free.patch | 38 +++++++++++++++++++ abrt.spec | 1 + 2 files changed, 39 insertions(+) create mode 100644 0002-applet-application-Fix-use-after-free.patch diff --git a/0002-applet-application-Fix-use-after-free.patch b/0002-applet-application-Fix-use-after-free.patch new file mode 100644 index 0000000..f68ec6f --- /dev/null +++ b/0002-applet-application-Fix-use-after-free.patch @@ -0,0 +1,38 @@ +From cf78b299371995cbd7607a536f4b1469c09b40cf Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Sat, 12 Jan 2019 10:50:24 +0100 +Subject: [PATCH] applet: application: Fix use after free +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +dirlist_name is erroneously freed before it’s used to create a +directory. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1665521 + +Signed-off-by: Ernestas Kulik +--- + src/applet/abrt-applet-application.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c +index 6e7ac00a..4b1d9a3c 100644 +--- a/src/applet/abrt-applet-application.c ++++ b/src/applet/abrt-applet-application.c +@@ -296,10 +296,10 @@ new_dir_exists (GList **new_dirs) + cachedir = g_get_user_cache_dir (); + dirlist_name = concat_path_file (cachedir, "abrt"); + +- g_free (dirlist_name); +- + g_mkdir_with_parents (dirlist_name, 0777); + ++ g_free (dirlist_name); ++ + dirlist_name = concat_path_file (cachedir, "abrt/applet_dirlist"); + fp = fopen (dirlist_name, "r+"); + if (fp == NULL) +-- +2.20.1 + diff --git a/abrt.spec b/abrt.spec index a029a6f..357763f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -60,6 +60,7 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta # With new glib it is not possible to build in rawhide # https://github.com/abrt/abrt/commit/21bdee7 Patch0: 0001-dbus-task-Use-modern-GLib-type-macros.patch +Patch1: 0002-applet-application-Fix-use-after-free.patch BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel From 9d7d233bf99797210c6db102f4bf0f6d3dcdee20 Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Sat, 12 Jan 2019 12:41:33 +0100 Subject: [PATCH 010/125] Bump up release Signed-off-by: Matej Marusak --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 357763f..f95f33d 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,7 +53,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.11.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz From 609473ef014c4957d364a867a73172c2e3db5604 Mon Sep 17 00:00:00 2001 From: Matej Marusak Date: Sat, 12 Jan 2019 12:39:07 +0100 Subject: [PATCH 011/125] Fix use after free in applet Fixes BZ#1665521 Signed-off-by: Matej Marusak --- ...pplet-application-Fix-use-after-free.patch | 38 +++++++++++++++++++ abrt.spec | 6 ++- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 0002-applet-application-Fix-use-after-free.patch diff --git a/0002-applet-application-Fix-use-after-free.patch b/0002-applet-application-Fix-use-after-free.patch new file mode 100644 index 0000000..f68ec6f --- /dev/null +++ b/0002-applet-application-Fix-use-after-free.patch @@ -0,0 +1,38 @@ +From cf78b299371995cbd7607a536f4b1469c09b40cf Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Sat, 12 Jan 2019 10:50:24 +0100 +Subject: [PATCH] applet: application: Fix use after free +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +dirlist_name is erroneously freed before it’s used to create a +directory. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1665521 + +Signed-off-by: Ernestas Kulik +--- + src/applet/abrt-applet-application.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c +index 6e7ac00a..4b1d9a3c 100644 +--- a/src/applet/abrt-applet-application.c ++++ b/src/applet/abrt-applet-application.c +@@ -296,10 +296,10 @@ new_dir_exists (GList **new_dirs) + cachedir = g_get_user_cache_dir (); + dirlist_name = concat_path_file (cachedir, "abrt"); + +- g_free (dirlist_name); +- + g_mkdir_with_parents (dirlist_name, 0777); + ++ g_free (dirlist_name); ++ + dirlist_name = concat_path_file (cachedir, "abrt/applet_dirlist"); + fp = fopen (dirlist_name, "r+"); + if (fp == NULL) +-- +2.20.1 + diff --git a/abrt.spec b/abrt.spec index 7fb2611..8ed6b8e 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,13 +53,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.11.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz # With new glib it is not possible to build in rawhide # https://github.com/abrt/abrt/commit/21bdee7 Patch0: 0001-dbus-task-Use-modern-GLib-type-macros.patch +Patch1: 0002-applet-application-Fix-use-after-free.patch BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel @@ -597,7 +598,8 @@ A small script which prints a count of detected problems when someone logs in to the shell %prep -%setup -q +%global __scm_apply_git(qp:m:) %{__git} am --exclude doc/design --exclude doc/project/abrt.tex +%autosetup -S git -p 0 %build autoconf From 49589fc28f9856a51569f12f18a6b7e5ff58f47e Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Mon, 14 Jan 2019 08:41:34 +0100 Subject: [PATCH 012/125] Require git for building MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we’re applying git patches, this is still needed. --- abrt.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/abrt.spec b/abrt.spec index 8ed6b8e..e537633 100644 --- a/abrt.spec +++ b/abrt.spec @@ -61,6 +61,8 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta # https://github.com/abrt/abrt/commit/21bdee7 Patch0: 0001-dbus-task-Use-modern-GLib-type-macros.patch Patch1: 0002-applet-application-Fix-use-after-free.patch +# Needed when applying git patches. +BuildRequires: git BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel From eadff202bca229eecaaceefecfb83cffa878074e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 12:37:15 +0100 Subject: [PATCH 013/125] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- abrt.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/abrt.spec b/abrt.spec index f95f33d..9a87998 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,7 +53,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.11.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -802,9 +802,7 @@ fi %systemd_postun_with_restart abrt-coredump-helper.service %endif # with atomic -%if 0%{?fedora} > 27 || 0%{?rhel} > 7 -# ldconfigi and gtk-update-icon-cache is not needed -%else +%if 0%{?rhel} && 0%{?rhel} <= 7 %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -876,13 +874,6 @@ exit 0 %posttrans addon-pstoreoops service abrt-pstoreoops condrestart >/dev/null 2>&1 || : -%if 0%{?fedora} > 27 -# gtk-update-icon-cache is not needed -%else -%posttrans gui -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - %posttrans dbus # Force abrt-dbus to restart like we do with the other services killall abrt-dbus >/dev/null 2>&1 || : @@ -1245,6 +1236,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sun Jan 27 2019 Igor Gnatenko - 2.11.1-4 +- Remove obsolete scriptlets + * Tue Jan 08 2019 Matej Marusak 2.11.1-2 - dbus: task: Use modern GLib type macros From ebf644594c833db09edd66c908b83d4c2fa6ceb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:53:03 +0000 Subject: [PATCH 014/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 9a87998..c5442b0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,7 +53,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.11.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1236,6 +1236,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jan 27 2019 Igor Gnatenko - 2.11.1-4 - Remove obsolete scriptlets From c7b20eb39938f773fa48e106decba2663984cc87 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Mon, 4 Feb 2019 14:27:10 +0100 Subject: [PATCH 015/125] Update to 2.12.0 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + ...bus-task-Use-modern-GLib-type-macros.patch | 299 ------------------ ...pplet-application-Fix-use-after-free.patch | 38 --- abrt.spec | 19 +- sources | 2 +- 5 files changed, 12 insertions(+), 347 deletions(-) delete mode 100644 0001-dbus-task-Use-modern-GLib-type-macros.patch delete mode 100644 0002-applet-application-Fix-use-after-free.patch diff --git a/.gitignore b/.gitignore index 7bd2baf..16e185b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.10.tar.gz /abrt-2.11.0.tar.gz /abrt-2.11.1.tar.gz +/abrt-2.12.0.tar.gz diff --git a/0001-dbus-task-Use-modern-GLib-type-macros.patch b/0001-dbus-task-Use-modern-GLib-type-macros.patch deleted file mode 100644 index f188eeb..0000000 --- a/0001-dbus-task-Use-modern-GLib-type-macros.patch +++ /dev/null @@ -1,299 +0,0 @@ -From 21bdee77727417b6b16feed7b466953873319b58 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Tue, 8 Jan 2019 14:26:15 +0100 -Subject: [PATCH] dbus: task: Use modern GLib type macros - -Signed-off-by: Ernestas Kulik ---- - src/dbus/abrt_problems2_task.c | 111 ++++++++++++++++++++++++--------- - src/dbus/abrt_problems2_task.h | 26 +------- - 2 files changed, 82 insertions(+), 55 deletions(-) - -diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c -index f40381f6..cba6b469 100644 ---- a/src/dbus/abrt_problems2_task.c -+++ b/src/dbus/abrt_problems2_task.c -@@ -25,6 +25,15 @@ enum { - - static guint s_signals[SN_LAST_SIGNAL] = { 0 }; - -+struct _AbrtP2TaskPrivate -+{ -+ gint32 p2t_status; -+ GVariant *p2t_details; -+ GVariant *p2t_results; -+ gint32 p2t_code; -+ GCancellable *p2t_cancellable; -+}; -+ - G_DEFINE_TYPE_WITH_PRIVATE(AbrtP2Task, abrt_p2_task, G_TYPE_OBJECT) - - static void abrt_p2_task_finalize(GObject *gobject) -@@ -74,17 +83,24 @@ static void abrt_p2_task_class_init(AbrtP2TaskClass *klass) - - static void abrt_p2_task_init(AbrtP2Task *self) - { -- self->pv = abrt_p2_task_get_instance_private(self); -- self->pv->p2t_details = g_variant_new("a{sv}", NULL); -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(self); -+ -+ pv->p2t_details = g_variant_new("a{sv}", NULL); - } - - static void abrt_p2_task_change_status(AbrtP2Task *task, - AbrtP2TaskStatus status) - { -- if (task->pv->p2t_status == status) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if (pv->p2t_status == status) - return; - -- task->pv->p2t_status = status; -+ pv->p2t_status = status; - - g_signal_emit(task, - s_signals[SN_STATUS_CHANGED], -@@ -94,53 +110,77 @@ static void abrt_p2_task_change_status(AbrtP2Task *task, - - AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task) - { -- return task->pv->p2t_status; -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ return pv->p2t_status; - } - - GVariant *abrt_p2_task_details(AbrtP2Task *task) - { -- return g_variant_ref(task->pv->p2t_details); -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ return g_variant_ref(pv->p2t_details); - } - - void abrt_p2_task_add_detail(AbrtP2Task *task, - const char *key, - GVariant *value) - { -+ AbrtP2TaskPrivate *pv; - GVariantDict dict; -- g_variant_dict_init(&dict, task->pv->p2t_details); -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ g_variant_dict_init(&dict, pv->p2t_details); - g_variant_dict_insert(&dict, key, "v", value); - -- if (task->pv->p2t_details) -- g_variant_unref(task->pv->p2t_details); -+ if (pv->p2t_details) -+ g_variant_unref(pv->p2t_details); - -- task->pv->p2t_details = g_variant_dict_end(&dict); -+ pv->p2t_details = g_variant_dict_end(&dict); - } - - void abrt_p2_task_set_response(AbrtP2Task *task, - GVariant *response) - { -- if (task->pv->p2t_results != NULL) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if (pv->p2t_results != NULL) - log_warning("Task already has response assigned"); - -- task->pv->p2t_results = response; -+ pv->p2t_results = response; - } - - bool abrt_p2_task_is_cancelled(AbrtP2Task *task) - { -- return (task->pv->p2t_cancellable -- && g_cancellable_is_cancelled(task->pv->p2t_cancellable)) -- || task->pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ return (pv->p2t_cancellable -+ && g_cancellable_is_cancelled(pv->p2t_cancellable)) -+ || pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; - } - - void abrt_p2_task_cancel(AbrtP2Task *task, - GError **error) - { -+ AbrtP2TaskPrivate *pv; -+ - if (abrt_p2_task_is_cancelled(task)) - return; - -- if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) -- g_cancellable_cancel(task->pv->p2t_cancellable); -- else if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if (pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) -+ g_cancellable_cancel(pv->p2t_cancellable); -+ else if (pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) - { - ABRT_P2_TASK_VIRTUAL_CANCEL(task, error); - -@@ -157,8 +197,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, - gint32 *code, - GError **error) - { -- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_DONE -- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_DONE -+ && pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) - { - g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - "Cannot finalize undone task"); -@@ -170,12 +214,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, - if (*error != NULL) - return; - -- if (task->pv->p2t_results) -- *result = g_variant_ref(task->pv->p2t_results); -+ if (pv->p2t_results) -+ *result = g_variant_ref(pv->p2t_results); - else - *result = g_variant_new("a{sv}", NULL); - -- *code = task->pv->p2t_code; -+ *code = pv->p2t_code; - } - - static void abrt_p2_task_finish_gtask(GObject *source_object, -@@ -183,6 +227,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - gpointer user_data) - { - AbrtP2Task *task = ABRT_P2_TASK(source_object); -+ AbrtP2TaskPrivate *pv; - - if (!g_task_is_valid(result, task)) - { -@@ -190,6 +235,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - return; - } - -+ pv = abrt_p2_task_get_instance_private(task); -+ - GError *error = NULL; - const gint32 code = g_task_propagate_int(G_TASK(result), &error); - -@@ -203,7 +250,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - { - log_debug("Task done"); - -- task->pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; -+ pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; - abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_DONE); - } - else if (abrt_p2_task_is_cancelled(task)) -@@ -263,8 +310,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_FAILED); - } - -- g_object_unref(task->pv->p2t_cancellable); -- task->pv->p2t_cancellable = NULL; -+ g_object_unref(pv->p2t_cancellable); -+ pv->p2t_cancellable = NULL; - } - - static void abrt_p2_task_thread(GTask *task, -@@ -289,8 +336,12 @@ void abrt_p2_task_start(AbrtP2Task *task, - GVariant *options, - GError **error) - { -- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_NEW -- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_NEW -+ && pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) - { - g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - "Cannot start task that is not new or stopped"); -@@ -302,9 +353,9 @@ void abrt_p2_task_start(AbrtP2Task *task, - if (*error != NULL) - return; - -- task->pv->p2t_cancellable = g_cancellable_new(); -+ pv->p2t_cancellable = g_cancellable_new(); - GTask *gtask = g_task_new(task, -- task->pv->p2t_cancellable, -+ pv->p2t_cancellable, - abrt_p2_task_finish_gtask, - NULL); - -diff --git a/src/dbus/abrt_problems2_task.h b/src/dbus/abrt_problems2_task.h -index 71f765d9..717af47b 100644 ---- a/src/dbus/abrt_problems2_task.h -+++ b/src/dbus/abrt_problems2_task.h -@@ -45,21 +45,12 @@ G_BEGIN_DECLS - GType abrt_p2_task_get_type (void); - - #define ABRT_TYPE_P2_TASK (abrt_p2_task_get_type ()) --#define ABRT_P2_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ABRT_TYPE_P2_TASK, AbrtP2Task)) --#define ABRT_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) --#define ABRT_IS_P2_TASK(obj)(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ABRT_TYPE_P2_TASK)) --#define ABRT_IS_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ABRT_TYPE_P2_TASK)) --#define ABRT_P2_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) -+G_DECLARE_DERIVABLE_TYPE(AbrtP2Task, abrt_p2_task, ABRT, P2_TASK, GObject) - - typedef struct _AbrtP2Task AbrtP2Task; - typedef struct _AbrtP2TaskClass AbrtP2TaskClass; - typedef struct _AbrtP2TaskPrivate AbrtP2TaskPrivate; - --static inline void glib_autoptr_cleanup_AbrtP2Task(AbrtP2Task **task) --{ -- glib_autoptr_cleanup_GObject((GObject **)task); --} -- - typedef enum { - ABRT_P2_TASK_STATUS_NEW, - ABRT_P2_TASK_STATUS_RUNNING, -@@ -96,21 +87,6 @@ struct _AbrtP2TaskClass - gpointer padding[12]; - }; - --struct _AbrtP2TaskPrivate --{ -- gint32 p2t_status; -- GVariant *p2t_details; -- GVariant *p2t_results; -- gint32 p2t_code; -- GCancellable *p2t_cancellable; --}; -- --struct _AbrtP2Task --{ -- GObject parent_instance; -- AbrtP2TaskPrivate *pv; --}; -- - AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task); - - /* Returns task details in form of key-value entries. --- -2.20.1 - diff --git a/0002-applet-application-Fix-use-after-free.patch b/0002-applet-application-Fix-use-after-free.patch deleted file mode 100644 index f68ec6f..0000000 --- a/0002-applet-application-Fix-use-after-free.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cf78b299371995cbd7607a536f4b1469c09b40cf Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Sat, 12 Jan 2019 10:50:24 +0100 -Subject: [PATCH] applet: application: Fix use after free -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -dirlist_name is erroneously freed before it’s used to create a -directory. - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1665521 - -Signed-off-by: Ernestas Kulik ---- - src/applet/abrt-applet-application.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c -index 6e7ac00a..4b1d9a3c 100644 ---- a/src/applet/abrt-applet-application.c -+++ b/src/applet/abrt-applet-application.c -@@ -296,10 +296,10 @@ new_dir_exists (GList **new_dirs) - cachedir = g_get_user_cache_dir (); - dirlist_name = concat_path_file (cachedir, "abrt"); - -- g_free (dirlist_name); -- - g_mkdir_with_parents (dirlist_name, 0777); - -+ g_free (dirlist_name); -+ - dirlist_name = concat_path_file (cachedir, "abrt/applet_dirlist"); - fp = fopen (dirlist_name, "r+"); - if (fp == NULL) --- -2.20.1 - diff --git a/abrt.spec b/abrt.spec index c5442b0..4b9fe50 100644 --- a/abrt.spec +++ b/abrt.spec @@ -52,15 +52,11 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.11.1 -Release: 5%{?dist} +Version: 2.12.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# With new glib it is not possible to build in rawhide -# https://github.com/abrt/abrt/commit/21bdee7 -Patch0: 0001-dbus-task-Use-modern-GLib-type-macros.patch -Patch1: 0002-applet-application-Fix-use-after-free.patch BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel @@ -603,11 +599,13 @@ to the shell %build -autoconf - %define var_base_dir spool -CFLAGS="%{optflags} -Werror" %configure \ +./gen-version +autoreconf -if +intltoolize --automake -c -f + +%configure \ %if %{without python2} --without-python2 \ %endif # with python2 @@ -1236,6 +1234,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Feb 4 2019 Ernestas Kulik - 2.12.0-1 +- Update to 2.12.0 + * Thu Jan 31 2019 Fedora Release Engineering - 2.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index e43da5f..9217d6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.11.1.tar.gz) = d2388bb1123e50ef1c8875e2feeeb8ab6830035e13362fe4f30b39207454c866a0c80412deef05e109814f42efc0c2d51eed4ee3fdc468f4b8eb340acff96226 +SHA512 (abrt-2.12.0.tar.gz) = 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded From a0a7c14959a6c89de5c65b2a6b103916ca9c73b0 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Mon, 4 Feb 2019 14:27:10 +0100 Subject: [PATCH 016/125] Update to 2.12.0 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + ...bus-task-Use-modern-GLib-type-macros.patch | 299 ------------------ ...pplet-application-Fix-use-after-free.patch | 38 --- abrt.spec | 19 +- sources | 2 +- 5 files changed, 12 insertions(+), 347 deletions(-) delete mode 100644 0001-dbus-task-Use-modern-GLib-type-macros.patch delete mode 100644 0002-applet-application-Fix-use-after-free.patch diff --git a/.gitignore b/.gitignore index 7bd2baf..16e185b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.10.tar.gz /abrt-2.11.0.tar.gz /abrt-2.11.1.tar.gz +/abrt-2.12.0.tar.gz diff --git a/0001-dbus-task-Use-modern-GLib-type-macros.patch b/0001-dbus-task-Use-modern-GLib-type-macros.patch deleted file mode 100644 index f188eeb..0000000 --- a/0001-dbus-task-Use-modern-GLib-type-macros.patch +++ /dev/null @@ -1,299 +0,0 @@ -From 21bdee77727417b6b16feed7b466953873319b58 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Tue, 8 Jan 2019 14:26:15 +0100 -Subject: [PATCH] dbus: task: Use modern GLib type macros - -Signed-off-by: Ernestas Kulik ---- - src/dbus/abrt_problems2_task.c | 111 ++++++++++++++++++++++++--------- - src/dbus/abrt_problems2_task.h | 26 +------- - 2 files changed, 82 insertions(+), 55 deletions(-) - -diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c -index f40381f6..cba6b469 100644 ---- a/src/dbus/abrt_problems2_task.c -+++ b/src/dbus/abrt_problems2_task.c -@@ -25,6 +25,15 @@ enum { - - static guint s_signals[SN_LAST_SIGNAL] = { 0 }; - -+struct _AbrtP2TaskPrivate -+{ -+ gint32 p2t_status; -+ GVariant *p2t_details; -+ GVariant *p2t_results; -+ gint32 p2t_code; -+ GCancellable *p2t_cancellable; -+}; -+ - G_DEFINE_TYPE_WITH_PRIVATE(AbrtP2Task, abrt_p2_task, G_TYPE_OBJECT) - - static void abrt_p2_task_finalize(GObject *gobject) -@@ -74,17 +83,24 @@ static void abrt_p2_task_class_init(AbrtP2TaskClass *klass) - - static void abrt_p2_task_init(AbrtP2Task *self) - { -- self->pv = abrt_p2_task_get_instance_private(self); -- self->pv->p2t_details = g_variant_new("a{sv}", NULL); -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(self); -+ -+ pv->p2t_details = g_variant_new("a{sv}", NULL); - } - - static void abrt_p2_task_change_status(AbrtP2Task *task, - AbrtP2TaskStatus status) - { -- if (task->pv->p2t_status == status) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if (pv->p2t_status == status) - return; - -- task->pv->p2t_status = status; -+ pv->p2t_status = status; - - g_signal_emit(task, - s_signals[SN_STATUS_CHANGED], -@@ -94,53 +110,77 @@ static void abrt_p2_task_change_status(AbrtP2Task *task, - - AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task) - { -- return task->pv->p2t_status; -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ return pv->p2t_status; - } - - GVariant *abrt_p2_task_details(AbrtP2Task *task) - { -- return g_variant_ref(task->pv->p2t_details); -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ return g_variant_ref(pv->p2t_details); - } - - void abrt_p2_task_add_detail(AbrtP2Task *task, - const char *key, - GVariant *value) - { -+ AbrtP2TaskPrivate *pv; - GVariantDict dict; -- g_variant_dict_init(&dict, task->pv->p2t_details); -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ g_variant_dict_init(&dict, pv->p2t_details); - g_variant_dict_insert(&dict, key, "v", value); - -- if (task->pv->p2t_details) -- g_variant_unref(task->pv->p2t_details); -+ if (pv->p2t_details) -+ g_variant_unref(pv->p2t_details); - -- task->pv->p2t_details = g_variant_dict_end(&dict); -+ pv->p2t_details = g_variant_dict_end(&dict); - } - - void abrt_p2_task_set_response(AbrtP2Task *task, - GVariant *response) - { -- if (task->pv->p2t_results != NULL) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if (pv->p2t_results != NULL) - log_warning("Task already has response assigned"); - -- task->pv->p2t_results = response; -+ pv->p2t_results = response; - } - - bool abrt_p2_task_is_cancelled(AbrtP2Task *task) - { -- return (task->pv->p2t_cancellable -- && g_cancellable_is_cancelled(task->pv->p2t_cancellable)) -- || task->pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ return (pv->p2t_cancellable -+ && g_cancellable_is_cancelled(pv->p2t_cancellable)) -+ || pv->p2t_status == ABRT_P2_TASK_STATUS_CANCELED; - } - - void abrt_p2_task_cancel(AbrtP2Task *task, - GError **error) - { -+ AbrtP2TaskPrivate *pv; -+ - if (abrt_p2_task_is_cancelled(task)) - return; - -- if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) -- g_cancellable_cancel(task->pv->p2t_cancellable); -- else if (task->pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if (pv->p2t_status == ABRT_P2_TASK_STATUS_RUNNING) -+ g_cancellable_cancel(pv->p2t_cancellable); -+ else if (pv->p2t_status == ABRT_P2_TASK_STATUS_STOPPED) - { - ABRT_P2_TASK_VIRTUAL_CANCEL(task, error); - -@@ -157,8 +197,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, - gint32 *code, - GError **error) - { -- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_DONE -- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_DONE -+ && pv->p2t_status != ABRT_P2_TASK_STATUS_FAILED) - { - g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - "Cannot finalize undone task"); -@@ -170,12 +214,12 @@ void abrt_p2_task_finish(AbrtP2Task *task, - if (*error != NULL) - return; - -- if (task->pv->p2t_results) -- *result = g_variant_ref(task->pv->p2t_results); -+ if (pv->p2t_results) -+ *result = g_variant_ref(pv->p2t_results); - else - *result = g_variant_new("a{sv}", NULL); - -- *code = task->pv->p2t_code; -+ *code = pv->p2t_code; - } - - static void abrt_p2_task_finish_gtask(GObject *source_object, -@@ -183,6 +227,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - gpointer user_data) - { - AbrtP2Task *task = ABRT_P2_TASK(source_object); -+ AbrtP2TaskPrivate *pv; - - if (!g_task_is_valid(result, task)) - { -@@ -190,6 +235,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - return; - } - -+ pv = abrt_p2_task_get_instance_private(task); -+ - GError *error = NULL; - const gint32 code = g_task_propagate_int(G_TASK(result), &error); - -@@ -203,7 +250,7 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - { - log_debug("Task done"); - -- task->pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; -+ pv->p2t_code = code - ABRT_P2_TASK_CODE_DONE; - abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_DONE); - } - else if (abrt_p2_task_is_cancelled(task)) -@@ -263,8 +310,8 @@ static void abrt_p2_task_finish_gtask(GObject *source_object, - abrt_p2_task_change_status(task, ABRT_P2_TASK_STATUS_FAILED); - } - -- g_object_unref(task->pv->p2t_cancellable); -- task->pv->p2t_cancellable = NULL; -+ g_object_unref(pv->p2t_cancellable); -+ pv->p2t_cancellable = NULL; - } - - static void abrt_p2_task_thread(GTask *task, -@@ -289,8 +336,12 @@ void abrt_p2_task_start(AbrtP2Task *task, - GVariant *options, - GError **error) - { -- if ( task->pv->p2t_status != ABRT_P2_TASK_STATUS_NEW -- && task->pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) -+ AbrtP2TaskPrivate *pv; -+ -+ pv = abrt_p2_task_get_instance_private(task); -+ -+ if ( pv->p2t_status != ABRT_P2_TASK_STATUS_NEW -+ && pv->p2t_status != ABRT_P2_TASK_STATUS_STOPPED) - { - g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, - "Cannot start task that is not new or stopped"); -@@ -302,9 +353,9 @@ void abrt_p2_task_start(AbrtP2Task *task, - if (*error != NULL) - return; - -- task->pv->p2t_cancellable = g_cancellable_new(); -+ pv->p2t_cancellable = g_cancellable_new(); - GTask *gtask = g_task_new(task, -- task->pv->p2t_cancellable, -+ pv->p2t_cancellable, - abrt_p2_task_finish_gtask, - NULL); - -diff --git a/src/dbus/abrt_problems2_task.h b/src/dbus/abrt_problems2_task.h -index 71f765d9..717af47b 100644 ---- a/src/dbus/abrt_problems2_task.h -+++ b/src/dbus/abrt_problems2_task.h -@@ -45,21 +45,12 @@ G_BEGIN_DECLS - GType abrt_p2_task_get_type (void); - - #define ABRT_TYPE_P2_TASK (abrt_p2_task_get_type ()) --#define ABRT_P2_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ABRT_TYPE_P2_TASK, AbrtP2Task)) --#define ABRT_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) --#define ABRT_IS_P2_TASK(obj)(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ABRT_TYPE_P2_TASK)) --#define ABRT_IS_P2_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ABRT_TYPE_P2_TASK)) --#define ABRT_P2_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ABRT_TYPE_P2_TASK, AbrtP2TaskClass)) -+G_DECLARE_DERIVABLE_TYPE(AbrtP2Task, abrt_p2_task, ABRT, P2_TASK, GObject) - - typedef struct _AbrtP2Task AbrtP2Task; - typedef struct _AbrtP2TaskClass AbrtP2TaskClass; - typedef struct _AbrtP2TaskPrivate AbrtP2TaskPrivate; - --static inline void glib_autoptr_cleanup_AbrtP2Task(AbrtP2Task **task) --{ -- glib_autoptr_cleanup_GObject((GObject **)task); --} -- - typedef enum { - ABRT_P2_TASK_STATUS_NEW, - ABRT_P2_TASK_STATUS_RUNNING, -@@ -96,21 +87,6 @@ struct _AbrtP2TaskClass - gpointer padding[12]; - }; - --struct _AbrtP2TaskPrivate --{ -- gint32 p2t_status; -- GVariant *p2t_details; -- GVariant *p2t_results; -- gint32 p2t_code; -- GCancellable *p2t_cancellable; --}; -- --struct _AbrtP2Task --{ -- GObject parent_instance; -- AbrtP2TaskPrivate *pv; --}; -- - AbrtP2TaskStatus abrt_p2_task_status(AbrtP2Task *task); - - /* Returns task details in form of key-value entries. --- -2.20.1 - diff --git a/0002-applet-application-Fix-use-after-free.patch b/0002-applet-application-Fix-use-after-free.patch deleted file mode 100644 index f68ec6f..0000000 --- a/0002-applet-application-Fix-use-after-free.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cf78b299371995cbd7607a536f4b1469c09b40cf Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Sat, 12 Jan 2019 10:50:24 +0100 -Subject: [PATCH] applet: application: Fix use after free -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -dirlist_name is erroneously freed before it’s used to create a -directory. - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1665521 - -Signed-off-by: Ernestas Kulik ---- - src/applet/abrt-applet-application.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c -index 6e7ac00a..4b1d9a3c 100644 ---- a/src/applet/abrt-applet-application.c -+++ b/src/applet/abrt-applet-application.c -@@ -296,10 +296,10 @@ new_dir_exists (GList **new_dirs) - cachedir = g_get_user_cache_dir (); - dirlist_name = concat_path_file (cachedir, "abrt"); - -- g_free (dirlist_name); -- - g_mkdir_with_parents (dirlist_name, 0777); - -+ g_free (dirlist_name); -+ - dirlist_name = concat_path_file (cachedir, "abrt/applet_dirlist"); - fp = fopen (dirlist_name, "r+"); - if (fp == NULL) --- -2.20.1 - diff --git a/abrt.spec b/abrt.spec index e537633..bdfc58b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -52,15 +52,11 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.11.1 -Release: 3%{?dist} +Version: 2.12.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# With new glib it is not possible to build in rawhide -# https://github.com/abrt/abrt/commit/21bdee7 -Patch0: 0001-dbus-task-Use-modern-GLib-type-macros.patch -Patch1: 0002-applet-application-Fix-use-after-free.patch # Needed when applying git patches. BuildRequires: git BuildRequires: %{dbus_devel} @@ -604,11 +600,13 @@ to the shell %autosetup -S git -p 0 %build -autoconf - %define var_base_dir spool -CFLAGS="%{optflags} -Werror" %configure \ +./gen-version +autoreconf -if +intltoolize --automake -c -f + +%configure \ %if %{without python2} --without-python2 \ %endif # with python2 @@ -1246,6 +1244,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Feb 4 2019 Ernestas Kulik - 2.12.0-1 +- Update to 2.12.0 + * Tue Jan 08 2019 Matej Marusak 2.11.1-2 - dbus: task: Use modern GLib type macros diff --git a/sources b/sources index e43da5f..9217d6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.11.1.tar.gz) = d2388bb1123e50ef1c8875e2feeeb8ab6830035e13362fe4f30b39207454c866a0c80412deef05e109814f42efc0c2d51eed4ee3fdc468f4b8eb340acff96226 +SHA512 (abrt-2.12.0.tar.gz) = 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded From 5dfc50845c8668778d2ca70eb9c9cf966b8c7d6a Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 5 Feb 2019 16:47:12 +0100 Subject: [PATCH 017/125] Bump dependencies Forgot to do that the first time. Signed-off-by: Ernestas Kulik --- abrt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/abrt.spec b/abrt.spec index 4b9fe50..7a46620 100644 --- a/abrt.spec +++ b/abrt.spec @@ -47,7 +47,7 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.7 +%define libreport_ver 2.10.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool @@ -60,7 +60,7 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel -BuildRequires: glib2-devel >= 2.43 +BuildRequires: glib2-devel >= 2.43.4 BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel @@ -1234,6 +1234,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Feb 5 2019 Ernestas Kulik - 2.12.0-2 +- Bump glib and libreport dependencies + * Mon Feb 4 2019 Ernestas Kulik - 2.12.0-1 - Update to 2.12.0 From 67f63a5ca4201002f3ed709587ea32c14b78c2dd Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 5 Feb 2019 16:49:11 +0100 Subject: [PATCH 018/125] Bump release Forgot to do that, too. Signed-off-by: Ernestas Kulik --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 7a46620..d6eb422 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,7 +53,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz From a80913acdd66292c30678f510bba01552731eb96 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 5 Feb 2019 16:47:12 +0100 Subject: [PATCH 019/125] Bump dependencies Forgot to do that the first time. Signed-off-by: Ernestas Kulik --- abrt.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/abrt.spec b/abrt.spec index bdfc58b..3730820 100644 --- a/abrt.spec +++ b/abrt.spec @@ -47,13 +47,13 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.7 +%define libreport_ver 2.10.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -62,7 +62,7 @@ BuildRequires: git BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel -BuildRequires: glib2-devel >= 2.43 +BuildRequires: glib2-devel >= 2.43.4 BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel @@ -1244,6 +1244,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Feb 5 2019 Ernestas Kulik - 2.12.0-2 +- Bump glib and libreport dependencies + * Mon Feb 4 2019 Ernestas Kulik - 2.12.0-1 - Update to 2.12.0 From 1ee4720bcaa74dca09b07a0bf7ea78ded154d562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 4 Apr 2019 15:45:29 +0200 Subject: [PATCH 020/125] BR git explicitly, it is used in %prep Previously, it was pulled in transitively, that is no longer true. Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.k6RazT ... + /usr/bin/git init -q /var/tmp/rpm-tmp.k6RazT: line 42: /usr/bin/git: No such file or directory error: Bad exit status from /var/tmp/rpm-tmp.k6RazT (%prep) --- abrt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abrt.spec b/abrt.spec index d6eb422..7b3e7f8 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,6 +57,7 @@ Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel From 17aa2db63d658d260fce7c719187b50f068ad975 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 10 Jun 2019 17:41:59 +0200 Subject: [PATCH 021/125] Rebuild for RPM 4.15 Signed-off-by: Igor Gnatenko --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 7b3e7f8..10fa8f1 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,7 +53,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1235,6 +1235,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Jun 10 15:41:59 CET 2019 Igor Gnatenko - 2.12.0-3 +- Rebuild for RPM 4.15 + * Tue Feb 5 2019 Ernestas Kulik - 2.12.0-2 - Bump glib and libreport dependencies From f9e66658209c25a236a3d55cb60d933624b92605 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 11 Jun 2019 00:13:16 +0200 Subject: [PATCH 022/125] Rebuild for RPM 4.15 Signed-off-by: Igor Gnatenko --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 10fa8f1..3fe57ed 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,7 +53,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1235,6 +1235,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Jun 10 22:13:16 CET 2019 Igor Gnatenko - 2.12.0-4 +- Rebuild for RPM 4.15 + * Mon Jun 10 15:41:59 CET 2019 Igor Gnatenko - 2.12.0-3 - Rebuild for RPM 4.15 From 6b11b1ff26d98412601e7bdda4b4f44c89b85ed2 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Wed, 3 Jul 2019 17:45:54 +0200 Subject: [PATCH 023/125] New upstream release version 2.12.1 * Remove gen-version from spec - This is upstream script to generate version. This is not needed in dist-git. [2.12.1] Added - Require dbus-tools for dbus-send command. Changed - ABRT won't process crashes coming from unpackaged applications by default. - Completely removed support for Python2. - Update new ABRT icon. - retrace-client defaults to https. - Updated man pages. - Removed configurations from /usr/share/abrt. - Removed provides for abrt-python packages. Fixed - Gracefully handle exceptions comming from abrt-action-generate-machine-id. - Gracefully handle exceptions comming from abrt-action-install-debuginfo. - Use correct name of environment variable for retrace-server. Signed-off-by: Martin Kutlak --- .gitignore | 1 + abrt.spec | 222 ++++++++++++----------------------------------------- sources | 2 +- 3 files changed, 49 insertions(+), 176 deletions(-) diff --git a/.gitignore b/.gitignore index 16e185b..740a5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ abrt-1.1.13.tar.gz /abrt-2.11.0.tar.gz /abrt-2.11.1.tar.gz /abrt-2.12.0.tar.gz +/abrt-2.12.1.tar.gz diff --git a/abrt.spec b/abrt.spec index 3fe57ed..6b46536 100644 --- a/abrt.spec +++ b/abrt.spec @@ -9,13 +9,6 @@ %bcond_with python3 %endif -%if 0%{?rhel} > 7 || 0%{?fedora} > 28 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - %if 0%{?rhel}%{?suse_version} %bcond_with bodhi %else @@ -52,8 +45,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.0 -Release: 4%{?dist} +Version: 2.12.1 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -78,13 +71,6 @@ BuildRequires: libreport-devel >= %{libreport_ver} BuildRequires: satyr-devel >= %{satyr_ver} BuildRequires: augeas BuildRequires: libselinux-devel -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-systemd -BuildRequires: python2-argcomplete -BuildRequires: python2-argh -BuildRequires: python2-humanize -%endif # with python2 %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-systemd @@ -110,11 +96,6 @@ Requires(pre): %{shadow_utils} %if %{with python3} Requires: python3-augeas Requires: python3-dbus -%else -%if %{with python2} -Requires: python2-augeas -Requires: python2-dbus -%endif # with python2 %endif # with python3 %ifarch aarch64 i686 x86_64 Requires: dmidecode @@ -145,13 +126,6 @@ BuildRequires: libreport-web-devel >= %{libreport_ver} BuildRequires: gdb-headless #dbus BuildRequires: polkit-devel -%if %{with python2} -#python2-abrt -BuildRequires: python2-sphinx -BuildRequires: python2-libreport -#python2-abrt-doc -BuildRequires: python2-devel -%endif # with python2 %if %{with python3} #python3-abrt BuildRequires: python3-nose @@ -230,10 +204,6 @@ Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} %if %{with python3} Requires: python3-libreport -%else -%if %{with python2} -Requires: python2-libreport -%endif # with python2 %endif # with python3 @@ -291,11 +261,6 @@ Requires: kexec-tools %if %{with python3} Requires: python3-abrt Requires: python3-augeas -%else -%if %{with python2} -Requires: python2-abrt -Requires: python2-augeas -%endif # with python2 %endif # with python3 Requires: util-linux @@ -324,41 +289,12 @@ Provides: libreport-plugin-bodhi = %{version}-%{release} Search for a new updates in bodhi server. %endif -%if %{with python2} -%package -n python2-abrt-addon -Summary: %{name}'s addon for catching and analyzing Python exceptions -Requires: %{name} = %{version}-%{release} -Requires: python2-systemd -Requires: python2-abrt -# Remove before F30 -Provides: abrt-addon-python = %{version}-%{release} -Provides: abrt-addon-python%{?_isa} = %{version}-%{release} -Obsoletes: abrt-addon-python < 2.10.4 - -%description -n python2-abrt-addon -This package contains python hook and python analyzer plugin for handling -uncaught exception in python programs. - -%package -n python2-abrt-container-addon -Summary: %{name}'s container addon for catching Python 2 exceptions -Conflicts: python2-abrt-addon -Requires: container-exception-logger - -%description -n python2-abrt-container-addon -This package contains python 2 hook and handling uncaught exception in python 2 -programs in container. -%endif # with python2 - %if %{with python3} %package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions Requires: %{name} = %{version}-%{release} Requires: python3-systemd Requires: python3-abrt -# Remove before F30 -Provides: abrt-addon-python3 = %{version}-%{release} -Provides: abrt-addon-python3%{?_isa} = %{version}-%{release} -Obsoletes: abrt-addon-python3 < 2.10.4 %description -n python3-abrt-addon This package contains python 3 hook and python analyzer plugin for handling @@ -512,47 +448,12 @@ hosts. Summary: ABRT DBus service Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} +Requires: dbus-tools %description dbus ABRT DBus service which provides org.freedesktop.problems API on dbus and uses PolicyKit to authorize to access the problem data. -%if %{with python2} -%package -n python2-abrt -Summary: ABRT Python API -Requires: %{name} = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-dbus = %{version}-%{release} -Requires: python2-dbus -Requires: python2-libreport -%if 0%{?rhel:%{rhel} == 7} -Requires: python-gobject-base -%else -Requires: python2-gobject-base -%endif -%{?python_provide:%python_provide python2-abrt} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < 2.10.4 - -%description -n python2-abrt -High-level API for querying, creating and manipulating -problems handled by ABRT in Python. - -%package -n python2-abrt-doc -Summary: ABRT Python API Documentation -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: python2-abrt = %{version}-%{release} -# Remove before F30 -Provides: %{name}-python-doc = %{version}-%{release} -Obsoletes: %{name}-python-doc < 2.10.4 - -%description -n python2-abrt-doc -Examples and documentation for ABRT Python API. -%endif # with python2 - %if %{with python3} %package -n python3-abrt Summary: ABRT Python 3 API @@ -561,11 +462,6 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-dbus Requires: python3-libreport -%{?python_provide:%python_provide python3-abrt} -# Remove before F30 -Provides: %{name}-python3 = %{version}-%{release} -Provides: %{name}-python3%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python3 < 2.10.4 Requires: python3-gobject-base %description -n python3-abrt @@ -577,9 +473,6 @@ Summary: ABRT Python API Documentation BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release} -# Remove before F30 -Provides: %{name}-python3-doc = %{version}-%{release} -Obsoletes: %{name}-python3-doc < 2.10.4 %description -n python3-abrt-doc Examples and documentation for ABRT Python 3 API. @@ -602,14 +495,10 @@ to the shell %build %define var_base_dir spool -./gen-version autoreconf -if intltoolize --automake -c -f %configure \ -%if %{without python2} - --without-python2 \ -%endif # with python2 %if %{without python3} --without-python3 \ %endif # with python3 @@ -703,11 +592,6 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %systemd_post abrt-xorg.service %journal_catalog_update -%if %{with python2} -%post -n python2-abrt-addon -%journal_catalog_update -%endif # with python2 - %if %{with python3} %post -n python3-abrt-addon %journal_catalog_update @@ -777,25 +661,15 @@ if [ -f /etc/abrt/plugins/CCpp.conf ]; then mv /etc/abrt/plugins/CCpp.conf /etc/abrt/plugins/CCpp.conf.rpmsave.atomic || exit 1; fi ln -sf /etc/abrt/plugins/CCpp_Atomic.conf /etc/abrt/plugins/CCpp.conf -if [ -f /usr/share/abrt/conf.d/plugins/CCpp.conf ]; then - mv /usr/share/abrt/conf.d/plugins/CCpp.conf /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic || exit 1; -fi -ln -sf /usr/share/abrt/conf.d/plugins/CCpp_Atomic.conf /usr/share/abrt/conf.d/plugins/CCpp.conf %systemd_post abrt-coredump-helper.service %preun atomic if [ -L /etc/abrt/plugins/CCpp.conf ]; then rm /etc/abrt/plugins/CCpp.conf fi -if [ -L /usr/share/abrt/conf.d/plugins/CCpp.conf ]; then - rm /usr/share/abrt/conf.d/plugins/CCpp.conf -fi if [ -f /etc/abrt/plugins/CCpp.conf.rpmsave.atomic ]; then mv /etc/abrt/plugins/CCpp.conf.rpmsave.atomic /etc/abrt/plugins/CCpp.conf || exit 1 fi -if [ -f /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic ]; then - mv /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic /usr/share/abrt/conf.d/plugins/CCpp.conf || exit 1 -fi %postun atomic %systemd_postun_with_restart abrt-coredump-helper.service @@ -896,12 +770,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-action-analyze-xorg %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.problems.daemon.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf -%{_datadir}/%{name}/conf.d/abrt-action-save-package-data.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf -%{_datadir}/%{name}/conf.d/plugins/xorg.conf %{_mandir}/man5/abrt-xorg.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys.conf -%{_datadir}/%{name}/conf.d/gpg_keys.conf %{_mandir}/man5/gpg_keys.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf %{_mandir}/man5/abrt_event.conf.5* @@ -928,13 +799,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %files libs %{_libdir}/libabrt.so.* %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf -%{_datadir}/%{name}/conf.d/abrt.conf %{_mandir}/man5/abrt.conf.5* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/conf.d -%dir %{_datadir}/%{name}/conf.d/plugins # filesystem package should own /usr/share/augeas/lenses directory %{_datadir}/augeas/lenses/abrt.aug @@ -962,8 +829,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %{_datadir}/%{name} # all glade, gtkbuilder and py files for gui %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/icons/hicolor/*/status/* -%{_datadir}/%{name}/icons/hicolor/*/status/* %{_datadir}/%{name}/ui/* %{_bindir}/abrt-applet %{_bindir}/system-config-abrt @@ -981,7 +846,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %files addon-ccpp %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf -%{_datadir}/%{name}/conf.d/plugins/CCpp.conf %{_mandir}/man5/abrt-CCpp.conf.5* %{_libexecdir}/abrt-gdb-exploitable %{_journalcatalogdir}/abrt_ccpp.catalog @@ -1053,7 +917,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_koops_format.conf %{_mandir}/man5/koops_event.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/plugins/oops.conf -%{_datadir}/%{name}/conf.d/plugins/oops.conf %{_unitdir}/abrt-oops.service %dir %{_localstatedir}/lib/abrt @@ -1081,7 +944,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf %{_mandir}/man5/vmcore_event.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/plugins/vmcore.conf -%{_datadir}/%{name}/conf.d/plugins/vmcore.conf %{_datadir}/libreport/events/analyze_VMcore.xml %{_unitdir}/abrt-vmcore.service %{_sbindir}/abrt-harvest-vmcore @@ -1102,30 +964,12 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-harvest-pstoreoops.1* %{_mandir}/man1/abrt-merge-pstoreoops.1* -%if %{with python2} -%files -n python2-abrt-addon -%config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf -%{_datadir}/%{name}/conf.d/plugins/python.conf -%{_mandir}/man5/abrt-python.conf.5* -%config(noreplace) %{_sysconfdir}/libreport/events.d/python_event.conf -%{_journalcatalogdir}/abrt_python.catalog -%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python_format.conf -%{_mandir}/man5/python_event.conf.5* -%{python2_sitearch}/abrt.pth -%{python2_sitearch}/abrt_exception_handler.* - -%files -n python2-abrt-container-addon -%{python2_sitearch}/abrt_container.pth -%{python2_sitearch}/abrt_exception_handler_container.* -%endif # with python2 - %if %{with python3} %files -n python3-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf -%{_datadir}/%{name}/conf.d/plugins/python3.conf -%{_mandir}/man5/abrt-python3.conf.5* +%{_mandir}/man5/python3-abrt.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/python3_event.conf -%{_journalcatalogdir}/abrt_python3.catalog +%{_journalcatalogdir}/python3_abrt.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %{_mandir}/man5/python3_event.conf.5* %{python3_sitearch}/abrt3.pth @@ -1165,7 +1009,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %files atomic %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf %{_unitdir}/abrt-coredump-helper.service -%{_datadir}/%{name}/conf.d/plugins/CCpp_Atomic.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf %{_bindir}/abrt-action-save-package-data %{_mandir}/man1/abrt-action-save-package-data.1* @@ -1196,9 +1039,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml -%if %{with python2} -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python.xml -%endif # with python2 %if %{with python3} %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml %endif # with python3 @@ -1213,19 +1053,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.css %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf -%if %{with python2} -%files -n python2-abrt -%{python2_sitearch}/problem/ -%{_mandir}/man5/abrt-python.5* - -%files -n python2-abrt-doc -%{python_sitelib}/problem_examples -%endif # with python2 - %if %{with python3} %files -n python3-abrt %{python3_sitearch}/problem/ -%{_mandir}/man5/abrt-python3.5* +%{_mandir}/man5/python3-abrt.5* %files -n python3-abrt-doc %{python3_sitelib}/problem_examples @@ -1235,6 +1066,47 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 03 2019 Martin Kutlak 2.12.1-1 +- Translation updates +- Rename all abrt-python to python3-abrt +- spec: Get rid of python provides +- hooks: abrt-hook-ccpp: Rename CreateCoreBacktrace setting +- Update icon +- non-fatal-mce: prepare oops1.test from template before using it +- meaningful-logs: check relative counts of lines instead of absolute +- oops-processing: fixed oops1.test handling. reworked so each oops has its own phase +- dumpoops: make sure hostname matches in oops_full_hostname.test +- Revert "applet: Add systemd service unit" +- a-a-analyze-c: Fix segfault when saving function name +- Fix grammar in implementation docs +- doc: Update man pages and mention locations of config files +- augeas,build,spec: Remove references to default configs +- daemon,lib: Update default config according to abrt.conf +- plugins: abrt-action-install-debuginfo: Replace uses of exit() +- plugins: abrt-action-install-debuginfo: Catch BrokenPipeError +- plugins: abrt-action-install-debuginfo: Remove unused imports +- daemon: Check return value after reading from channel +- spec: Require dbus-tools +- daemon: Don't process crashes from unpackaged apps by default +- plugins: abrt-action-install-debuginfo: Remove duplicate code +- plugins: abrt-action-install-debuginfo: Remove variable +- plugins: abrt-action-install-debuginfo: Remove comment +- plugins: abrt-action-install-debuginfo: Remove dead assignment +- doc: Fix spelling mistake in path to cache +- doc: Update man page for abrt-handle-upload +- doc: Update man page and help for a-a-install-debuginfo +- Nuke Python 2 support +- plugins: Catch unhandled exception in a-a-g-machine-id +- plugins: retrace-client: Bail out if we can’t get a config +- plugins: retrace-client: Default to HTTPS in RETRACE_SERVER_URI +- plugins: analyze_RetraceServer: Fix default RETRACE_SERVER_URI +- plugins: Fix name of env variable for retrace server +- configure.ac: Add dependency on libcap +- dbus: entry: Don’t claim truncation when there was none +- applet: Add systemd service unit +- spec: Remove obsolete scriptlets +- Makefile.am: Use correct locale when getting date + * Mon Jun 10 22:13:16 CET 2019 Igor Gnatenko - 2.12.0-4 - Rebuild for RPM 4.15 diff --git a/sources b/sources index 9217d6b..7f2ac7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.0.tar.gz) = 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded +SHA512 (abrt-2.12.1.tar.gz) = e5a8ceed76c152523932bfa626e20ce110ecd7d1c87b421ef99986c4782f537b1e4af6d93d73abca7187a7d67592a4b820bd3bcc93f02bc7ee025054eacb5738 From ba28be0b0f3382158302ea47d2b7ed49e629fa8d Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Wed, 3 Jul 2019 17:45:54 +0200 Subject: [PATCH 024/125] New upstream release version 2.12.1 * Remove gen-version from spec - This is upstream script to generate version. This is not needed in dist-git. [2.12.1] Added - Require dbus-tools for dbus-send command. Changed - ABRT won't process crashes coming from unpackaged applications by default. - Completely removed support for Python2. - Update new ABRT icon. - retrace-client defaults to https. - Updated man pages. - Removed configurations from /usr/share/abrt. - Removed provides for abrt-python packages. Fixed - Gracefully handle exceptions comming from abrt-action-generate-machine-id. - Gracefully handle exceptions comming from abrt-action-install-debuginfo. - Use correct name of environment variable for retrace-server. Signed-off-by: Martin Kutlak --- .gitignore | 1 + abrt.spec | 222 ++++++++++++----------------------------------------- sources | 2 +- 3 files changed, 49 insertions(+), 176 deletions(-) diff --git a/.gitignore b/.gitignore index 16e185b..740a5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ abrt-1.1.13.tar.gz /abrt-2.11.0.tar.gz /abrt-2.11.1.tar.gz /abrt-2.12.0.tar.gz +/abrt-2.12.1.tar.gz diff --git a/abrt.spec b/abrt.spec index 3730820..54021a4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -9,13 +9,6 @@ %bcond_with python3 %endif -%if 0%{?rhel} > 7 || 0%{?fedora} > 28 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - %if 0%{?rhel}%{?suse_version} %bcond_with bodhi %else @@ -52,8 +45,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.12.1 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -79,13 +72,6 @@ BuildRequires: libreport-devel >= %{libreport_ver} BuildRequires: satyr-devel >= %{satyr_ver} BuildRequires: augeas BuildRequires: libselinux-devel -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-systemd -BuildRequires: python2-argcomplete -BuildRequires: python2-argh -BuildRequires: python2-humanize -%endif # with python2 %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-systemd @@ -111,11 +97,6 @@ Requires(pre): %{shadow_utils} %if %{with python3} Requires: python3-augeas Requires: python3-dbus -%else -%if %{with python2} -Requires: python2-augeas -Requires: python2-dbus -%endif # with python2 %endif # with python3 %ifarch aarch64 i686 x86_64 Requires: dmidecode @@ -146,13 +127,6 @@ BuildRequires: libreport-web-devel >= %{libreport_ver} BuildRequires: gdb-headless #dbus BuildRequires: polkit-devel -%if %{with python2} -#python2-abrt -BuildRequires: python2-sphinx -BuildRequires: python2-libreport -#python2-abrt-doc -BuildRequires: python2-devel -%endif # with python2 %if %{with python3} #python3-abrt BuildRequires: python3-nose @@ -231,10 +205,6 @@ Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} %if %{with python3} Requires: python3-libreport -%else -%if %{with python2} -Requires: python2-libreport -%endif # with python2 %endif # with python3 @@ -292,11 +262,6 @@ Requires: kexec-tools %if %{with python3} Requires: python3-abrt Requires: python3-augeas -%else -%if %{with python2} -Requires: python2-abrt -Requires: python2-augeas -%endif # with python2 %endif # with python3 Requires: util-linux @@ -325,41 +290,12 @@ Provides: libreport-plugin-bodhi = %{version}-%{release} Search for a new updates in bodhi server. %endif -%if %{with python2} -%package -n python2-abrt-addon -Summary: %{name}'s addon for catching and analyzing Python exceptions -Requires: %{name} = %{version}-%{release} -Requires: python2-systemd -Requires: python2-abrt -# Remove before F30 -Provides: abrt-addon-python = %{version}-%{release} -Provides: abrt-addon-python%{?_isa} = %{version}-%{release} -Obsoletes: abrt-addon-python < 2.10.4 - -%description -n python2-abrt-addon -This package contains python hook and python analyzer plugin for handling -uncaught exception in python programs. - -%package -n python2-abrt-container-addon -Summary: %{name}'s container addon for catching Python 2 exceptions -Conflicts: python2-abrt-addon -Requires: container-exception-logger - -%description -n python2-abrt-container-addon -This package contains python 2 hook and handling uncaught exception in python 2 -programs in container. -%endif # with python2 - %if %{with python3} %package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions Requires: %{name} = %{version}-%{release} Requires: python3-systemd Requires: python3-abrt -# Remove before F30 -Provides: abrt-addon-python3 = %{version}-%{release} -Provides: abrt-addon-python3%{?_isa} = %{version}-%{release} -Obsoletes: abrt-addon-python3 < 2.10.4 %description -n python3-abrt-addon This package contains python 3 hook and python analyzer plugin for handling @@ -513,47 +449,12 @@ hosts. Summary: ABRT DBus service Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} +Requires: dbus-tools %description dbus ABRT DBus service which provides org.freedesktop.problems API on dbus and uses PolicyKit to authorize to access the problem data. -%if %{with python2} -%package -n python2-abrt -Summary: ABRT Python API -Requires: %{name} = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-dbus = %{version}-%{release} -Requires: python2-dbus -Requires: python2-libreport -%if 0%{?rhel:%{rhel} == 7} -Requires: python-gobject-base -%else -Requires: python2-gobject-base -%endif -%{?python_provide:%python_provide python2-abrt} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < 2.10.4 - -%description -n python2-abrt -High-level API for querying, creating and manipulating -problems handled by ABRT in Python. - -%package -n python2-abrt-doc -Summary: ABRT Python API Documentation -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: python2-abrt = %{version}-%{release} -# Remove before F30 -Provides: %{name}-python-doc = %{version}-%{release} -Obsoletes: %{name}-python-doc < 2.10.4 - -%description -n python2-abrt-doc -Examples and documentation for ABRT Python API. -%endif # with python2 - %if %{with python3} %package -n python3-abrt Summary: ABRT Python 3 API @@ -562,11 +463,6 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-dbus Requires: python3-libreport -%{?python_provide:%python_provide python3-abrt} -# Remove before F30 -Provides: %{name}-python3 = %{version}-%{release} -Provides: %{name}-python3%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python3 < 2.10.4 Requires: python3-gobject-base %description -n python3-abrt @@ -578,9 +474,6 @@ Summary: ABRT Python API Documentation BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release} -# Remove before F30 -Provides: %{name}-python3-doc = %{version}-%{release} -Obsoletes: %{name}-python3-doc < 2.10.4 %description -n python3-abrt-doc Examples and documentation for ABRT Python 3 API. @@ -602,14 +495,10 @@ to the shell %build %define var_base_dir spool -./gen-version autoreconf -if intltoolize --automake -c -f %configure \ -%if %{without python2} - --without-python2 \ -%endif # with python2 %if %{without python3} --without-python3 \ %endif # with python3 @@ -703,11 +592,6 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %systemd_post abrt-xorg.service %journal_catalog_update -%if %{with python2} -%post -n python2-abrt-addon -%journal_catalog_update -%endif # with python2 - %if %{with python3} %post -n python3-abrt-addon %journal_catalog_update @@ -777,25 +661,15 @@ if [ -f /etc/abrt/plugins/CCpp.conf ]; then mv /etc/abrt/plugins/CCpp.conf /etc/abrt/plugins/CCpp.conf.rpmsave.atomic || exit 1; fi ln -sf /etc/abrt/plugins/CCpp_Atomic.conf /etc/abrt/plugins/CCpp.conf -if [ -f /usr/share/abrt/conf.d/plugins/CCpp.conf ]; then - mv /usr/share/abrt/conf.d/plugins/CCpp.conf /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic || exit 1; -fi -ln -sf /usr/share/abrt/conf.d/plugins/CCpp_Atomic.conf /usr/share/abrt/conf.d/plugins/CCpp.conf %systemd_post abrt-coredump-helper.service %preun atomic if [ -L /etc/abrt/plugins/CCpp.conf ]; then rm /etc/abrt/plugins/CCpp.conf fi -if [ -L /usr/share/abrt/conf.d/plugins/CCpp.conf ]; then - rm /usr/share/abrt/conf.d/plugins/CCpp.conf -fi if [ -f /etc/abrt/plugins/CCpp.conf.rpmsave.atomic ]; then mv /etc/abrt/plugins/CCpp.conf.rpmsave.atomic /etc/abrt/plugins/CCpp.conf || exit 1 fi -if [ -f /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic ]; then - mv /usr/share/abrt/conf.d/plugins/CCpp.conf.rpmsave.atomic /usr/share/abrt/conf.d/plugins/CCpp.conf || exit 1 -fi %postun atomic %systemd_postun_with_restart abrt-coredump-helper.service @@ -905,12 +779,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-action-analyze-xorg %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.problems.daemon.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf -%{_datadir}/%{name}/conf.d/abrt-action-save-package-data.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf -%{_datadir}/%{name}/conf.d/plugins/xorg.conf %{_mandir}/man5/abrt-xorg.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys.conf -%{_datadir}/%{name}/conf.d/gpg_keys.conf %{_mandir}/man5/gpg_keys.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf %{_mandir}/man5/abrt_event.conf.5* @@ -937,13 +808,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %files libs %{_libdir}/libabrt.so.* %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf -%{_datadir}/%{name}/conf.d/abrt.conf %{_mandir}/man5/abrt.conf.5* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/conf.d -%dir %{_datadir}/%{name}/conf.d/plugins # filesystem package should own /usr/share/augeas/lenses directory %{_datadir}/augeas/lenses/abrt.aug @@ -971,8 +838,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %{_datadir}/%{name} # all glade, gtkbuilder and py files for gui %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/icons/hicolor/*/status/* -%{_datadir}/%{name}/icons/hicolor/*/status/* %{_datadir}/%{name}/ui/* %{_bindir}/abrt-applet %{_bindir}/system-config-abrt @@ -990,7 +855,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %files addon-ccpp %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf -%{_datadir}/%{name}/conf.d/plugins/CCpp.conf %{_mandir}/man5/abrt-CCpp.conf.5* %{_libexecdir}/abrt-gdb-exploitable %{_journalcatalogdir}/abrt_ccpp.catalog @@ -1062,7 +926,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_koops_format.conf %{_mandir}/man5/koops_event.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/plugins/oops.conf -%{_datadir}/%{name}/conf.d/plugins/oops.conf %{_unitdir}/abrt-oops.service %dir %{_localstatedir}/lib/abrt @@ -1090,7 +953,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf %{_mandir}/man5/vmcore_event.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/plugins/vmcore.conf -%{_datadir}/%{name}/conf.d/plugins/vmcore.conf %{_datadir}/libreport/events/analyze_VMcore.xml %{_unitdir}/abrt-vmcore.service %{_sbindir}/abrt-harvest-vmcore @@ -1111,30 +973,12 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-harvest-pstoreoops.1* %{_mandir}/man1/abrt-merge-pstoreoops.1* -%if %{with python2} -%files -n python2-abrt-addon -%config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf -%{_datadir}/%{name}/conf.d/plugins/python.conf -%{_mandir}/man5/abrt-python.conf.5* -%config(noreplace) %{_sysconfdir}/libreport/events.d/python_event.conf -%{_journalcatalogdir}/abrt_python.catalog -%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python_format.conf -%{_mandir}/man5/python_event.conf.5* -%{python2_sitearch}/abrt.pth -%{python2_sitearch}/abrt_exception_handler.* - -%files -n python2-abrt-container-addon -%{python2_sitearch}/abrt_container.pth -%{python2_sitearch}/abrt_exception_handler_container.* -%endif # with python2 - %if %{with python3} %files -n python3-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf -%{_datadir}/%{name}/conf.d/plugins/python3.conf -%{_mandir}/man5/abrt-python3.conf.5* +%{_mandir}/man5/python3-abrt.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/python3_event.conf -%{_journalcatalogdir}/abrt_python3.catalog +%{_journalcatalogdir}/python3_abrt.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %{_mandir}/man5/python3_event.conf.5* %{python3_sitearch}/abrt3.pth @@ -1174,7 +1018,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %files atomic %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf %{_unitdir}/abrt-coredump-helper.service -%{_datadir}/%{name}/conf.d/plugins/CCpp_Atomic.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf %{_bindir}/abrt-action-save-package-data %{_mandir}/man1/abrt-action-save-package-data.1* @@ -1205,9 +1048,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml -%if %{with python2} -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python.xml -%endif # with python2 %if %{with python3} %{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml %endif # with python3 @@ -1222,19 +1062,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.css %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf -%if %{with python2} -%files -n python2-abrt -%{python2_sitearch}/problem/ -%{_mandir}/man5/abrt-python.5* - -%files -n python2-abrt-doc -%{python_sitelib}/problem_examples -%endif # with python2 - %if %{with python3} %files -n python3-abrt %{python3_sitearch}/problem/ -%{_mandir}/man5/abrt-python3.5* +%{_mandir}/man5/python3-abrt.5* %files -n python3-abrt-doc %{python3_sitelib}/problem_examples @@ -1244,6 +1075,47 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 03 2019 Martin Kutlak 2.12.1-1 +- Translation updates +- Rename all abrt-python to python3-abrt +- spec: Get rid of python provides +- hooks: abrt-hook-ccpp: Rename CreateCoreBacktrace setting +- Update icon +- non-fatal-mce: prepare oops1.test from template before using it +- meaningful-logs: check relative counts of lines instead of absolute +- oops-processing: fixed oops1.test handling. reworked so each oops has its own phase +- dumpoops: make sure hostname matches in oops_full_hostname.test +- Revert "applet: Add systemd service unit" +- a-a-analyze-c: Fix segfault when saving function name +- Fix grammar in implementation docs +- doc: Update man pages and mention locations of config files +- augeas,build,spec: Remove references to default configs +- daemon,lib: Update default config according to abrt.conf +- plugins: abrt-action-install-debuginfo: Replace uses of exit() +- plugins: abrt-action-install-debuginfo: Catch BrokenPipeError +- plugins: abrt-action-install-debuginfo: Remove unused imports +- daemon: Check return value after reading from channel +- spec: Require dbus-tools +- daemon: Don't process crashes from unpackaged apps by default +- plugins: abrt-action-install-debuginfo: Remove duplicate code +- plugins: abrt-action-install-debuginfo: Remove variable +- plugins: abrt-action-install-debuginfo: Remove comment +- plugins: abrt-action-install-debuginfo: Remove dead assignment +- doc: Fix spelling mistake in path to cache +- doc: Update man page for abrt-handle-upload +- doc: Update man page and help for a-a-install-debuginfo +- Nuke Python 2 support +- plugins: Catch unhandled exception in a-a-g-machine-id +- plugins: retrace-client: Bail out if we can’t get a config +- plugins: retrace-client: Default to HTTPS in RETRACE_SERVER_URI +- plugins: analyze_RetraceServer: Fix default RETRACE_SERVER_URI +- plugins: Fix name of env variable for retrace server +- configure.ac: Add dependency on libcap +- dbus: entry: Don’t claim truncation when there was none +- applet: Add systemd service unit +- spec: Remove obsolete scriptlets +- Makefile.am: Use correct locale when getting date + * Tue Feb 5 2019 Ernestas Kulik - 2.12.0-2 - Bump glib and libreport dependencies diff --git a/sources b/sources index 9217d6b..7f2ac7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.0.tar.gz) = 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded +SHA512 (abrt-2.12.1.tar.gz) = e5a8ceed76c152523932bfa626e20ce110ecd7d1c87b421ef99986c4782f537b1e4af6d93d73abca7187a7d67592a4b820bd3bcc93f02bc7ee025054eacb5738 From a2c5fdd9e893b0705a291d3281c1448ec3a2aa5b Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Fri, 12 Jul 2019 17:36:43 +0200 Subject: [PATCH 025/125] Add patch to fix failing a-a-list-dsos on rawhide Signed-off-by: Martin Kutlak --- ...-dsos-Add-check-for-decode-attribute.patch | 54 +++++++++++++++++++ abrt.spec | 8 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0001-a-a-list-dsos-Add-check-for-decode-attribute.patch diff --git a/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch b/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch new file mode 100644 index 0000000..4fac1dd --- /dev/null +++ b/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch @@ -0,0 +1,54 @@ +From b7ce0f017fd5d98b7c641a2784e9b1c4c9dec834 Mon Sep 17 00:00:00 2001 +From: Martin Kutlak +Date: Fri, 12 Jul 2019 16:44:19 +0200 +Subject: [PATCH] a-a-list-dsos: Add check for decode attribute + +rpm used to return bytes but that was changed to return strings in recent release. + +The check for decode attribute keeps compatibility with older fedora releases. + +This can be removed in the future with rpm 4.15(?) + +Related: rhbz#1693751 +Resolves: rhbz#1694970 + +Signed-off-by: Martin Kutlak +--- + src/plugins/abrt-action-list-dsos | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos +index adb228a41..5d1240cb4 100644 +--- a/src/plugins/abrt-action-list-dsos ++++ b/src/plugins/abrt-action-list-dsos +@@ -84,15 +84,21 @@ if __name__ == "__main__": + outname = None + + vendor = h[rpm.RPMTAG_VENDOR] +- if vendor != None: ++ if vendor is not None and hasattr(vendor, 'decode'): + vendor = vendor.decode('utf-8') + ++ rpmtag_nevra = h[rpm.RPMTAG_NEVRA] ++ # FIXME change from bugzilla #1693751 ++ # can be removed with rpm 4.15 ++ if hasattr(rpmtag_nevra, 'decode'): ++ rpmtag_nevra = rpmtag_nevra.decode('utf-8') ++ + outfile.write("%s %s (%s) %s\n" % +- (path, +- h[rpm.RPMTAG_NEVRA].decode('utf-8'), +- vendor, +- h[rpm.RPMTAG_INSTALLTIME]) +- ) ++ (path, ++ rpmtag_nevra, ++ vendor, ++ h[rpm.RPMTAG_INSTALLTIME]) ++ ) + + except Exception as ex: + error_msg_and_die("Can't get the DSO list: %s" % ex) +-- +2.21.0 + diff --git a/abrt.spec b/abrt.spec index 6b46536..ce34b09 100644 --- a/abrt.spec +++ b/abrt.spec @@ -46,10 +46,13 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz + +Patch0001: 0001-a-a-list-dsos-Add-check-for-decode-attribute.patch + BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -1066,6 +1069,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Jul 12 2019 Martin Kutlak 2.12.1-2 +- Add patch to fix failing action abrt-action-list-dsos on rawhide + * Wed Jul 03 2019 Martin Kutlak 2.12.1-1 - Translation updates - Rename all abrt-python to python3-abrt From 3e5d6a98efb839819645c8a6b651e4191cccc96f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:28:02 +0000 Subject: [PATCH 026/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index ce34b09..15153f1 100644 --- a/abrt.spec +++ b/abrt.spec @@ -46,7 +46,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1069,6 +1069,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jul 12 2019 Martin Kutlak 2.12.1-2 - Add patch to fix failing action abrt-action-list-dsos on rawhide From 2e900184c438bb0713ed515e5090f1e6bade632e Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Thu, 1 Aug 2019 14:13:10 +0200 Subject: [PATCH 027/125] Update to 2.12.2 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + abrt.spec | 35 ++++++++++++++++------------------- sources | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 740a5ff..2b791ec 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ abrt-1.1.13.tar.gz /abrt-2.11.1.tar.gz /abrt-2.12.0.tar.gz /abrt-2.12.1.tar.gz +/abrt-2.12.2.tar.gz diff --git a/abrt.spec b/abrt.spec index 54021a4..e369643 100644 --- a/abrt.spec +++ b/abrt.spec @@ -45,7 +45,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.1 +Version: 2.12.2 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -334,28 +334,21 @@ Requires: %{name} = %{version}-%{release} Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release} Requires: abrt-dbus - -%description tui -This package contains a simple command line client for processing abrt reports -in command line environment. - %if %{with python3} -%package cli-ng -Summary: %{name}'s improved command line interface -Requires: %{name} = %{version}-%{release} -Requires: libreport-cli >= %{libreport_ver} -Requires: abrt-libs = %{version}-%{release} -Requires: abrt-dbus Requires: python3-abrt Requires: abrt-addon-ccpp Requires: python3-argh Requires: python3-argcomplete Requires: python3-humanize -%description cli-ng -New generation command line interface for ABRT +Provides: %{name}-cli-ng = %{version}-%{release} +Obsoletes: %{name}-cli-ng < 2.12.2 %endif # with python3 +%description tui +This package contains a simple command line client for processing abrt reports +in command line environment. + %package cli Summary: Virtual package to make easy default installation on non-graphical environments Requires: %{name} = %{version}-%{release} @@ -509,7 +502,6 @@ intltoolize --automake -c -f --without-atomic \ %endif %if 0%{?rhel} - --enable-suggest-autoreporting \ --enable-authenticated-autoreporting \ %endif %ifnarch %{arm} @@ -552,6 +544,10 @@ desktop-file-install \ src/applet/org.freedesktop.problems.applet.desktop ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +%if %{with python3} +ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli +ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1 +%endif # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir @@ -1001,15 +997,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %files cli %files tui -%{_bindir}/abrt-cli -%{_mandir}/man1/abrt-cli.1* - %if %{with python3} -%files cli-ng %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion %{_bindir}/abrt +%{_bindir}/abrt-cli %{python3_sitearch}/abrtcli/ %{_mandir}/man1/abrt.1* +%{_mandir}/man1/abrt-cli.1* %endif # with python3 %files desktop @@ -1075,6 +1069,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Aug 01 2019 Ernestas Kulik 2.12.2-1 +- Remove old CLI and move cli-ng subpackage files into tui subpackage + * Wed Jul 03 2019 Martin Kutlak 2.12.1-1 - Translation updates - Rename all abrt-python to python3-abrt diff --git a/sources b/sources index 7f2ac7a..8be0927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.1.tar.gz) = e5a8ceed76c152523932bfa626e20ce110ecd7d1c87b421ef99986c4782f537b1e4af6d93d73abca7187a7d67592a4b820bd3bcc93f02bc7ee025054eacb5738 +SHA512 (abrt-2.12.2.tar.gz) = 8a6c1d718cce43a94de1d397d8a6bc9c24bb100081c9e4d4e9fb0441356991e3e8d7da066212ebbee8774e3a416c0e41e17713ced5ffb0c1f63588527e7dc983 From df2a70c73bebb02f791dbc2735e7ef4ea41c3338 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Thu, 1 Aug 2019 14:13:10 +0200 Subject: [PATCH 028/125] Update to 2.12.2 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + ...-dsos-Add-check-for-decode-attribute.patch | 54 ------------------- abrt.spec | 39 ++++++-------- sources | 2 +- 4 files changed, 19 insertions(+), 77 deletions(-) delete mode 100644 0001-a-a-list-dsos-Add-check-for-decode-attribute.patch diff --git a/.gitignore b/.gitignore index 740a5ff..2b791ec 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ abrt-1.1.13.tar.gz /abrt-2.11.1.tar.gz /abrt-2.12.0.tar.gz /abrt-2.12.1.tar.gz +/abrt-2.12.2.tar.gz diff --git a/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch b/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch deleted file mode 100644 index 4fac1dd..0000000 --- a/0001-a-a-list-dsos-Add-check-for-decode-attribute.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b7ce0f017fd5d98b7c641a2784e9b1c4c9dec834 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Fri, 12 Jul 2019 16:44:19 +0200 -Subject: [PATCH] a-a-list-dsos: Add check for decode attribute - -rpm used to return bytes but that was changed to return strings in recent release. - -The check for decode attribute keeps compatibility with older fedora releases. - -This can be removed in the future with rpm 4.15(?) - -Related: rhbz#1693751 -Resolves: rhbz#1694970 - -Signed-off-by: Martin Kutlak ---- - src/plugins/abrt-action-list-dsos | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos -index adb228a41..5d1240cb4 100644 ---- a/src/plugins/abrt-action-list-dsos -+++ b/src/plugins/abrt-action-list-dsos -@@ -84,15 +84,21 @@ if __name__ == "__main__": - outname = None - - vendor = h[rpm.RPMTAG_VENDOR] -- if vendor != None: -+ if vendor is not None and hasattr(vendor, 'decode'): - vendor = vendor.decode('utf-8') - -+ rpmtag_nevra = h[rpm.RPMTAG_NEVRA] -+ # FIXME change from bugzilla #1693751 -+ # can be removed with rpm 4.15 -+ if hasattr(rpmtag_nevra, 'decode'): -+ rpmtag_nevra = rpmtag_nevra.decode('utf-8') -+ - outfile.write("%s %s (%s) %s\n" % -- (path, -- h[rpm.RPMTAG_NEVRA].decode('utf-8'), -- vendor, -- h[rpm.RPMTAG_INSTALLTIME]) -- ) -+ (path, -+ rpmtag_nevra, -+ vendor, -+ h[rpm.RPMTAG_INSTALLTIME]) -+ ) - - except Exception as ex: - error_msg_and_die("Can't get the DSO list: %s" % ex) --- -2.21.0 - diff --git a/abrt.spec b/abrt.spec index 15153f1..4c8ad94 100644 --- a/abrt.spec +++ b/abrt.spec @@ -45,14 +45,12 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.1 -Release: 3%{?dist} +Version: 2.12.2 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0001: 0001-a-a-list-dsos-Add-check-for-decode-attribute.patch - BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -336,28 +334,21 @@ Requires: %{name} = %{version}-%{release} Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release} Requires: abrt-dbus - -%description tui -This package contains a simple command line client for processing abrt reports -in command line environment. - %if %{with python3} -%package cli-ng -Summary: %{name}'s improved command line interface -Requires: %{name} = %{version}-%{release} -Requires: libreport-cli >= %{libreport_ver} -Requires: abrt-libs = %{version}-%{release} -Requires: abrt-dbus Requires: python3-abrt Requires: abrt-addon-ccpp Requires: python3-argh Requires: python3-argcomplete Requires: python3-humanize -%description cli-ng -New generation command line interface for ABRT +Provides: %{name}-cli-ng = %{version}-%{release} +Obsoletes: %{name}-cli-ng < 2.12.2 %endif # with python3 +%description tui +This package contains a simple command line client for processing abrt reports +in command line environment. + %package cli Summary: Virtual package to make easy default installation on non-graphical environments Requires: %{name} = %{version}-%{release} @@ -512,7 +503,6 @@ intltoolize --automake -c -f --without-atomic \ %endif %if 0%{?rhel} - --enable-suggest-autoreporting \ --enable-authenticated-autoreporting \ %endif %ifnarch %{arm} @@ -555,6 +545,10 @@ desktop-file-install \ src/applet/org.freedesktop.problems.applet.desktop ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +%if %{with python3} +ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli +ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1 +%endif # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir @@ -995,15 +989,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %files cli %files tui -%{_bindir}/abrt-cli -%{_mandir}/man1/abrt-cli.1* - %if %{with python3} -%files cli-ng %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion %{_bindir}/abrt +%{_bindir}/abrt-cli %{python3_sitearch}/abrtcli/ %{_mandir}/man1/abrt.1* +%{_mandir}/man1/abrt-cli.1* %endif # with python3 %files desktop @@ -1069,6 +1061,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Aug 01 2019 Ernestas Kulik 2.12.2-1 +- Remove old CLI and move cli-ng subpackage files into tui subpackage + * Wed Jul 24 2019 Fedora Release Engineering - 2.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7f2ac7a..8be0927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.1.tar.gz) = e5a8ceed76c152523932bfa626e20ce110ecd7d1c87b421ef99986c4782f537b1e4af6d93d73abca7187a7d67592a4b820bd3bcc93f02bc7ee025054eacb5738 +SHA512 (abrt-2.12.2.tar.gz) = 8a6c1d718cce43a94de1d397d8a6bc9c24bb100081c9e4d4e9fb0441356991e3e8d7da066212ebbee8774e3a416c0e41e17713ced5ffb0c1f63588527e7dc983 From 9e6bef580fbe273c903be21b2b518213ef676381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 17 Aug 2019 18:45:15 +0200 Subject: [PATCH 029/125] Rebuilt for Python 3.8 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 4c8ad94..ad1d318 100644 --- a/abrt.spec +++ b/abrt.spec @@ -46,7 +46,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1061,6 +1061,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sat Aug 17 2019 Miro Hrončok - 2.12.2-2 +- Rebuilt for Python 3.8 + * Thu Aug 01 2019 Ernestas Kulik 2.12.2-1 - Remove old CLI and move cli-ng subpackage files into tui subpackage From f182793f3355d323faa56443194c997e3dde01ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:50:11 +0200 Subject: [PATCH 030/125] Rebuilt for Python 3.8.0rc1 (#1748018) --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index ad1d318..c098184 100644 --- a/abrt.spec +++ b/abrt.spec @@ -46,7 +46,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.12.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1061,6 +1061,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Oct 03 2019 Miro Hrončok - 2.12.2-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Sat Aug 17 2019 Miro Hrončok - 2.12.2-2 - Rebuilt for Python 3.8 From ac861159cab4f29355901516c41ac19d7ba4fd79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Fri, 11 Oct 2019 16:32:47 +0200 Subject: [PATCH 031/125] New upstream release 2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matěj Grabovský --- .gitignore | 1 + abrt.spec | 174 +++++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 83 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 2b791ec..6268042 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ abrt-1.1.13.tar.gz /abrt-2.12.0.tar.gz /abrt-2.12.1.tar.gz /abrt-2.12.2.tar.gz +/abrt-2.13.0.tar.gz diff --git a/abrt.spec b/abrt.spec index c098184..84963b2 100644 --- a/abrt.spec +++ b/abrt.spec @@ -18,6 +18,9 @@ # build abrt-atomic subpackage %bcond_without atomic +# build abrt-retrace-client by default +%bcond_without retrace + # rpmbuild --define 'desktopvendor mystring' %if "x%{desktopvendor}" == "x" %define desktopvendor %(source /etc/os-release; echo ${ID}) @@ -45,8 +48,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.2 -Release: 3%{?dist} +Version: 2.13.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -76,9 +79,6 @@ BuildRequires: libselinux-devel BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete -BuildRequires: python3-argh -BuildRequires: python3-humanize -BuildRequires: python3-devel %endif # with python3 Requires: libreport >= %{libreport_ver} @@ -184,28 +184,23 @@ Requires: abrt-gui-libs = %{version}-%{release} %description gui GTK+ wizard for convenient bug reporting. -%package addon-coredump-helper -Summary: %{name}'s /proc/sys/kernel/core_pattern helper -Requires: abrt-libs = %{version}-%{release} - -%description addon-coredump-helper -This package contains hook for C/C++ crashed programs. - %package addon-ccpp Summary: %{name}'s C/C++ addon Requires: cpio Requires: gdb-headless Requires: elfutils %if 0%{!?rhel:1} +%if %{with retrace} # abrt-action-perform-ccpp-analysis wants to run analyze_RetraceServer: Requires: %{name}-retrace-client %endif +%endif Requires: %{name} = %{version}-%{release} -Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} %if %{with python3} Requires: python3-libreport %endif # with python3 +Obsoletes: abrt-addon-coredump-helper <= 2.12.2 %description addon-ccpp @@ -219,6 +214,7 @@ Requires: abrt-libs = %{version}-%{release} %description addon-upload-watch This package contains hook for uploaded problems. +%if %{with retrace} %package retrace-client Summary: %{name}'s retrace client Requires: %{name} = %{version}-%{release} @@ -230,6 +226,7 @@ Requires: libsoup %description retrace-client This package contains the client application for Retrace server which is able to analyze C/C++ crashes remotely. +%endif %package addon-kerneloops Summary: %{name}'s kerneloops addon @@ -293,6 +290,7 @@ Search for a new updates in bodhi server. %if %{with python3} %package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: python3-systemd Requires: python3-abrt @@ -337,9 +335,7 @@ Requires: abrt-dbus %if %{with python3} Requires: python3-abrt Requires: abrt-addon-ccpp -Requires: python3-argh Requires: python3-argcomplete -Requires: python3-humanize Provides: %{name}-cli-ng = %{version}-%{release} Obsoletes: %{name}-cli-ng < 2.12.2 @@ -365,7 +361,9 @@ Requires: abrt-addon-xorg Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} %else +%if %{with retrace} Requires: abrt-retrace-client +%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -406,7 +404,9 @@ Requires: gnome-abrt Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} %else +%if %{with retrace} Requires: abrt-retrace-client +%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -429,7 +429,6 @@ environment. %if %{with atomic} %package atomic Summary: Package to make easy default installation on Atomic hosts. -Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Conflicts: %{name}-addon-ccpp @@ -487,12 +486,11 @@ to the shell %build -%define var_base_dir spool +autoconf -autoreconf -if -intltoolize --automake -c -f +%define default_dump_dir %{_localstatedir}/spool/abrt -%configure \ +CFLAGS="%{optflags} -Werror" %configure \ %if %{without python3} --without-python3 \ %endif # with python3 @@ -502,25 +500,27 @@ intltoolize --automake -c -f %if %{without atomic} --without-atomic \ %endif +%if %{without retrace} + --without-retrace \ +%endif %if 0%{?rhel} --enable-authenticated-autoreporting \ %endif %ifnarch %{arm} --enable-native-unwinder \ %endif - --with-defaultdumplocation=/var/%{var_base_dir}/abrt \ + --with-defaultdumplocation=%{default_dump_dir} \ --enable-doxygen-docs \ --enable-dump-time-unwind \ --disable-silent-rules -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT \ +%make_install \ %if %{with python3} PYTHON=%{__python3} \ %endif # with python3 - mandir=%{_mandir} \ dbusabrtdocdir=%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ %find_lang %{name} @@ -530,21 +530,21 @@ make install DESTDIR=$RPM_BUILD_ROOT \ # for those which needs to be byte-compiled with different # version (python2/python3). # rpm can do this work and use the appropriate python version. -find $RPM_BUILD_ROOT -name "*.py[co]" -delete +find %{buildroot} -name "*.py[co]" -delete # remove all .la and .a files -find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f -mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di -mkdir -p $RPM_BUILD_ROOT/var/run/abrt -mkdir -p $RPM_BUILD_ROOT/var/%{var_base_dir}/abrt -mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-upload -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/abrt +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f +mkdir -p %{buildroot}%{_localstatedir}/cache/abrt-di +mkdir -p %{buildroot}%{_localstatedir}/lib/abrt +mkdir -p %{buildroot}%{_localstatedir}/run/abrt +mkdir -p %{buildroot}%{_localstatedir}/spool/abrt-upload +mkdir -p %{buildroot}%{default_dump_dir} desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ src/applet/org.freedesktop.problems.applet.desktop -ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ %if %{with python3} ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1 @@ -577,7 +577,6 @@ exit 0 # because /cache/abrt-di/* was created under root with root:root # so 2.x fails when it tries to extract debuginfo there.. chown -R abrt:abrt %{_localstatedir}/cache/abrt-di -%systemd_post abrt-ccpp.service %systemd_post abrt-journal-core.service %journal_catalog_update @@ -657,8 +656,6 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : if [ -f /etc/abrt/plugins/CCpp.conf ]; then mv /etc/abrt/plugins/CCpp.conf /etc/abrt/plugins/CCpp.conf.rpmsave.atomic || exit 1; fi -ln -sf /etc/abrt/plugins/CCpp_Atomic.conf /etc/abrt/plugins/CCpp.conf -%systemd_post abrt-coredump-helper.service %preun atomic if [ -L /etc/abrt/plugins/CCpp.conf ]; then @@ -667,9 +664,6 @@ fi if [ -f /etc/abrt/plugins/CCpp.conf.rpmsave.atomic ]; then mv /etc/abrt/plugins/CCpp.conf.rpmsave.atomic /etc/abrt/plugins/CCpp.conf || exit 1 fi - -%postun atomic -%systemd_postun_with_restart abrt-coredump-helper.service %endif # with atomic %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -693,29 +687,11 @@ fi service abrtd condrestart >/dev/null 2>&1 || : %posttrans addon-ccpp -# Migrate from abrt-ccpp.service to abrt-journal-core.service -# 'systemctl preset abrt-ccpp.service abrt-journal-core.service' -# is done only for installation by %systemd_post macro but not for package -# upgrade. Following lines affect changes in Fedora preset files in case of -# package upgrade and also starts abrt-journal-core.service and stops -# abrt-ccpp.service if abrt-ccpp.service is running. -# All this has to be done only once because some users want to use -# abrt-ccpp.service instead of the default abrt-journal-core.service. -# Hence we introduced a %{_localstatedir}/lib/abrt/abrt-migrated file to -# mark the migration was done. -if test ! -f %{_localstatedir}/lib/abrt/abrt-migrated ; then - systemctl --no-reload preset abrt-ccpp.service >/dev/null 2>&1 || : - systemctl --no-reload preset abrt-journal-core.service >/dev/null 2>&1 || : - if service abrt-ccpp status >/dev/null 2>&1 ; then - systemctl stop abrt-ccpp >/dev/null 2>&1 || : - systemctl start abrt-journal-core >/dev/null 2>&1 || : - fi - touch %{_localstatedir}/lib/abrt/abrt-migrated +# Regenerate core_backtraces because of missing crash threads +abrtdir=$(grep "^\s*DumpLocation\b" /etc/abrt/abrt.conf | tail -1 | cut -d'=' -f2 | tr -d ' ') +if test -z "$abrtdir"; then + abrtdir=%{default_dump_dir} fi -systemctl try-restart abrt-journal-core >/dev/null 2>&1 || : -systemctl try-restart abrt-ccpp >/dev/null 2>&1 || : -# Regenerate core_bactraces because of missing crash threads -abrtdir=$(grep "DumpLocation" /etc/abrt/abrt.conf | cut -d'=' -f2 | tr -d ' ') if test -d "$abrtdir"; then for DD in `find "$abrtdir" -mindepth 1 -maxdepth 1 -type d` do @@ -766,16 +742,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-action-analyze-python %{_bindir}/abrt-action-analyze-xorg %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.problems.daemon.conf +%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf -%config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf -%{_mandir}/man5/abrt-xorg.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys.conf -%{_mandir}/man5/gpg_keys.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf %{_mandir}/man5/abrt_event.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf %{_mandir}/man5/smart_event.conf.5* -%dir %attr(0751, root, abrt) %{_localstatedir}/%{var_base_dir}/%{name} +%dir %attr(0751, root, abrt) %{default_dump_dir} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload # abrtd runs as root %dir %attr(0755, root, root) %{_localstatedir}/run/%{name} @@ -789,16 +763,16 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-action-analyze-python.1* %{_mandir}/man1/abrt-action-analyze-xorg.1* %{_mandir}/man1/abrt-auto-reporting.1* -%{_mandir}/man8/abrtd.8* +%{_mandir}/man5/abrt.conf.5* %{_mandir}/man5/abrt-action-save-package-data.conf.5* -# {_mandir}/man5/pyhook.conf.5* +%{_mandir}/man5/gpg_keys.conf.5* +%{_mandir}/man8/abrtd.8* %files libs %{_libdir}/libabrt.so.* -%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf -%{_mandir}/man5/abrt.conf.5* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins +%dir %{_datadir}/%{name} # filesystem package should own /usr/share/augeas/lenses directory %{_datadir}/augeas/lenses/abrt.aug @@ -836,19 +810,12 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-applet.1* %{_mandir}/man1/system-config-abrt.1* -%files addon-coredump-helper -%{_libexecdir}/abrt-hook-ccpp -%{_sbindir}/abrt-install-ccpp-hook - %files addon-ccpp %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf %{_mandir}/man5/abrt-CCpp.conf.5* %{_libexecdir}/abrt-gdb-exploitable -%{_journalcatalogdir}/abrt_ccpp.catalog -%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_ccpp_format.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_journal_ccpp_format.conf -%{_unitdir}/abrt-ccpp.service %{_unitdir}/abrt-journal-core.service %dir %{_localstatedir}/lib/abrt @@ -876,6 +843,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man5/vimrc_event.conf.5* %{_datadir}/libreport/events/analyze_CCpp.xml %{_datadir}/libreport/events/analyze_LocalGDB.xml +%{_datadir}/libreport/events/analyze_RetraceServer.xml %{_datadir}/libreport/events/collect_xsession_errors.xml %{_datadir}/libreport/events/collect_GConf.xml %{_datadir}/libreport/events/collect_vimrc_user.xml @@ -887,7 +855,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-action-generate-core-backtrace.* %{_mandir}/man*/abrt-action-analyze-backtrace.* %{_mandir}/man*/abrt-action-list-dsos.* -%{_mandir}/man*/abrt-install-ccpp-hook.* %{_mandir}/man*/abrt-action-install-debuginfo.* %{_mandir}/man*/abrt-action-analyze-ccpp-local.* %{_mandir}/man*/abrt-action-analyze-core.* @@ -901,12 +868,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-upload-watch.* +%if %{with retrace} %files retrace-client %{_bindir}/abrt-retrace-client %{_mandir}/man1/abrt-retrace-client.1* %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf %{_mandir}/man5/ccpp_retrace_event.conf.5* -%{_datadir}/libreport/events/analyze_RetraceServer.xml +%endif %files addon-kerneloops %config(noreplace) %{_sysconfdir}/libreport/events.d/koops_event.conf @@ -930,12 +898,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/events.d/xorg_event.conf %{_journalcatalogdir}/abrt_xorg.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_xorg_format.conf -%{_mandir}/man5/xorg_event.conf.5* +%config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf %{_unitdir}/abrt-xorg.service %{_bindir}/abrt-dump-xorg %{_bindir}/abrt-dump-journal-xorg %{_mandir}/man1/abrt-dump-xorg.1* %{_mandir}/man1/abrt-dump-journal-xorg.1* +%{_mandir}/man5/abrt-xorg.conf.5* +%{_mandir}/man5/xorg_event.conf.5* %files addon-vmcore %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf @@ -1002,8 +972,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %if %{with atomic} %files atomic -%config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf -%{_unitdir}/abrt-coredump-helper.service %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf %{_bindir}/abrt-action-save-package-data %{_mandir}/man1/abrt-action-save-package-data.1* @@ -1022,25 +990,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %files dbus %{_sbindir}/abrt-dbus -%{_sbindir}/abrt-configuration %{_mandir}/man8/abrt-dbus.8* -%{_mandir}/man8/abrt-configuration.8* %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Entry.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Session.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Task.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml -%if %{with python3} -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml -%endif # with python3 -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.vmcore.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xorg.xml %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service -%{_datadir}/dbus-1/system-services/com.redhat.problems.configuration.service %{_datadir}/polkit-1/actions/abrt_polkit.policy %dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/ %dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ @@ -1061,6 +1017,38 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Oct 11 2019 Matěj Grabovský 2.13.0-1 +- cli: Use format argument in info command +- cli: Make pretty and format mutually exclusive +- cli: Set PYTHONPATH for tests +- cli: Rework commands +- Remove abrt-hook-ccpp +- spec: Use macros where appropriate +- tests: Use Augeas consistently +- spec: Move config files to corresponding subpackages +- build,spec: Empty config files in /etc/abrt/ +- doc: Update man pages and comments in config files +- plugins: Update in-code defaults +- doc: Correct alignment of heading underlines +- a-dump-journal-core: Purge commented code +- dbus: Remove D-Bus configuration service +- Partly revert removal of default configs +- cli: Tweak problem matching +- plugins: Add satyr flags when building +- cli: Fix warning +- cli: Fix file name +- cli: Use decorator for MATCH positional argument +- cli: match: Iterate dict instead of calling keys() +- cli: Make pylint happier about imports +- cli: Drop unused variables +- cli: utils: Use consistent return +- cli: Improve i18n +- cli: Drop humanize import +- Drop uses of bind_textdomain_codeset() +- gitignore: Update path to generated file after cli-ng move +- tests: runner: Use systemctl instead of service +- autogen.sh: Use autoreconf + * Thu Oct 03 2019 Miro Hrončok - 2.12.2-3 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 8be0927..76c1515 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.2.tar.gz) = 8a6c1d718cce43a94de1d397d8a6bc9c24bb100081c9e4d4e9fb0441356991e3e8d7da066212ebbee8774e3a416c0e41e17713ced5ffb0c1f63588527e7dc983 +SHA512 (abrt-2.13.0.tar.gz) = 936c83293dcb71051b8dd89e84718cf0f76c7d7998b414a2c41d43b8e2a4dc6718f42d8fd47186bd15bac3ea06081f411ab3a7ed3729343da9e6e91edb046568 From 2a9e14ca2d845bd07d7054a4019b62401368e55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Fri, 11 Oct 2019 16:32:47 +0200 Subject: [PATCH 032/125] New upstream release 2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matěj Grabovský --- .gitignore | 1 + abrt.spec | 178 ++++++++++++++++++++++++++--------------------------- sources | 2 +- 3 files changed, 88 insertions(+), 93 deletions(-) diff --git a/.gitignore b/.gitignore index 2b791ec..6268042 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ abrt-1.1.13.tar.gz /abrt-2.12.0.tar.gz /abrt-2.12.1.tar.gz /abrt-2.12.2.tar.gz +/abrt-2.13.0.tar.gz diff --git a/abrt.spec b/abrt.spec index e369643..e18ddea 100644 --- a/abrt.spec +++ b/abrt.spec @@ -18,6 +18,9 @@ # build abrt-atomic subpackage %bcond_without atomic +# build abrt-retrace-client by default +%bcond_without retrace + # rpmbuild --define 'desktopvendor mystring' %if "x%{desktopvendor}" == "x" %define desktopvendor %(source /etc/os-release; echo ${ID}) @@ -45,7 +48,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.12.2 +Version: 2.13.0 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -76,9 +79,6 @@ BuildRequires: libselinux-devel BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete -BuildRequires: python3-argh -BuildRequires: python3-humanize -BuildRequires: python3-devel %endif # with python3 Requires: libreport >= %{libreport_ver} @@ -184,28 +184,23 @@ Requires: abrt-gui-libs = %{version}-%{release} %description gui GTK+ wizard for convenient bug reporting. -%package addon-coredump-helper -Summary: %{name}'s /proc/sys/kernel/core_pattern helper -Requires: abrt-libs = %{version}-%{release} - -%description addon-coredump-helper -This package contains hook for C/C++ crashed programs. - %package addon-ccpp Summary: %{name}'s C/C++ addon Requires: cpio Requires: gdb-headless Requires: elfutils %if 0%{!?rhel:1} +%if %{with retrace} # abrt-action-perform-ccpp-analysis wants to run analyze_RetraceServer: Requires: %{name}-retrace-client %endif +%endif Requires: %{name} = %{version}-%{release} -Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} %if %{with python3} Requires: python3-libreport %endif # with python3 +Obsoletes: abrt-addon-coredump-helper <= 2.12.2 %description addon-ccpp @@ -219,6 +214,7 @@ Requires: abrt-libs = %{version}-%{release} %description addon-upload-watch This package contains hook for uploaded problems. +%if %{with retrace} %package retrace-client Summary: %{name}'s retrace client Requires: %{name} = %{version}-%{release} @@ -230,6 +226,7 @@ Requires: libsoup %description retrace-client This package contains the client application for Retrace server which is able to analyze C/C++ crashes remotely. +%endif %package addon-kerneloops Summary: %{name}'s kerneloops addon @@ -293,6 +290,7 @@ Search for a new updates in bodhi server. %if %{with python3} %package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: python3-systemd Requires: python3-abrt @@ -337,9 +335,7 @@ Requires: abrt-dbus %if %{with python3} Requires: python3-abrt Requires: abrt-addon-ccpp -Requires: python3-argh Requires: python3-argcomplete -Requires: python3-humanize Provides: %{name}-cli-ng = %{version}-%{release} Obsoletes: %{name}-cli-ng < 2.12.2 @@ -365,7 +361,9 @@ Requires: abrt-addon-xorg Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} %else +%if %{with retrace} Requires: abrt-retrace-client +%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -406,7 +404,9 @@ Requires: gnome-abrt Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-plugin-rhtsupport >= %{libreport_ver} %else +%if %{with retrace} Requires: abrt-retrace-client +%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -429,7 +429,6 @@ environment. %if %{with atomic} %package atomic Summary: Package to make easy default installation on Atomic hosts. -Requires: %{name}-addon-coredump-helper = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Conflicts: %{name}-addon-ccpp @@ -486,12 +485,11 @@ to the shell %autosetup -S git -p 0 %build -%define var_base_dir spool +autoconf -autoreconf -if -intltoolize --automake -c -f +%define default_dump_dir %{_localstatedir}/spool/abrt -%configure \ +CFLAGS="%{optflags} -Werror" %configure \ %if %{without python3} --without-python3 \ %endif # with python3 @@ -501,25 +499,27 @@ intltoolize --automake -c -f %if %{without atomic} --without-atomic \ %endif +%if %{without retrace} + --without-retrace \ +%endif %if 0%{?rhel} --enable-authenticated-autoreporting \ %endif %ifnarch %{arm} --enable-native-unwinder \ %endif - --with-defaultdumplocation=/var/%{var_base_dir}/abrt \ + --with-defaultdumplocation=%{default_dump_dir} \ --enable-doxygen-docs \ --enable-dump-time-unwind \ --disable-silent-rules -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT \ +%make_install \ %if %{with python3} PYTHON=%{__python3} \ %endif # with python3 - mandir=%{_mandir} \ dbusabrtdocdir=%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ %find_lang %{name} @@ -529,21 +529,21 @@ make install DESTDIR=$RPM_BUILD_ROOT \ # for those which needs to be byte-compiled with different # version (python2/python3). # rpm can do this work and use the appropriate python version. -find $RPM_BUILD_ROOT -name "*.py[co]" -delete +find %{buildroot} -name "*.py[co]" -delete # remove all .la and .a files -find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f -mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di -mkdir -p $RPM_BUILD_ROOT/var/run/abrt -mkdir -p $RPM_BUILD_ROOT/var/%{var_base_dir}/abrt -mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-upload -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/abrt +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f +mkdir -p %{buildroot}%{_localstatedir}/cache/abrt-di +mkdir -p %{buildroot}%{_localstatedir}/lib/abrt +mkdir -p %{buildroot}%{_localstatedir}/run/abrt +mkdir -p %{buildroot}%{_localstatedir}/spool/abrt-upload +mkdir -p %{buildroot}%{default_dump_dir} desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ src/applet/org.freedesktop.problems.applet.desktop -ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/ +ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ %if %{with python3} ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1 @@ -576,7 +576,6 @@ exit 0 # because /cache/abrt-di/* was created under root with root:root # so 2.x fails when it tries to extract debuginfo there.. chown -R abrt:abrt %{_localstatedir}/cache/abrt-di -%systemd_post abrt-ccpp.service %systemd_post abrt-journal-core.service %journal_catalog_update @@ -656,8 +655,6 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : if [ -f /etc/abrt/plugins/CCpp.conf ]; then mv /etc/abrt/plugins/CCpp.conf /etc/abrt/plugins/CCpp.conf.rpmsave.atomic || exit 1; fi -ln -sf /etc/abrt/plugins/CCpp_Atomic.conf /etc/abrt/plugins/CCpp.conf -%systemd_post abrt-coredump-helper.service %preun atomic if [ -L /etc/abrt/plugins/CCpp.conf ]; then @@ -666,9 +663,6 @@ fi if [ -f /etc/abrt/plugins/CCpp.conf.rpmsave.atomic ]; then mv /etc/abrt/plugins/CCpp.conf.rpmsave.atomic /etc/abrt/plugins/CCpp.conf || exit 1 fi - -%postun atomic -%systemd_postun_with_restart abrt-coredump-helper.service %endif # with atomic %if 0%{?fedora} > 27 || 0%{?rhel} > 7 @@ -694,29 +688,11 @@ fi service abrtd condrestart >/dev/null 2>&1 || : %posttrans addon-ccpp -# Migrate from abrt-ccpp.service to abrt-journal-core.service -# 'systemctl preset abrt-ccpp.service abrt-journal-core.service' -# is done only for installation by %systemd_post macro but not for package -# upgrade. Following lines affect changes in Fedora preset files in case of -# package upgrade and also starts abrt-journal-core.service and stops -# abrt-ccpp.service if abrt-ccpp.service is running. -# All this has to be done only once because some users want to use -# abrt-ccpp.service instead of the default abrt-journal-core.service. -# Hence we introduced a %{_localstatedir}/lib/abrt/abrt-migrated file to -# mark the migration was done. -if test ! -f %{_localstatedir}/lib/abrt/abrt-migrated ; then - systemctl --no-reload preset abrt-ccpp.service >/dev/null 2>&1 || : - systemctl --no-reload preset abrt-journal-core.service >/dev/null 2>&1 || : - if service abrt-ccpp status >/dev/null 2>&1 ; then - systemctl stop abrt-ccpp >/dev/null 2>&1 || : - systemctl start abrt-journal-core >/dev/null 2>&1 || : - fi - touch %{_localstatedir}/lib/abrt/abrt-migrated +# Regenerate core_backtraces because of missing crash threads +abrtdir=$(grep "^\s*DumpLocation\b" /etc/abrt/abrt.conf | tail -1 | cut -d'=' -f2 | tr -d ' ') +if test -z "$abrtdir"; then + abrtdir=%{default_dump_dir} fi -systemctl try-restart abrt-journal-core >/dev/null 2>&1 || : -systemctl try-restart abrt-ccpp >/dev/null 2>&1 || : -# Regenerate core_bactraces because of missing crash threads -abrtdir=$(grep "DumpLocation" /etc/abrt/abrt.conf | cut -d'=' -f2 | tr -d ' ') if test -d "$abrtdir"; then for DD in `find "$abrtdir" -mindepth 1 -maxdepth 1 -type d` do @@ -774,16 +750,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_bindir}/abrt-action-analyze-python %{_bindir}/abrt-action-analyze-xorg %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.problems.daemon.conf +%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf -%config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf -%{_mandir}/man5/abrt-xorg.conf.5* %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys.conf -%{_mandir}/man5/gpg_keys.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf %{_mandir}/man5/abrt_event.conf.5* %config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf %{_mandir}/man5/smart_event.conf.5* -%dir %attr(0751, root, abrt) %{_localstatedir}/%{var_base_dir}/%{name} +%dir %attr(0751, root, abrt) %{default_dump_dir} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload # abrtd runs as root %dir %attr(0755, root, root) %{_localstatedir}/run/%{name} @@ -797,16 +771,16 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-action-analyze-python.1* %{_mandir}/man1/abrt-action-analyze-xorg.1* %{_mandir}/man1/abrt-auto-reporting.1* -%{_mandir}/man8/abrtd.8* +%{_mandir}/man5/abrt.conf.5* %{_mandir}/man5/abrt-action-save-package-data.conf.5* -# {_mandir}/man5/pyhook.conf.5* +%{_mandir}/man5/gpg_keys.conf.5* +%{_mandir}/man8/abrtd.8* %files libs %{_libdir}/libabrt.so.* -%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf -%{_mandir}/man5/abrt.conf.5* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins +%dir %{_datadir}/%{name} # filesystem package should own /usr/share/augeas/lenses directory %{_datadir}/augeas/lenses/abrt.aug @@ -844,19 +818,12 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-applet.1* %{_mandir}/man1/system-config-abrt.1* -%files addon-coredump-helper -%{_libexecdir}/abrt-hook-ccpp -%{_sbindir}/abrt-install-ccpp-hook - %files addon-ccpp %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf %{_mandir}/man5/abrt-CCpp.conf.5* %{_libexecdir}/abrt-gdb-exploitable -%{_journalcatalogdir}/abrt_ccpp.catalog -%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_ccpp_format.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_journal_ccpp_format.conf -%{_unitdir}/abrt-ccpp.service %{_unitdir}/abrt-journal-core.service %dir %{_localstatedir}/lib/abrt @@ -884,6 +851,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man5/vimrc_event.conf.5* %{_datadir}/libreport/events/analyze_CCpp.xml %{_datadir}/libreport/events/analyze_LocalGDB.xml +%{_datadir}/libreport/events/analyze_RetraceServer.xml %{_datadir}/libreport/events/collect_xsession_errors.xml %{_datadir}/libreport/events/collect_GConf.xml %{_datadir}/libreport/events/collect_vimrc_user.xml @@ -895,7 +863,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-action-generate-core-backtrace.* %{_mandir}/man*/abrt-action-analyze-backtrace.* %{_mandir}/man*/abrt-action-list-dsos.* -%{_mandir}/man*/abrt-install-ccpp-hook.* %{_mandir}/man*/abrt-action-install-debuginfo.* %{_mandir}/man*/abrt-action-analyze-ccpp-local.* %{_mandir}/man*/abrt-action-analyze-core.* @@ -909,12 +876,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-upload-watch.* +%if %{with retrace} %files retrace-client %{_bindir}/abrt-retrace-client %{_mandir}/man1/abrt-retrace-client.1* %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf %{_mandir}/man5/ccpp_retrace_event.conf.5* -%{_datadir}/libreport/events/analyze_RetraceServer.xml +%endif %files addon-kerneloops %config(noreplace) %{_sysconfdir}/libreport/events.d/koops_event.conf @@ -938,12 +906,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/libreport/events.d/xorg_event.conf %{_journalcatalogdir}/abrt_xorg.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_xorg_format.conf -%{_mandir}/man5/xorg_event.conf.5* +%config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf %{_unitdir}/abrt-xorg.service %{_bindir}/abrt-dump-xorg %{_bindir}/abrt-dump-journal-xorg %{_mandir}/man1/abrt-dump-xorg.1* %{_mandir}/man1/abrt-dump-journal-xorg.1* +%{_mandir}/man5/abrt-xorg.conf.5* +%{_mandir}/man5/xorg_event.conf.5* %files addon-vmcore %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf @@ -1010,8 +980,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %if %{with atomic} %files atomic -%config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf -%{_unitdir}/abrt-coredump-helper.service %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf %{_bindir}/abrt-action-save-package-data %{_mandir}/man1/abrt-action-save-package-data.1* @@ -1030,25 +998,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %files dbus %{_sbindir}/abrt-dbus -%{_sbindir}/abrt-configuration %{_mandir}/man8/abrt-dbus.8* -%{_mandir}/man8/abrt-configuration.8* %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Entry.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Session.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Task.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml -%if %{with python3} -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python3.xml -%endif # with python3 -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.vmcore.xml -%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xorg.xml %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service -%{_datadir}/dbus-1/system-services/com.redhat.problems.configuration.service %{_datadir}/polkit-1/actions/abrt_polkit.policy %dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/ %dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ @@ -1069,6 +1025,44 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Oct 11 2019 Matěj Grabovský 2.13.0-1 +- cli: Use format argument in info command +- cli: Make pretty and format mutually exclusive +- cli: Set PYTHONPATH for tests +- cli: Rework commands +- Remove abrt-hook-ccpp +- spec: Use macros where appropriate +- tests: Use Augeas consistently +- spec: Move config files to corresponding subpackages +- build,spec: Empty config files in /etc/abrt/ +- doc: Update man pages and comments in config files +- plugins: Update in-code defaults +- doc: Correct alignment of heading underlines +- a-dump-journal-core: Purge commented code +- dbus: Remove D-Bus configuration service +- Partly revert removal of default configs +- cli: Tweak problem matching +- plugins: Add satyr flags when building +- cli: Fix warning +- cli: Fix file name +- cli: Use decorator for MATCH positional argument +- cli: match: Iterate dict instead of calling keys() +- cli: Make pylint happier about imports +- cli: Drop unused variables +- cli: utils: Use consistent return +- cli: Improve i18n +- cli: Drop humanize import +- Drop uses of bind_textdomain_codeset() +- gitignore: Update path to generated file after cli-ng move +- tests: runner: Use systemctl instead of service +- autogen.sh: Use autoreconf + +* Thu Oct 03 2019 Miro Hrončok - 2.12.2-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Sat Aug 17 2019 Miro Hrončok - 2.12.2-2 +- Rebuilt for Python 3.8 + * Thu Aug 01 2019 Ernestas Kulik 2.12.2-1 - Remove old CLI and move cli-ng subpackage files into tui subpackage diff --git a/sources b/sources index 8be0927..76c1515 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.12.2.tar.gz) = 8a6c1d718cce43a94de1d397d8a6bc9c24bb100081c9e4d4e9fb0441356991e3e8d7da066212ebbee8774e3a416c0e41e17713ced5ffb0c1f63588527e7dc983 +SHA512 (abrt-2.13.0.tar.gz) = 936c83293dcb71051b8dd89e84718cf0f76c7d7998b414a2c41d43b8e2a4dc6718f42d8fd47186bd15bac3ea06081f411ab3a7ed3729343da9e6e91edb046568 From cbad6eeeab7b5aef09cc4cf142ad3e8e21b0e6d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 16 Oct 2019 14:02:50 +0200 Subject: [PATCH 033/125] Use correct paths for installed Python modules This patch is pulled from upstream. --- ...-correct-paths-for-installed-modules.patch | 96 +++++++++++++++++++ abrt.spec | 16 ++-- 2 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 0001-python-Use-correct-paths-for-installed-modules.patch diff --git a/0001-python-Use-correct-paths-for-installed-modules.patch b/0001-python-Use-correct-paths-for-installed-modules.patch new file mode 100644 index 0000000..d12bb22 --- /dev/null +++ b/0001-python-Use-correct-paths-for-installed-modules.patch @@ -0,0 +1,96 @@ +From 57c0042ead87249bed5964eeec45b97543674060 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Wed, 16 Oct 2019 11:27:54 +0200 +Subject: [PATCH] python: Use correct paths for installed modules + +Non-compiled (without C bits) Python modules should be installed into +architecture-independent directory (/usr/lib/python3.x/site-packages +in the case of Fedora). + +This commit fixes both +* the spec file, where %{python3_sitelib} should be used rather than + %{python3_sitearch} which is to be used for compiled extensions; and +* the automake scripts, where $(pythondir) should be used in place of + $(pyexecdir) for the same reason. + +This is a follow-up to 20dcf7fb4. +--- + abrt.spec.in | 14 +++++++------- + src/cli/abrtcli/Makefile.am | 2 +- + src/cli/abrtcli/cli/Makefile.am | 2 +- + src/hooks/Makefile.am | 2 +- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/abrt.spec.in b/abrt.spec.in +index 1c6c48ad..fe0b2278 100644 +--- a/abrt.spec.in ++++ b/abrt.spec.in +@@ -935,14 +935,14 @@ killall abrt-dbus >/dev/null 2>&1 || : + %{_journalcatalogdir}/python3_abrt.catalog + %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf + %{_mandir}/man5/python3_event.conf.5* +-%{python3_sitearch}/abrt3.pth +-%{python3_sitearch}/abrt_exception_handler3.py +-%{python3_sitearch}/__pycache__/abrt_exception_handler3.* ++%{python3_sitelib}/abrt3.pth ++%{python3_sitelib}/abrt_exception_handler3.py ++%{python3_sitelib}/__pycache__/abrt_exception_handler3.* + + %files -n python3-abrt-container-addon +-%{python3_sitearch}/abrt3_container.pth +-%{python3_sitearch}/abrt_exception_handler3_container.py +-%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* ++%{python3_sitelib}/abrt3_container.pth ++%{python3_sitelib}/abrt_exception_handler3_container.py ++%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* + %endif # with python3 + + %files plugin-sosreport +@@ -959,7 +959,7 @@ killall abrt-dbus >/dev/null 2>&1 || : + %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion + %{_bindir}/abrt + %{_bindir}/abrt-cli +-%{python3_sitearch}/abrtcli/ ++%{python3_sitelib}/abrtcli/ + %{_mandir}/man1/abrt.1* + %{_mandir}/man1/abrt-cli.1* + %endif # with python3 +diff --git a/src/cli/abrtcli/Makefile.am b/src/cli/abrtcli/Makefile.am +index d11355a2..a599d0b5 100644 +--- a/src/cli/abrtcli/Makefile.am ++++ b/src/cli/abrtcli/Makefile.am +@@ -9,7 +9,7 @@ PYFILES= \ + utils.py + + abrtcli_PYTHON = $(PYFILES) +-abrtclidir = $(pyexecdir)/abrtcli ++abrtclidir = $(pythondir)/abrtcli + + config.py: config.py.in + sed -e s,\@LOCALE_DIR\@,$(localedir),g \ +diff --git a/src/cli/abrtcli/cli/Makefile.am b/src/cli/abrtcli/cli/Makefile.am +index 17ff216b..c796074d 100644 +--- a/src/cli/abrtcli/cli/Makefile.am ++++ b/src/cli/abrtcli/cli/Makefile.am +@@ -10,4 +10,4 @@ abrtclicommands_PYTHON = \ + retrace.py \ + status.py + +-abrtclicommandsdir = $(pyexecdir)/abrtcli/cli ++abrtclicommandsdir = $(pythondir)/abrtcli/cli +diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am +index 6e35887f..bdef0329 100644 +--- a/src/hooks/Makefile.am ++++ b/src/hooks/Makefile.am +@@ -35,7 +35,7 @@ EXTRA_DIST = \ + ALL_DEPENDENCES = + + if BUILD_PYTHON3 +-py3hookdir = $(pyexecdir) ++py3hookdir = $(pythondir) + dist_pluginsconf_DATA += python3.conf + ALL_DEPENDENCES += abrt_exception_handler3.py + +-- +2.21.0 + diff --git a/abrt.spec b/abrt.spec index 84963b2..79d8b61 100644 --- a/abrt.spec +++ b/abrt.spec @@ -54,6 +54,8 @@ License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch + BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -939,14 +941,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_journalcatalogdir}/python3_abrt.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %{_mandir}/man5/python3_event.conf.5* -%{python3_sitearch}/abrt3.pth -%{python3_sitearch}/abrt_exception_handler3.py -%{python3_sitearch}/__pycache__/abrt_exception_handler3.* +%{python3_sitelib}/abrt3.pth +%{python3_sitelib}/abrt_exception_handler3.py +%{python3_sitelib}/__pycache__/abrt_exception_handler3.* %files -n python3-abrt-container-addon -%{python3_sitearch}/abrt3_container.pth -%{python3_sitearch}/abrt_exception_handler3_container.py -%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* +%{python3_sitelib}/abrt3_container.pth +%{python3_sitelib}/abrt_exception_handler3_container.py +%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* %endif # with python3 %files plugin-sosreport @@ -963,7 +965,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion %{_bindir}/abrt %{_bindir}/abrt-cli -%{python3_sitearch}/abrtcli/ +%{python3_sitelib}/abrtcli/ %{_mandir}/man1/abrt.1* %{_mandir}/man1/abrt-cli.1* %endif # with python3 From bdb580f2ca2b1d1872518ae7a1be6bc517010a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 16 Oct 2019 14:02:50 +0200 Subject: [PATCH 034/125] Use correct paths for installed Python modules This patch is pulled from upstream. --- ...-correct-paths-for-installed-modules.patch | 96 +++++++++++++++++++ abrt.spec | 20 ++-- 2 files changed, 107 insertions(+), 9 deletions(-) create mode 100644 0001-python-Use-correct-paths-for-installed-modules.patch diff --git a/0001-python-Use-correct-paths-for-installed-modules.patch b/0001-python-Use-correct-paths-for-installed-modules.patch new file mode 100644 index 0000000..d12bb22 --- /dev/null +++ b/0001-python-Use-correct-paths-for-installed-modules.patch @@ -0,0 +1,96 @@ +From 57c0042ead87249bed5964eeec45b97543674060 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Wed, 16 Oct 2019 11:27:54 +0200 +Subject: [PATCH] python: Use correct paths for installed modules + +Non-compiled (without C bits) Python modules should be installed into +architecture-independent directory (/usr/lib/python3.x/site-packages +in the case of Fedora). + +This commit fixes both +* the spec file, where %{python3_sitelib} should be used rather than + %{python3_sitearch} which is to be used for compiled extensions; and +* the automake scripts, where $(pythondir) should be used in place of + $(pyexecdir) for the same reason. + +This is a follow-up to 20dcf7fb4. +--- + abrt.spec.in | 14 +++++++------- + src/cli/abrtcli/Makefile.am | 2 +- + src/cli/abrtcli/cli/Makefile.am | 2 +- + src/hooks/Makefile.am | 2 +- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/abrt.spec.in b/abrt.spec.in +index 1c6c48ad..fe0b2278 100644 +--- a/abrt.spec.in ++++ b/abrt.spec.in +@@ -935,14 +935,14 @@ killall abrt-dbus >/dev/null 2>&1 || : + %{_journalcatalogdir}/python3_abrt.catalog + %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf + %{_mandir}/man5/python3_event.conf.5* +-%{python3_sitearch}/abrt3.pth +-%{python3_sitearch}/abrt_exception_handler3.py +-%{python3_sitearch}/__pycache__/abrt_exception_handler3.* ++%{python3_sitelib}/abrt3.pth ++%{python3_sitelib}/abrt_exception_handler3.py ++%{python3_sitelib}/__pycache__/abrt_exception_handler3.* + + %files -n python3-abrt-container-addon +-%{python3_sitearch}/abrt3_container.pth +-%{python3_sitearch}/abrt_exception_handler3_container.py +-%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* ++%{python3_sitelib}/abrt3_container.pth ++%{python3_sitelib}/abrt_exception_handler3_container.py ++%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* + %endif # with python3 + + %files plugin-sosreport +@@ -959,7 +959,7 @@ killall abrt-dbus >/dev/null 2>&1 || : + %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion + %{_bindir}/abrt + %{_bindir}/abrt-cli +-%{python3_sitearch}/abrtcli/ ++%{python3_sitelib}/abrtcli/ + %{_mandir}/man1/abrt.1* + %{_mandir}/man1/abrt-cli.1* + %endif # with python3 +diff --git a/src/cli/abrtcli/Makefile.am b/src/cli/abrtcli/Makefile.am +index d11355a2..a599d0b5 100644 +--- a/src/cli/abrtcli/Makefile.am ++++ b/src/cli/abrtcli/Makefile.am +@@ -9,7 +9,7 @@ PYFILES= \ + utils.py + + abrtcli_PYTHON = $(PYFILES) +-abrtclidir = $(pyexecdir)/abrtcli ++abrtclidir = $(pythondir)/abrtcli + + config.py: config.py.in + sed -e s,\@LOCALE_DIR\@,$(localedir),g \ +diff --git a/src/cli/abrtcli/cli/Makefile.am b/src/cli/abrtcli/cli/Makefile.am +index 17ff216b..c796074d 100644 +--- a/src/cli/abrtcli/cli/Makefile.am ++++ b/src/cli/abrtcli/cli/Makefile.am +@@ -10,4 +10,4 @@ abrtclicommands_PYTHON = \ + retrace.py \ + status.py + +-abrtclicommandsdir = $(pyexecdir)/abrtcli/cli ++abrtclicommandsdir = $(pythondir)/abrtcli/cli +diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am +index 6e35887f..bdef0329 100644 +--- a/src/hooks/Makefile.am ++++ b/src/hooks/Makefile.am +@@ -35,7 +35,7 @@ EXTRA_DIST = \ + ALL_DEPENDENCES = + + if BUILD_PYTHON3 +-py3hookdir = $(pyexecdir) ++py3hookdir = $(pythondir) + dist_pluginsconf_DATA += python3.conf + ALL_DEPENDENCES += abrt_exception_handler3.py + +-- +2.21.0 + diff --git a/abrt.spec b/abrt.spec index e18ddea..5018e24 100644 --- a/abrt.spec +++ b/abrt.spec @@ -53,8 +53,10 @@ Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# Needed when applying git patches. -BuildRequires: git + +Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch + +BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel @@ -947,14 +949,14 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_journalcatalogdir}/python3_abrt.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %{_mandir}/man5/python3_event.conf.5* -%{python3_sitearch}/abrt3.pth -%{python3_sitearch}/abrt_exception_handler3.py -%{python3_sitearch}/__pycache__/abrt_exception_handler3.* +%{python3_sitelib}/abrt3.pth +%{python3_sitelib}/abrt_exception_handler3.py +%{python3_sitelib}/__pycache__/abrt_exception_handler3.* %files -n python3-abrt-container-addon -%{python3_sitearch}/abrt3_container.pth -%{python3_sitearch}/abrt_exception_handler3_container.py -%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* +%{python3_sitelib}/abrt3_container.pth +%{python3_sitelib}/abrt_exception_handler3_container.py +%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* %endif # with python3 %files plugin-sosreport @@ -971,7 +973,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion %{_bindir}/abrt %{_bindir}/abrt-cli -%{python3_sitearch}/abrtcli/ +%{python3_sitelib}/abrtcli/ %{_mandir}/man1/abrt.1* %{_mandir}/man1/abrt-cli.1* %endif # with python3 From 507c1e9e8631ae85c8c90feb536477c36eef0659 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 14 Jan 2020 13:58:06 +0100 Subject: [PATCH 035/125] Drop scriptlets for abrt-ccpp.service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s been dropped, no use in triggering disabling or restarting. The preset has had abrt-ccpp replaced with abrt-journal-core forever now as well, so let’s just do it. --- abrt.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/abrt.spec b/abrt.spec index 79d8b61..ed5502b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -609,7 +609,6 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %systemd_preun abrtd.service %preun addon-ccpp -%systemd_preun abrt-ccpp.service %systemd_preun abrt-journal-core.service %preun addon-kerneloops @@ -631,7 +630,6 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %systemd_postun_with_restart abrtd.service %postun addon-ccpp -%systemd_postun_with_restart abrt-ccpp.service %systemd_postun_with_restart abrt-journal-core.service %postun addon-kerneloops @@ -1019,6 +1017,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jan 14 2020 - Ernestas Kulik - 2.13.0-2 +- Drop systemd scriptlets for abrt-ccpp.service + * Fri Oct 11 2019 Matěj Grabovský 2.13.0-1 - cli: Use format argument in info command - cli: Make pretty and format mutually exclusive From 0c014bfd3af254a6498170814b2f008f667d4d24 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 14 Jan 2020 14:01:49 +0100 Subject: [PATCH 036/125] Bump release Oops. --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index ed5502b..fc45d69 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz From 4d76ca5e3ac0d33577f46ebc3962844188937df5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:08:18 +0000 Subject: [PATCH 037/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index fc45d69..a3dc524 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.13.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1017,6 +1017,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 14 2020 - Ernestas Kulik - 2.13.0-2 - Drop systemd scriptlets for abrt-ccpp.service From c7d2242d985e727d35ef18c1d5a94d767d9ee9f1 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Thu, 30 Jan 2020 17:10:50 +0100 Subject: [PATCH 038/125] patch: Fix build failure with gcc -fno-common Resolves: rhbz#1795820 Signed-off-by: Martin Kutlak --- ...ix-build-failure-with-gcc-fno-common.patch | 165 ++++++++++++++++++ ...Initialize-karma-values-with-default.patch | 32 ++++ abrt.spec | 9 +- 3 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 0002-Fix-build-failure-with-gcc-fno-common.patch create mode 100644 0003-bodhi-Initialize-karma-values-with-default.patch diff --git a/0002-Fix-build-failure-with-gcc-fno-common.patch b/0002-Fix-build-failure-with-gcc-fno-common.patch new file mode 100644 index 0000000..f85b10f --- /dev/null +++ b/0002-Fix-build-failure-with-gcc-fno-common.patch @@ -0,0 +1,165 @@ +From f58c435e4e4f5030af44d2cde8042bcf10d24615 Mon Sep 17 00:00:00 2001 +From: Michal Fabik +Date: Tue, 28 Jan 2020 13:45:14 +0100 +Subject: [PATCH] Fix build failure with gcc -fno-common + +Signed-off-by: Michal Fabik +--- + src/configuration-gui/abrt-config-widget.c | 2 +- + src/dbus/abrt_problems2_service.c | 4 ++-- + src/dbus/abrt_problems2_service.h | 8 ++++---- + src/dbus/abrt_problems2_session.c | 2 +- + src/dbus/abrt_problems2_task.c | 2 +- + src/plugins/oops-utils.c | 2 ++ + src/plugins/oops-utils.h | 2 +- + src/plugins/xorg-utils.c | 2 ++ + src/plugins/xorg-utils.h | 2 +- + 9 files changed, 15 insertions(+), 11 deletions(-) + +diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c +index aa3b5c01b..518ecd1d0 100644 +--- a/src/configuration-gui/abrt-config-widget.c ++++ b/src/configuration-gui/abrt-config-widget.c +@@ -109,7 +109,7 @@ G_DEFINE_TYPE_WITH_PRIVATE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX) + enum { + SN_CHANGED, + SN_LAST_SIGNAL +-} SignalNumber; ++}; + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + +diff --git a/src/dbus/abrt_problems2_service.c b/src/dbus/abrt_problems2_service.c +index a0d2a3ce6..a1e7ae322 100644 +--- a/src/dbus/abrt_problems2_service.c ++++ b/src/dbus/abrt_problems2_service.c +@@ -1589,7 +1589,7 @@ AbrtP2Object *abrt_p2_service_get_entry_object(AbrtP2Service *service, + + AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service, + const char *problem_id, +- int flags, ++ AbrtP2ServiceEntryLookupFlags flags, + GError **error) + { + char *entry_path = entry_object_dir_name_to_path(problem_id); +@@ -2062,7 +2062,7 @@ GVariant *abrt_p2_service_callers_session(AbrtP2Service *service, + + GVariant *abrt_p2_service_get_problems(AbrtP2Service *service, + uid_t caller_uid, +- gint32 flags, ++ AbrtP2ServiceGetProblemsFlags flags, + GVariant *options, + GError **error) + { +diff --git a/src/dbus/abrt_problems2_service.h b/src/dbus/abrt_problems2_service.h +index f82cf503a..22b97a6e8 100644 +--- a/src/dbus/abrt_problems2_service.h ++++ b/src/dbus/abrt_problems2_service.h +@@ -86,14 +86,14 @@ GVariant *abrt_p2_service_entry_problem_data(AbrtP2Service *service, + GError **error); + + +-enum { ++typedef enum { + ABRT_P2_SERVICE_ENTRY_LOOKUP_NOFLAGS = 0x0, ///< return with error if not found + ABRT_P2_SERVICE_ENTRY_LOOKUP_OPTIONAL = 0x1, ///< return NULL if not found +-} AbrtP2ServiceEntryLookupFlag; ++} AbrtP2ServiceEntryLookupFlags; + + AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service, + const char *problem_id, +- int flags, ++ AbrtP2ServiceEntryLookupFlags flags, + GError **error); + + struct _AbrtP2Entry; +@@ -145,7 +145,7 @@ typedef enum + + GVariant *abrt_p2_service_get_problems(AbrtP2Service *service, + uid_t caller_uid, +- gint32 flags, ++ AbrtP2ServiceGetProblemsFlags flags, + GVariant *options, + GError **error); + +diff --git a/src/dbus/abrt_problems2_session.c b/src/dbus/abrt_problems2_session.c +index 96db4ccc5..85ee78887 100644 +--- a/src/dbus/abrt_problems2_session.c ++++ b/src/dbus/abrt_problems2_session.c +@@ -97,7 +97,7 @@ struct check_auth_cb_params + enum { + SN_AUTHORIZATION_CHANGED, + SN_LAST_SIGNAL +-} SignalNumber; ++}; + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + +diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c +index cba6b469a..e6ae171c7 100644 +--- a/src/dbus/abrt_problems2_task.c ++++ b/src/dbus/abrt_problems2_task.c +@@ -21,7 +21,7 @@ + enum { + SN_STATUS_CHANGED, + SN_LAST_SIGNAL +-} SignalNumber; ++}; + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + +diff --git a/src/plugins/oops-utils.c b/src/plugins/oops-utils.c +index caa1d8d5d..a77b4424f 100644 +--- a/src/plugins/oops-utils.c ++++ b/src/plugins/oops-utils.c +@@ -22,6 +22,8 @@ + #include "oops-utils.h" + #include "libabrt.h" + ++int g_abrt_oops_sleep_woke_up_on_signal; ++ + int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags) + { + unsigned errors = 0; +diff --git a/src/plugins/oops-utils.h b/src/plugins/oops-utils.h +index 5181f91c7..bdd61cac2 100644 +--- a/src/plugins/oops-utils.h ++++ b/src/plugins/oops-utils.h +@@ -33,7 +33,7 @@ enum { + ABRT_OOPS_PRINT_STDOUT = 1 << 2, + }; + +-int g_abrt_oops_sleep_woke_up_on_signal; ++extern int g_abrt_oops_sleep_woke_up_on_signal; + + int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags); + unsigned abrt_oops_create_dump_dirs(GList *oops_list, const char *dump_location, const char *analyzer, int flags); +diff --git a/src/plugins/xorg-utils.c b/src/plugins/xorg-utils.c +index a8dfc512a..4ecf8cb63 100644 +--- a/src/plugins/xorg-utils.c ++++ b/src/plugins/xorg-utils.c +@@ -23,6 +23,8 @@ + + #define DEFAULT_XORG_CRASH_REASON "Display server crashed" + ++int g_abrt_xorg_sleep_woke_up_on_signal; ++ + int abrt_xorg_signaled_sleep(int seconds) + { + sigset_t set; +diff --git a/src/plugins/xorg-utils.h b/src/plugins/xorg-utils.h +index c53bc460d..d9f44681a 100644 +--- a/src/plugins/xorg-utils.h ++++ b/src/plugins/xorg-utils.h +@@ -35,7 +35,7 @@ enum { + ABRT_XORG_PRINT_STDOUT = 1 << 2, + }; + +-int g_abrt_xorg_sleep_woke_up_on_signal; ++extern int g_abrt_xorg_sleep_woke_up_on_signal; + int abrt_xorg_signaled_sleep(int seconds); + + /* +-- +2.24.1 + diff --git a/0003-bodhi-Initialize-karma-values-with-default.patch b/0003-bodhi-Initialize-karma-values-with-default.patch new file mode 100644 index 0000000..f3df79b --- /dev/null +++ b/0003-bodhi-Initialize-karma-values-with-default.patch @@ -0,0 +1,32 @@ +From c6562f15f2b72348aa447e3acbb91de5cf221695 Mon Sep 17 00:00:00 2001 +From: Martin Kutlak +Date: Thu, 30 Jan 2020 16:19:51 +0100 +Subject: [PATCH] bodhi: Initialize karma values with default + +During a rebuilt on s390x this error came up: +bodhi.c:340:12: + error: + 'unstable_karma' may be used uninitialized in this function + +Signed-off-by: Martin Kutlak +--- + src/plugins/bodhi.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c +index 14d65ad37..9b5177be9 100644 +--- a/src/plugins/bodhi.c ++++ b/src/plugins/bodhi.c +@@ -334,7 +334,8 @@ static GHashTable *bodhi_parse_json(json_object *json, const char *release) + if (!builds_item) /* broken json */ + continue; + +- int karma, unstable_karma; ++ int karma = 0; ++ int unstable_karma = 0; + bodhi_read_value(updates_item, "karma", &karma, BODHI_READ_INT); + bodhi_read_value(updates_item, "unstable_karma", &unstable_karma, BODHI_READ_INT); + if (karma <= unstable_karma) +-- +2.24.1 + diff --git a/abrt.spec b/abrt.spec index a3dc524..16cad2b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,12 +49,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.13.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch +Patch1: 0002-Fix-build-failure-with-gcc-fno-common.patch +Patch2: 0003-bodhi-Initialize-karma-values-with-default.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -1017,6 +1019,11 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jan 30 2020 Martin Kutlak - 2.13.0-4 +- Add patch to fix build failure with gcc -fno-common +- Initialize bodhi karma values with defaults +- Resolves: #1795820 + * Tue Jan 28 2020 Fedora Release Engineering - 2.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8f4c491a4bd52ff86180e7bf72b614004eaa9b50 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Fri, 31 Jan 2020 10:42:41 +0100 Subject: [PATCH 039/125] Add patch for possibly unitialized variable Removed comments after endifs. Signed-off-by: Martin Kutlak --- ...-Fix-possibly-uninitialized-variable.patch | 29 ++++++++++++ abrt.spec | 44 ++++++++++--------- 2 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 0004-dbus-Fix-possibly-uninitialized-variable.patch diff --git a/0004-dbus-Fix-possibly-uninitialized-variable.patch b/0004-dbus-Fix-possibly-uninitialized-variable.patch new file mode 100644 index 0000000..5ad921b --- /dev/null +++ b/0004-dbus-Fix-possibly-uninitialized-variable.patch @@ -0,0 +1,29 @@ +From f81bbaa60ad6c5c99dba499044255fdde5d5ed4a Mon Sep 17 00:00:00 2001 +From: Martin Kutlak +Date: Fri, 31 Jan 2020 10:12:37 +0100 +Subject: [PATCH] dbus: Fix possibly uninitialized variable + +abrt_problems2_task.c:419:21: error: +'response' may be used uninitialized in this function [-Werror=maybe-uninitialized] + +Signed-off-by: Martin Kutlak +--- + src/dbus/abrt_problems2_task.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c +index e6ae171c7..af47660aa 100644 +--- a/src/dbus/abrt_problems2_task.c ++++ b/src/dbus/abrt_problems2_task.c +@@ -403,7 +403,7 @@ static void abrt_p2_task_autonomous_cb(AbrtP2Task *task, + + case ABRT_P2_TASK_STATUS_FAILED: + { +- GVariant *response; ++ GVariant *response = NULL; + gint32 code; + GError *error = NULL; + abrt_p2_task_finish(task, &response, &code, &error); +-- +2.24.1 + diff --git a/abrt.spec b/abrt.spec index 16cad2b..d97225a 100644 --- a/abrt.spec +++ b/abrt.spec @@ -54,9 +54,10 @@ License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch -Patch1: 0002-Fix-build-failure-with-gcc-fno-common.patch -Patch2: 0003-bodhi-Initialize-karma-values-with-default.patch +Patch0001: 0001-python-Use-correct-paths-for-installed-modules.patch +Patch0002: 0002-Fix-build-failure-with-gcc-fno-common.patch +Patch0003: 0003-bodhi-Initialize-karma-values-with-default.patch +Patch0004- 0004-dbus-Fix-possibly-uninitialized-variable.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -83,7 +84,7 @@ BuildRequires: libselinux-devel BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete -%endif # with python3 +%endif Requires: libreport >= %{libreport_ver} Requires: satyr >= %{satyr_ver} @@ -101,7 +102,7 @@ Requires(pre): %{shadow_utils} %if %{with python3} Requires: python3-augeas Requires: python3-dbus -%endif # with python3 +%endif %ifarch aarch64 i686 x86_64 Requires: dmidecode %endif @@ -138,7 +139,7 @@ BuildRequires: python3-sphinx BuildRequires: python3-libreport #python3-abrt-doc BuildRequires: python3-devel -%endif # with python3 +%endif %description %{name} is a tool to help users to detect defects in applications and @@ -203,7 +204,7 @@ Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} %if %{with python3} Requires: python3-libreport -%endif # with python3 +%endif Obsoletes: abrt-addon-coredump-helper <= 2.12.2 @@ -263,7 +264,7 @@ Requires: kexec-tools %if %{with python3} Requires: python3-abrt Requires: python3-augeas -%endif # with python3 +%endif Requires: util-linux %description addon-vmcore @@ -311,7 +312,7 @@ Requires: container-exception-logger %description -n python3-abrt-container-addon This package contains python 3 hook and handling uncaught exception in python 3 programs in container. -%endif # with python3 +%endif %package plugin-sosreport Summary: %{name}'s plugin for building automatic sosreports @@ -343,7 +344,7 @@ Requires: python3-argcomplete Provides: %{name}-cli-ng = %{version}-%{release} Obsoletes: %{name}-cli-ng < 2.12.2 -%endif # with python3 +%endif %description tui This package contains a simple command line client for processing abrt reports @@ -359,7 +360,7 @@ Requires: abrt-addon-vmcore Requires: abrt-addon-ccpp %if %{with python3} Requires: python3-abrt-addon -%endif # with python3 +%endif Requires: abrt-addon-xorg %if 0%{?rhel} Requires: libreport-rhel >= %{libreport_ver} @@ -399,7 +400,7 @@ Requires: abrt-addon-vmcore Requires: abrt-addon-ccpp %if %{with python3} Requires: python3-abrt-addon -%endif # with python3 +%endif Requires: abrt-addon-xorg Requires: gdb-headless Requires: abrt-gui @@ -473,7 +474,7 @@ Requires: python3-%{name} = %{version}-%{release} %description -n python3-abrt-doc Examples and documentation for ABRT Python 3 API. -%endif # with python3 +%endif %package console-notification Summary: ABRT console notification script @@ -497,7 +498,7 @@ autoconf CFLAGS="%{optflags} -Werror" %configure \ %if %{without python3} --without-python3 \ -%endif # with python3 +%endif %if %{without bodhi} --without-bodhi \ %endif @@ -524,7 +525,7 @@ CFLAGS="%{optflags} -Werror" %configure \ %make_install \ %if %{with python3} PYTHON=%{__python3} \ -%endif # with python3 +%endif dbusabrtdocdir=%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/ %find_lang %{name} @@ -595,7 +596,7 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %if %{with python3} %post -n python3-abrt-addon %journal_catalog_update -%endif # with python3 +%endif %post addon-vmcore %systemd_post abrt-vmcore.service @@ -666,7 +667,7 @@ fi if [ -f /etc/abrt/plugins/CCpp.conf.rpmsave.atomic ]; then mv /etc/abrt/plugins/CCpp.conf.rpmsave.atomic /etc/abrt/plugins/CCpp.conf || exit 1 fi -%endif # with atomic +%endif %if 0%{?rhel} && 0%{?rhel} <= 7 %post libs -p /sbin/ldconfig @@ -949,7 +950,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{python3_sitelib}/abrt3_container.pth %{python3_sitelib}/abrt_exception_handler3_container.py %{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* -%endif # with python3 +%endif %files plugin-sosreport %config(noreplace) %{_sysconfdir}/libreport/events.d/sosreport_event.conf @@ -968,7 +969,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{python3_sitelib}/abrtcli/ %{_mandir}/man1/abrt.1* %{_mandir}/man1/abrt-cli.1* -%endif # with python3 +%endif %files desktop @@ -1013,15 +1014,16 @@ killall abrt-dbus >/dev/null 2>&1 || : %files -n python3-abrt-doc %{python3_sitelib}/problem_examples -%endif # with python3 +%endif %files console-notification %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog -* Thu Jan 30 2020 Martin Kutlak - 2.13.0-4 +* Fri Jan 31 2020 Martin Kutlak - 2.13.0-4 - Add patch to fix build failure with gcc -fno-common - Initialize bodhi karma values with defaults +- Fix possibly uninitialized variable - Resolves: #1795820 * Tue Jan 28 2020 Fedora Release Engineering - 2.13.0-3 From 68a77d6ad64818e9aeb7c737cdbb041cab55ff81 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Fri, 31 Jan 2020 10:44:31 +0100 Subject: [PATCH 040/125] Fix typo in spec file Signed-off-by: Martin Kutlak --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index d97225a..f6d2fd2 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta Patch0001: 0001-python-Use-correct-paths-for-installed-modules.patch Patch0002: 0002-Fix-build-failure-with-gcc-fno-common.patch Patch0003: 0003-bodhi-Initialize-karma-values-with-default.patch -Patch0004- 0004-dbus-Fix-possibly-uninitialized-variable.patch +Patch0004: 0004-dbus-Fix-possibly-uninitialized-variable.patch BuildRequires: git-core BuildRequires: %{dbus_devel} From 2bb52e3881eaebbccf9669cc9b8eaa737f9d3517 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 7 Feb 2020 07:25:47 +0100 Subject: [PATCH 041/125] Rebuild for satyr 0.30 Signed-off-by: Igor Raits --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index f6d2fd2..d971650 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.13.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1020,6 +1020,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Feb 07 2020 Igor Raits - 2.13.0-5 +- Rebuild for satyr 0.30 + * Fri Jan 31 2020 Martin Kutlak - 2.13.0-4 - Add patch to fix build failure with gcc -fno-common - Initialize bodhi karma values with defaults From 10288b9c6dfc3a092c51c52835b76a95a66e5c7e Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 7 Feb 2020 07:41:21 +0100 Subject: [PATCH 042/125] Add patch to fix build with new libreport Signed-off-by: Igor Raits --- ...oid-explicit-dependency-on-hash-size.patch | 187 ++++++++++++++++++ abrt.spec | 2 + 2 files changed, 189 insertions(+) create mode 100644 0001-koops-Avoid-explicit-dependency-on-hash-size.patch diff --git a/0001-koops-Avoid-explicit-dependency-on-hash-size.patch b/0001-koops-Avoid-explicit-dependency-on-hash-size.patch new file mode 100644 index 0000000..205655d --- /dev/null +++ b/0001-koops-Avoid-explicit-dependency-on-hash-size.patch @@ -0,0 +1,187 @@ +From 5284fd63f1d2d9da09fd1793e49ab734557ea046 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Thu, 23 Jan 2020 13:47:50 +0100 +Subject: [PATCH] koops: Avoid explicit dependency on hash size + +Change the API so that koops_hash_str and koops_hash_str_ext return the +heap-allocated encoded digest instead of taking a pointer and returning +a status code. + +This eliminates the need to know the size of the resulting hash in +advance, which should solve the build problems following recent +libreport changes. +--- + src/include/libabrt.h | 4 +-- + src/lib/kernel.c | 39 +++++++++----------------- + src/plugins/abrt-action-analyze-oops.c | 11 ++++---- + tests/koops-parser.at | 14 ++++----- + 4 files changed, 27 insertions(+), 41 deletions(-) + +diff --git a/src/include/libabrt.h b/src/include/libabrt.h +index 33a1c5af..ab0bf6aa 100644 +--- a/src/include/libabrt.h ++++ b/src/include/libabrt.h +@@ -138,9 +138,9 @@ char *kernel_tainted_short(const char *kernel_bt); + #define kernel_tainted_long abrt_kernel_tainted_long + char *kernel_tainted_long(const char *tainted_short); + #define koops_hash_str_ext abrt_koops_hash_str_ext +-int koops_hash_str_ext(char hash_str[SHA1_RESULT_LEN*2 + 1], const char *oops_buf, int frame_count, int duphas_flags); ++char *koops_hash_str_ext(const char *oops_buf, int frame_count, int duphas_flags); + #define koops_hash_str abrt_koops_hash_str +-int koops_hash_str(char hash_str[SHA1_RESULT_LEN*2 + 1], const char *oops_buf); ++char *koops_hash_str(const char *oops_buf); + + + #define koops_line_skip_level abrt_koops_line_skip_level +diff --git a/src/lib/kernel.c b/src/lib/kernel.c +index 7b831dac..c95bf7f9 100644 +--- a/src/lib/kernel.c ++++ b/src/lib/kernel.c +@@ -586,18 +586,16 @@ void koops_extract_oopses_from_lines(GList **oops_list, const struct abrt_koops_ + } + } + +-int koops_hash_str_ext(char result[SHA1_RESULT_LEN*2 + 1], const char *oops_buf, int frame_count, int duphash_flags) ++char *koops_hash_str_ext(const char *oops_buf, int frame_count, int duphash_flags) + { +- char *hash_str = NULL, *error = NULL; +- int bad = 0; ++ g_autofree char *error = NULL; ++ char *digest = NULL; + + struct sr_stacktrace *stacktrace = sr_stacktrace_parse(SR_REPORT_KERNELOOPS, + oops_buf, &error); + if (!stacktrace) + { + log_debug("Failed to parse koops: %s", error); +- free(error); +- bad = 1; + goto end; + } + +@@ -605,43 +603,34 @@ int koops_hash_str_ext(char result[SHA1_RESULT_LEN*2 + 1], const char *oops_buf, + if (!thread) + { + log_debug("Failed to find crash thread"); +- bad = 1; + goto end; + } + + if (g_verbose >= 3) + { +- hash_str = sr_thread_get_duphash(thread, frame_count, NULL, +- duphash_flags|SR_DUPHASH_NOHASH); +- if (hash_str) +- log_warning("Generating duphash: '%s'", hash_str); ++ digest = sr_thread_get_duphash(thread, frame_count, NULL, ++ duphash_flags|SR_DUPHASH_NOHASH); ++ if (digest) ++ { ++ log_warning("Generating duphash: '%s'", digest); ++ free(digest); ++ } + else + log_warning("Nothing useful for duphash"); +- +- +- free(hash_str); + } + +- hash_str = sr_thread_get_duphash(thread, frame_count, NULL, duphash_flags); +- if (hash_str) +- { +- strncpy(result, hash_str, SHA1_RESULT_LEN*2); +- result[SHA1_RESULT_LEN*2] = '\0'; +- free(hash_str); +- } +- else +- bad = 1; ++ digest = sr_thread_get_duphash(thread, frame_count, NULL, duphash_flags); + + end: + sr_stacktrace_free(stacktrace); +- return bad; ++ return digest; + } + +-int koops_hash_str(char result[SHA1_RESULT_LEN*2 + 1], const char *oops_buf) ++char *koops_hash_str(const char *oops_buf) + { + const int frame_count = 6; + const int duphash_flags = SR_DUPHASH_NONORMALIZE|SR_DUPHASH_KOOPS_COMPAT; +- return koops_hash_str_ext(result, oops_buf, frame_count, duphash_flags); ++ return koops_hash_str_ext(oops_buf, frame_count, duphash_flags); + } + + char *koops_extract_version(const char *linepointer) +diff --git a/src/plugins/abrt-action-analyze-oops.c b/src/plugins/abrt-action-analyze-oops.c +index d7fe6886..ddd1c46d 100644 +--- a/src/plugins/abrt-action-analyze-oops.c ++++ b/src/plugins/abrt-action-analyze-oops.c +@@ -60,9 +60,8 @@ int main(int argc, char **argv) + load_abrt_plugin_conf_file("oops.conf", settings); + + char *oops = dd_load_text(dd, FILENAME_BACKTRACE); +- char hash_str[SHA1_RESULT_LEN*2 + 1]; +- int bad = koops_hash_str(hash_str, oops); +- if (bad) ++ g_autofree char *hash_str = koops_hash_str(oops); ++ if (!hash_str) + { + error_msg("Can't find a meaningful backtrace for hashing in '%s'", dump_dir_name); + +@@ -87,7 +86,7 @@ int main(int argc, char **argv) + /* We need UUID file for the local duplicates look-up and DUPHASH */ + /* file is also useful because user can force ABRT to report */ + /* the oops into a bug tracking system (Bugzilla). */ +- bad = koops_hash_str_ext(hash_str, oops, ++ hash_str = koops_hash_str_ext(oops, + /* use no frame count limit */-1, + /* use every frame in stacktrace */0); + +@@ -97,7 +96,7 @@ int main(int argc, char **argv) + + free(oops); + +- if (!bad) ++ if (hash_str) + { + dd_save_text(dd, FILENAME_UUID, hash_str); + dd_save_text(dd, FILENAME_DUPHASH, hash_str); +@@ -107,5 +106,5 @@ int main(int argc, char **argv) + + free_map_string(settings); + +- return bad; ++ return NULL != hash_str; + } +diff --git a/tests/koops-parser.at b/tests/koops-parser.at +index 4f9087ab..51a45e62 100644 +--- a/tests/koops-parser.at ++++ b/tests/koops-parser.at +@@ -125,16 +125,14 @@ AT_TESTFUN([koops_hash_improve], + + int run_test(const struct test_struct *test) + { +- char *oops1 = fread_full(test->filename); +- char *oops2 = fread_full(test->expected_results); ++ g_autofree char *oops1 = fread_full(test->filename); ++ g_autofree char *oops2 = fread_full(test->expected_results); + +- char hash_oops1[SHA1_RESULT_LEN*2 + 1]; +- koops_hash_str(hash_oops1, oops1); +- free(oops1); ++ g_autofree char *hash_oops1 = koops_hash_str(oops1); ++ g_autofree char *hash_oops2 = koops_hash_str(oops2); + +- char hash_oops2[SHA1_RESULT_LEN*2 + 1]; +- koops_hash_str(hash_oops2, oops2); +- free(oops2); ++ if (NULL == hash_oops1 || NULL == hash_oops2) ++ return 1; + + if (!strcmp(hash_oops1, hash_oops2)) + return 0; +-- +2.25.0 + diff --git a/abrt.spec b/abrt.spec index d971650..5c4f2f0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -58,6 +58,8 @@ Patch0001: 0001-python-Use-correct-paths-for-installed-modules.patch Patch0002: 0002-Fix-build-failure-with-gcc-fno-common.patch Patch0003: 0003-bodhi-Initialize-karma-values-with-default.patch Patch0004: 0004-dbus-Fix-possibly-uninitialized-variable.patch +# https://github.com/abrt/abrt/commit/439fe1daddd62d53bf2ee72c45b631f5248daf5d +Patch0005: 0001-koops-Avoid-explicit-dependency-on-hash-size.patch BuildRequires: git-core BuildRequires: %{dbus_devel} From 5f74b5e40709fd5924c4dc57f71d00f052786e89 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 7 Feb 2020 07:51:01 +0100 Subject: [PATCH 043/125] Backport few more patches to fix compatibility with new libreport Signed-off-by: Igor Raits --- 0001-Stop-using-parse_list.patch | 70 ++++++++ 0001-Use-GChecksum-to-compute-checksums.patch | 168 ++++++++++++++++++ abrt.spec | 6 +- 3 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 0001-Stop-using-parse_list.patch create mode 100644 0001-Use-GChecksum-to-compute-checksums.patch diff --git a/0001-Stop-using-parse_list.patch b/0001-Stop-using-parse_list.patch new file mode 100644 index 0000000..8f2459c --- /dev/null +++ b/0001-Stop-using-parse_list.patch @@ -0,0 +1,70 @@ +From 3f5003af92d2b2b0e4f5565ccd90b29e32e6b30b Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Thu, 16 Jan 2020 10:53:47 +0100 +Subject: [PATCH] Stop using parse_list + +It will be gone from libreport before you know it. +--- + src/daemon/abrt-action-save-package-data.c | 12 ++++++------ + src/plugins/abrt-dump-journal-xorg.c | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c +index e52b3d55..30e8fd73 100644 +--- a/src/daemon/abrt-action-save-package-data.c ++++ b/src/daemon/abrt-action-save-package-data.c +@@ -49,20 +49,20 @@ static void ParseCommon(map_string_t *settings, const char *conf_filename) + value = get_map_string_item_or_NULL(settings, "BlackList"); + if (value) + { +- settings_setBlackListedPkgs = parse_list(value); ++ settings_setBlackListedPkgs = parse_delimited_list(value, ","); + remove_map_string_item(settings, "BlackList"); + } + else +- settings_setBlackListedPkgs = parse_list(DEFAULT_BLACKLISTED_PKGS); ++ settings_setBlackListedPkgs = parse_delimited_list(DEFAULT_BLACKLISTED_PKGS, ","); + + value = get_map_string_item_or_NULL(settings, "BlackListedPaths"); + if (value) + { +- settings_setBlackListedPaths = parse_list(value); ++ settings_setBlackListedPaths = parse_delimited_list(value, ","); + remove_map_string_item(settings, "BlackListedPaths"); + } + else +- settings_setBlackListedPaths = parse_list(DEFAULT_BLACKLISTED_PATHS); ++ settings_setBlackListedPaths = parse_delimited_list(DEFAULT_BLACKLISTED_PATHS, ","); + + value = get_map_string_item_or_NULL(settings, "ProcessUnpackaged"); + if (value) +@@ -74,11 +74,11 @@ static void ParseCommon(map_string_t *settings, const char *conf_filename) + value = get_map_string_item_or_NULL(settings, "Interpreters"); + if (value) + { +- settings_Interpreters = parse_list(value); ++ settings_Interpreters = parse_delimited_list(value, ","); + remove_map_string_item(settings, "Interpreters"); + } + else +- settings_Interpreters = parse_list(DEFAULT_INTERPRETERS); ++ settings_Interpreters = parse_delimited_list(DEFAULT_INTERPRETERS, ","); + + map_string_iter_t iter; + const char *name; +diff --git a/src/plugins/abrt-dump-journal-xorg.c b/src/plugins/abrt-dump-journal-xorg.c +index 92d19661..351bbae4 100644 +--- a/src/plugins/abrt-dump-journal-xorg.c ++++ b/src/plugins/abrt-dump-journal-xorg.c +@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) + conf_journal_filters = XORG_DEFAULT_JOURNAL_FILTERS; + } + +- xorg_journal_filter = parse_list(conf_journal_filters); ++ xorg_journal_filter = parse_delimited_list(conf_journal_filters, ","); + /* list data will be free by g_list_free_full */ + free_filter_list_data = true; + free_map_string(settings); +-- +2.25.0 + diff --git a/0001-Use-GChecksum-to-compute-checksums.patch b/0001-Use-GChecksum-to-compute-checksums.patch new file mode 100644 index 0000000..f0e32ae --- /dev/null +++ b/0001-Use-GChecksum-to-compute-checksums.patch @@ -0,0 +1,168 @@ +From 16468b57579997971c056687ecc8438a406d57c2 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Tue, 14 Jan 2020 16:36:21 +0100 +Subject: [PATCH] Use GChecksum to compute checksums +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +d605ffeaa6ae411ef396160ffd67b7a6fd27c6ba in libreport removed some +convenience API for hashing data, so let’s just go with what GLib has in +store. +--- + src/dbus/abrt_problems2_service.c | 33 +++++++++++---------- + src/plugins/abrt-action-analyze-backtrace.c | 8 +++-- + src/plugins/abrt-action-analyze-c.c | 7 +++-- + src/plugins/abrt-action-analyze-python.c | 9 +++--- + 4 files changed, 32 insertions(+), 25 deletions(-) + +diff --git a/src/dbus/abrt_problems2_service.c b/src/dbus/abrt_problems2_service.c +index 2511136f..a0d2a3ce 100644 +--- a/src/dbus/abrt_problems2_service.c ++++ b/src/dbus/abrt_problems2_service.c +@@ -572,9 +572,11 @@ static AbrtP2Object *session_object_register(AbrtP2Service *service, + + static char *session_object_caller_to_path(const char *caller) + { +- char hash_str[SHA1_RESULT_LEN*2 + 1]; +- str_to_sha1str(hash_str, caller); +- return xasprintf(ABRT_P2_PATH"/Session/%s", hash_str); ++ g_autofree char *checksum = NULL; ++ ++ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, caller, -1); ++ ++ return xasprintf(ABRT_P2_PATH"/Session/%s", checksum); + } + + static AbrtP2Object *abrt_p2_service_get_session_for_caller( +@@ -1323,9 +1325,11 @@ static void entry_object_destructor(AbrtP2Object *obj) + + static char *entry_object_dir_name_to_path(const char *dd_dirname) + { +- char hash_str[SHA1_RESULT_LEN*2 + 1]; +- str_to_sha1str(hash_str, dd_dirname); +- return xasprintf(ABRT_P2_PATH"/Entry/%s", hash_str); ++ g_autofree char *checksum = NULL; ++ ++ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, dd_dirname, -1); ++ ++ return xasprintf(ABRT_P2_PATH"/Entry/%s", checksum); + } + + static AbrtP2Object *entry_object_register_dump_dir(AbrtP2Service *service, +@@ -1480,8 +1484,10 @@ char *abrt_p2_service_save_problem( AbrtP2Service *service, + else + { + /* start hash */ +- sha1_ctx_t sha1ctx; +- sha1_begin(&sha1ctx); ++ g_autoptr(GChecksum) checksum = NULL; ++ const char *digest; ++ ++ checksum = g_checksum_new(G_CHECKSUM_SHA1); + + /* + * To avoid spurious hash differences, sort keys so that elements are +@@ -1500,19 +1506,16 @@ char *abrt_p2_service_save_problem( AbrtP2Service *service, + + gsize size = 0; + const char *content = g_variant_get_string(element, &size); +- sha1_hash(&sha1ctx, content, size); ++ ++ g_checksum_update(checksum, (const unsigned char *)content, size); + + g_variant_unref(element); + } + g_list_free_full(list, free); + +- /* end hash */ +- char hash_bytes[SHA1_RESULT_LEN]; +- sha1_end(&sha1ctx, hash_bytes); +- char hash_str[SHA1_RESULT_LEN*2 + 1]; +- bin2hex(hash_str, hash_bytes, SHA1_RESULT_LEN)[0] = '\0'; ++ digest = g_checksum_get_string(checksum); + +- g_variant_dict_insert(&pd, FILENAME_UUID, "s", hash_str); ++ g_variant_dict_insert(&pd, FILENAME_UUID, "s", digest); + } + } + +diff --git a/src/plugins/abrt-action-analyze-backtrace.c b/src/plugins/abrt-action-analyze-backtrace.c +index 622d7953..20e71945 100644 +--- a/src/plugins/abrt-action-analyze-backtrace.c ++++ b/src/plugins/abrt-action-analyze-backtrace.c +@@ -82,6 +82,8 @@ int main(int argc, char **argv) + /* Store backtrace hash */ + if (!backtrace) + { ++ g_autofree char *checksum = NULL; ++ + /* + * The parser failed. Compute the duphash from the executable + * instead of a backtrace. +@@ -98,10 +100,10 @@ int main(int argc, char **argv) + strbuf_prepend_str(emptybt, component); + + log_debug("Generating duphash: %s", emptybt->buf); +- char hash_str[SHA1_RESULT_LEN*2 + 1]; +- str_to_sha1str(hash_str, emptybt->buf); + +- dd_save_text(dd, FILENAME_DUPHASH, hash_str); ++ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, emptybt->buf, -1); ++ ++ dd_save_text(dd, FILENAME_DUPHASH, checksum); + /* + * Other parts of ABRT assume that if no rating is available, + * it is ok to allow reporting of the bug. To be sure no bad +diff --git a/src/plugins/abrt-action-analyze-c.c b/src/plugins/abrt-action-analyze-c.c +index 08e48779..4a6d34d4 100644 +--- a/src/plugins/abrt-action-analyze-c.c ++++ b/src/plugins/abrt-action-analyze-c.c +@@ -235,10 +235,11 @@ int main(int argc, char **argv) + + log_debug("String to hash: %s", string_to_hash); + +- char hash_str[SHA1_RESULT_LEN*2 + 1]; +- str_to_sha1str(hash_str, string_to_hash); ++ g_autofree char *checksum = NULL; + +- dd_save_text(dd, FILENAME_UUID, hash_str); ++ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, string_to_hash, -1); ++ ++ dd_save_text(dd, FILENAME_UUID, checksum); + + /* Create crash_function element from core_backtrace */ + char *core_backtrace_json = dd_load_text_ext(dd, FILENAME_CORE_BACKTRACE, +diff --git a/src/plugins/abrt-action-analyze-python.c b/src/plugins/abrt-action-analyze-python.c +index 0dd55750..10589cbb 100644 +--- a/src/plugins/abrt-action-analyze-python.c ++++ b/src/plugins/abrt-action-analyze-python.c +@@ -26,6 +26,8 @@ + + int main(int argc, char **argv) + { ++ g_autofree char *checksum = NULL; ++ + /* I18n */ + setlocale(LC_ALL, ""); + #if ENABLE_NLS +@@ -91,13 +93,12 @@ int main(int argc, char **argv) + + char *bt_end = strchrnul(bt, '\n'); + *bt_end = '\0'; +- char hash_str[SHA1_RESULT_LEN*2 + 1]; +- str_to_sha1str(hash_str, bt); ++ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, bt, -1); + + free(bt); + +- dd_save_text(dd, FILENAME_UUID, hash_str); +- dd_save_text(dd, FILENAME_DUPHASH, hash_str); ++ dd_save_text(dd, FILENAME_UUID, checksum); ++ dd_save_text(dd, FILENAME_DUPHASH, checksum); + dd_close(dd); + + return 0; +-- +2.25.0 + diff --git a/abrt.spec b/abrt.spec index 5c4f2f0..8ab97a0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -58,8 +58,12 @@ Patch0001: 0001-python-Use-correct-paths-for-installed-modules.patch Patch0002: 0002-Fix-build-failure-with-gcc-fno-common.patch Patch0003: 0003-bodhi-Initialize-karma-values-with-default.patch Patch0004: 0004-dbus-Fix-possibly-uninitialized-variable.patch +# https://github.com/abrt/abrt/commit/16468b57579997971c056687ecc8438a406d57c2 +Patch0005: 0001-Use-GChecksum-to-compute-checksums.patch # https://github.com/abrt/abrt/commit/439fe1daddd62d53bf2ee72c45b631f5248daf5d -Patch0005: 0001-koops-Avoid-explicit-dependency-on-hash-size.patch +Patch0006: 0001-koops-Avoid-explicit-dependency-on-hash-size.patch +# https://github.com/abrt/abrt/commit/3f5003af92d2b2b0e4f5565ccd90b29e32e6b30b +Patch0007: 0001-Stop-using-parse_list.patch BuildRequires: git-core BuildRequires: %{dbus_devel} From c84c5d2738eebdb48a1fe1c2aade1e37b3935f94 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Fri, 7 Feb 2020 08:45:18 +0100 Subject: [PATCH 044/125] Update to 2.14.0 --- .gitignore | 1 + 0001-Stop-using-parse_list.patch | 70 ------- 0001-Use-GChecksum-to-compute-checksums.patch | 168 ---------------- ...oid-explicit-dependency-on-hash-size.patch | 187 ------------------ ...-correct-paths-for-installed-modules.patch | 96 --------- ...ix-build-failure-with-gcc-fno-common.patch | 165 ---------------- ...Initialize-karma-values-with-default.patch | 32 --- ...-Fix-possibly-uninitialized-variable.patch | 29 --- abrt.spec | 18 +- sources | 2 +- 10 files changed, 7 insertions(+), 761 deletions(-) delete mode 100644 0001-Stop-using-parse_list.patch delete mode 100644 0001-Use-GChecksum-to-compute-checksums.patch delete mode 100644 0001-koops-Avoid-explicit-dependency-on-hash-size.patch delete mode 100644 0001-python-Use-correct-paths-for-installed-modules.patch delete mode 100644 0002-Fix-build-failure-with-gcc-fno-common.patch delete mode 100644 0003-bodhi-Initialize-karma-values-with-default.patch delete mode 100644 0004-dbus-Fix-possibly-uninitialized-variable.patch diff --git a/.gitignore b/.gitignore index 6268042..41d1ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ abrt-1.1.13.tar.gz /abrt-2.12.1.tar.gz /abrt-2.12.2.tar.gz /abrt-2.13.0.tar.gz +/abrt-2.14.0.tar.gz diff --git a/0001-Stop-using-parse_list.patch b/0001-Stop-using-parse_list.patch deleted file mode 100644 index 8f2459c..0000000 --- a/0001-Stop-using-parse_list.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3f5003af92d2b2b0e4f5565ccd90b29e32e6b30b Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Thu, 16 Jan 2020 10:53:47 +0100 -Subject: [PATCH] Stop using parse_list - -It will be gone from libreport before you know it. ---- - src/daemon/abrt-action-save-package-data.c | 12 ++++++------ - src/plugins/abrt-dump-journal-xorg.c | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c -index e52b3d55..30e8fd73 100644 ---- a/src/daemon/abrt-action-save-package-data.c -+++ b/src/daemon/abrt-action-save-package-data.c -@@ -49,20 +49,20 @@ static void ParseCommon(map_string_t *settings, const char *conf_filename) - value = get_map_string_item_or_NULL(settings, "BlackList"); - if (value) - { -- settings_setBlackListedPkgs = parse_list(value); -+ settings_setBlackListedPkgs = parse_delimited_list(value, ","); - remove_map_string_item(settings, "BlackList"); - } - else -- settings_setBlackListedPkgs = parse_list(DEFAULT_BLACKLISTED_PKGS); -+ settings_setBlackListedPkgs = parse_delimited_list(DEFAULT_BLACKLISTED_PKGS, ","); - - value = get_map_string_item_or_NULL(settings, "BlackListedPaths"); - if (value) - { -- settings_setBlackListedPaths = parse_list(value); -+ settings_setBlackListedPaths = parse_delimited_list(value, ","); - remove_map_string_item(settings, "BlackListedPaths"); - } - else -- settings_setBlackListedPaths = parse_list(DEFAULT_BLACKLISTED_PATHS); -+ settings_setBlackListedPaths = parse_delimited_list(DEFAULT_BLACKLISTED_PATHS, ","); - - value = get_map_string_item_or_NULL(settings, "ProcessUnpackaged"); - if (value) -@@ -74,11 +74,11 @@ static void ParseCommon(map_string_t *settings, const char *conf_filename) - value = get_map_string_item_or_NULL(settings, "Interpreters"); - if (value) - { -- settings_Interpreters = parse_list(value); -+ settings_Interpreters = parse_delimited_list(value, ","); - remove_map_string_item(settings, "Interpreters"); - } - else -- settings_Interpreters = parse_list(DEFAULT_INTERPRETERS); -+ settings_Interpreters = parse_delimited_list(DEFAULT_INTERPRETERS, ","); - - map_string_iter_t iter; - const char *name; -diff --git a/src/plugins/abrt-dump-journal-xorg.c b/src/plugins/abrt-dump-journal-xorg.c -index 92d19661..351bbae4 100644 ---- a/src/plugins/abrt-dump-journal-xorg.c -+++ b/src/plugins/abrt-dump-journal-xorg.c -@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) - conf_journal_filters = XORG_DEFAULT_JOURNAL_FILTERS; - } - -- xorg_journal_filter = parse_list(conf_journal_filters); -+ xorg_journal_filter = parse_delimited_list(conf_journal_filters, ","); - /* list data will be free by g_list_free_full */ - free_filter_list_data = true; - free_map_string(settings); --- -2.25.0 - diff --git a/0001-Use-GChecksum-to-compute-checksums.patch b/0001-Use-GChecksum-to-compute-checksums.patch deleted file mode 100644 index f0e32ae..0000000 --- a/0001-Use-GChecksum-to-compute-checksums.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 16468b57579997971c056687ecc8438a406d57c2 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Tue, 14 Jan 2020 16:36:21 +0100 -Subject: [PATCH] Use GChecksum to compute checksums -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -d605ffeaa6ae411ef396160ffd67b7a6fd27c6ba in libreport removed some -convenience API for hashing data, so let’s just go with what GLib has in -store. ---- - src/dbus/abrt_problems2_service.c | 33 +++++++++++---------- - src/plugins/abrt-action-analyze-backtrace.c | 8 +++-- - src/plugins/abrt-action-analyze-c.c | 7 +++-- - src/plugins/abrt-action-analyze-python.c | 9 +++--- - 4 files changed, 32 insertions(+), 25 deletions(-) - -diff --git a/src/dbus/abrt_problems2_service.c b/src/dbus/abrt_problems2_service.c -index 2511136f..a0d2a3ce 100644 ---- a/src/dbus/abrt_problems2_service.c -+++ b/src/dbus/abrt_problems2_service.c -@@ -572,9 +572,11 @@ static AbrtP2Object *session_object_register(AbrtP2Service *service, - - static char *session_object_caller_to_path(const char *caller) - { -- char hash_str[SHA1_RESULT_LEN*2 + 1]; -- str_to_sha1str(hash_str, caller); -- return xasprintf(ABRT_P2_PATH"/Session/%s", hash_str); -+ g_autofree char *checksum = NULL; -+ -+ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, caller, -1); -+ -+ return xasprintf(ABRT_P2_PATH"/Session/%s", checksum); - } - - static AbrtP2Object *abrt_p2_service_get_session_for_caller( -@@ -1323,9 +1325,11 @@ static void entry_object_destructor(AbrtP2Object *obj) - - static char *entry_object_dir_name_to_path(const char *dd_dirname) - { -- char hash_str[SHA1_RESULT_LEN*2 + 1]; -- str_to_sha1str(hash_str, dd_dirname); -- return xasprintf(ABRT_P2_PATH"/Entry/%s", hash_str); -+ g_autofree char *checksum = NULL; -+ -+ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, dd_dirname, -1); -+ -+ return xasprintf(ABRT_P2_PATH"/Entry/%s", checksum); - } - - static AbrtP2Object *entry_object_register_dump_dir(AbrtP2Service *service, -@@ -1480,8 +1484,10 @@ char *abrt_p2_service_save_problem( AbrtP2Service *service, - else - { - /* start hash */ -- sha1_ctx_t sha1ctx; -- sha1_begin(&sha1ctx); -+ g_autoptr(GChecksum) checksum = NULL; -+ const char *digest; -+ -+ checksum = g_checksum_new(G_CHECKSUM_SHA1); - - /* - * To avoid spurious hash differences, sort keys so that elements are -@@ -1500,19 +1506,16 @@ char *abrt_p2_service_save_problem( AbrtP2Service *service, - - gsize size = 0; - const char *content = g_variant_get_string(element, &size); -- sha1_hash(&sha1ctx, content, size); -+ -+ g_checksum_update(checksum, (const unsigned char *)content, size); - - g_variant_unref(element); - } - g_list_free_full(list, free); - -- /* end hash */ -- char hash_bytes[SHA1_RESULT_LEN]; -- sha1_end(&sha1ctx, hash_bytes); -- char hash_str[SHA1_RESULT_LEN*2 + 1]; -- bin2hex(hash_str, hash_bytes, SHA1_RESULT_LEN)[0] = '\0'; -+ digest = g_checksum_get_string(checksum); - -- g_variant_dict_insert(&pd, FILENAME_UUID, "s", hash_str); -+ g_variant_dict_insert(&pd, FILENAME_UUID, "s", digest); - } - } - -diff --git a/src/plugins/abrt-action-analyze-backtrace.c b/src/plugins/abrt-action-analyze-backtrace.c -index 622d7953..20e71945 100644 ---- a/src/plugins/abrt-action-analyze-backtrace.c -+++ b/src/plugins/abrt-action-analyze-backtrace.c -@@ -82,6 +82,8 @@ int main(int argc, char **argv) - /* Store backtrace hash */ - if (!backtrace) - { -+ g_autofree char *checksum = NULL; -+ - /* - * The parser failed. Compute the duphash from the executable - * instead of a backtrace. -@@ -98,10 +100,10 @@ int main(int argc, char **argv) - strbuf_prepend_str(emptybt, component); - - log_debug("Generating duphash: %s", emptybt->buf); -- char hash_str[SHA1_RESULT_LEN*2 + 1]; -- str_to_sha1str(hash_str, emptybt->buf); - -- dd_save_text(dd, FILENAME_DUPHASH, hash_str); -+ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, emptybt->buf, -1); -+ -+ dd_save_text(dd, FILENAME_DUPHASH, checksum); - /* - * Other parts of ABRT assume that if no rating is available, - * it is ok to allow reporting of the bug. To be sure no bad -diff --git a/src/plugins/abrt-action-analyze-c.c b/src/plugins/abrt-action-analyze-c.c -index 08e48779..4a6d34d4 100644 ---- a/src/plugins/abrt-action-analyze-c.c -+++ b/src/plugins/abrt-action-analyze-c.c -@@ -235,10 +235,11 @@ int main(int argc, char **argv) - - log_debug("String to hash: %s", string_to_hash); - -- char hash_str[SHA1_RESULT_LEN*2 + 1]; -- str_to_sha1str(hash_str, string_to_hash); -+ g_autofree char *checksum = NULL; - -- dd_save_text(dd, FILENAME_UUID, hash_str); -+ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, string_to_hash, -1); -+ -+ dd_save_text(dd, FILENAME_UUID, checksum); - - /* Create crash_function element from core_backtrace */ - char *core_backtrace_json = dd_load_text_ext(dd, FILENAME_CORE_BACKTRACE, -diff --git a/src/plugins/abrt-action-analyze-python.c b/src/plugins/abrt-action-analyze-python.c -index 0dd55750..10589cbb 100644 ---- a/src/plugins/abrt-action-analyze-python.c -+++ b/src/plugins/abrt-action-analyze-python.c -@@ -26,6 +26,8 @@ - - int main(int argc, char **argv) - { -+ g_autofree char *checksum = NULL; -+ - /* I18n */ - setlocale(LC_ALL, ""); - #if ENABLE_NLS -@@ -91,13 +93,12 @@ int main(int argc, char **argv) - - char *bt_end = strchrnul(bt, '\n'); - *bt_end = '\0'; -- char hash_str[SHA1_RESULT_LEN*2 + 1]; -- str_to_sha1str(hash_str, bt); -+ checksum = g_compute_checksum_for_string(G_CHECKSUM_SHA1, bt, -1); - - free(bt); - -- dd_save_text(dd, FILENAME_UUID, hash_str); -- dd_save_text(dd, FILENAME_DUPHASH, hash_str); -+ dd_save_text(dd, FILENAME_UUID, checksum); -+ dd_save_text(dd, FILENAME_DUPHASH, checksum); - dd_close(dd); - - return 0; --- -2.25.0 - diff --git a/0001-koops-Avoid-explicit-dependency-on-hash-size.patch b/0001-koops-Avoid-explicit-dependency-on-hash-size.patch deleted file mode 100644 index 205655d..0000000 --- a/0001-koops-Avoid-explicit-dependency-on-hash-size.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 5284fd63f1d2d9da09fd1793e49ab734557ea046 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Thu, 23 Jan 2020 13:47:50 +0100 -Subject: [PATCH] koops: Avoid explicit dependency on hash size - -Change the API so that koops_hash_str and koops_hash_str_ext return the -heap-allocated encoded digest instead of taking a pointer and returning -a status code. - -This eliminates the need to know the size of the resulting hash in -advance, which should solve the build problems following recent -libreport changes. ---- - src/include/libabrt.h | 4 +-- - src/lib/kernel.c | 39 +++++++++----------------- - src/plugins/abrt-action-analyze-oops.c | 11 ++++---- - tests/koops-parser.at | 14 ++++----- - 4 files changed, 27 insertions(+), 41 deletions(-) - -diff --git a/src/include/libabrt.h b/src/include/libabrt.h -index 33a1c5af..ab0bf6aa 100644 ---- a/src/include/libabrt.h -+++ b/src/include/libabrt.h -@@ -138,9 +138,9 @@ char *kernel_tainted_short(const char *kernel_bt); - #define kernel_tainted_long abrt_kernel_tainted_long - char *kernel_tainted_long(const char *tainted_short); - #define koops_hash_str_ext abrt_koops_hash_str_ext --int koops_hash_str_ext(char hash_str[SHA1_RESULT_LEN*2 + 1], const char *oops_buf, int frame_count, int duphas_flags); -+char *koops_hash_str_ext(const char *oops_buf, int frame_count, int duphas_flags); - #define koops_hash_str abrt_koops_hash_str --int koops_hash_str(char hash_str[SHA1_RESULT_LEN*2 + 1], const char *oops_buf); -+char *koops_hash_str(const char *oops_buf); - - - #define koops_line_skip_level abrt_koops_line_skip_level -diff --git a/src/lib/kernel.c b/src/lib/kernel.c -index 7b831dac..c95bf7f9 100644 ---- a/src/lib/kernel.c -+++ b/src/lib/kernel.c -@@ -586,18 +586,16 @@ void koops_extract_oopses_from_lines(GList **oops_list, const struct abrt_koops_ - } - } - --int koops_hash_str_ext(char result[SHA1_RESULT_LEN*2 + 1], const char *oops_buf, int frame_count, int duphash_flags) -+char *koops_hash_str_ext(const char *oops_buf, int frame_count, int duphash_flags) - { -- char *hash_str = NULL, *error = NULL; -- int bad = 0; -+ g_autofree char *error = NULL; -+ char *digest = NULL; - - struct sr_stacktrace *stacktrace = sr_stacktrace_parse(SR_REPORT_KERNELOOPS, - oops_buf, &error); - if (!stacktrace) - { - log_debug("Failed to parse koops: %s", error); -- free(error); -- bad = 1; - goto end; - } - -@@ -605,43 +603,34 @@ int koops_hash_str_ext(char result[SHA1_RESULT_LEN*2 + 1], const char *oops_buf, - if (!thread) - { - log_debug("Failed to find crash thread"); -- bad = 1; - goto end; - } - - if (g_verbose >= 3) - { -- hash_str = sr_thread_get_duphash(thread, frame_count, NULL, -- duphash_flags|SR_DUPHASH_NOHASH); -- if (hash_str) -- log_warning("Generating duphash: '%s'", hash_str); -+ digest = sr_thread_get_duphash(thread, frame_count, NULL, -+ duphash_flags|SR_DUPHASH_NOHASH); -+ if (digest) -+ { -+ log_warning("Generating duphash: '%s'", digest); -+ free(digest); -+ } - else - log_warning("Nothing useful for duphash"); -- -- -- free(hash_str); - } - -- hash_str = sr_thread_get_duphash(thread, frame_count, NULL, duphash_flags); -- if (hash_str) -- { -- strncpy(result, hash_str, SHA1_RESULT_LEN*2); -- result[SHA1_RESULT_LEN*2] = '\0'; -- free(hash_str); -- } -- else -- bad = 1; -+ digest = sr_thread_get_duphash(thread, frame_count, NULL, duphash_flags); - - end: - sr_stacktrace_free(stacktrace); -- return bad; -+ return digest; - } - --int koops_hash_str(char result[SHA1_RESULT_LEN*2 + 1], const char *oops_buf) -+char *koops_hash_str(const char *oops_buf) - { - const int frame_count = 6; - const int duphash_flags = SR_DUPHASH_NONORMALIZE|SR_DUPHASH_KOOPS_COMPAT; -- return koops_hash_str_ext(result, oops_buf, frame_count, duphash_flags); -+ return koops_hash_str_ext(oops_buf, frame_count, duphash_flags); - } - - char *koops_extract_version(const char *linepointer) -diff --git a/src/plugins/abrt-action-analyze-oops.c b/src/plugins/abrt-action-analyze-oops.c -index d7fe6886..ddd1c46d 100644 ---- a/src/plugins/abrt-action-analyze-oops.c -+++ b/src/plugins/abrt-action-analyze-oops.c -@@ -60,9 +60,8 @@ int main(int argc, char **argv) - load_abrt_plugin_conf_file("oops.conf", settings); - - char *oops = dd_load_text(dd, FILENAME_BACKTRACE); -- char hash_str[SHA1_RESULT_LEN*2 + 1]; -- int bad = koops_hash_str(hash_str, oops); -- if (bad) -+ g_autofree char *hash_str = koops_hash_str(oops); -+ if (!hash_str) - { - error_msg("Can't find a meaningful backtrace for hashing in '%s'", dump_dir_name); - -@@ -87,7 +86,7 @@ int main(int argc, char **argv) - /* We need UUID file for the local duplicates look-up and DUPHASH */ - /* file is also useful because user can force ABRT to report */ - /* the oops into a bug tracking system (Bugzilla). */ -- bad = koops_hash_str_ext(hash_str, oops, -+ hash_str = koops_hash_str_ext(oops, - /* use no frame count limit */-1, - /* use every frame in stacktrace */0); - -@@ -97,7 +96,7 @@ int main(int argc, char **argv) - - free(oops); - -- if (!bad) -+ if (hash_str) - { - dd_save_text(dd, FILENAME_UUID, hash_str); - dd_save_text(dd, FILENAME_DUPHASH, hash_str); -@@ -107,5 +106,5 @@ int main(int argc, char **argv) - - free_map_string(settings); - -- return bad; -+ return NULL != hash_str; - } -diff --git a/tests/koops-parser.at b/tests/koops-parser.at -index 4f9087ab..51a45e62 100644 ---- a/tests/koops-parser.at -+++ b/tests/koops-parser.at -@@ -125,16 +125,14 @@ AT_TESTFUN([koops_hash_improve], - - int run_test(const struct test_struct *test) - { -- char *oops1 = fread_full(test->filename); -- char *oops2 = fread_full(test->expected_results); -+ g_autofree char *oops1 = fread_full(test->filename); -+ g_autofree char *oops2 = fread_full(test->expected_results); - -- char hash_oops1[SHA1_RESULT_LEN*2 + 1]; -- koops_hash_str(hash_oops1, oops1); -- free(oops1); -+ g_autofree char *hash_oops1 = koops_hash_str(oops1); -+ g_autofree char *hash_oops2 = koops_hash_str(oops2); - -- char hash_oops2[SHA1_RESULT_LEN*2 + 1]; -- koops_hash_str(hash_oops2, oops2); -- free(oops2); -+ if (NULL == hash_oops1 || NULL == hash_oops2) -+ return 1; - - if (!strcmp(hash_oops1, hash_oops2)) - return 0; --- -2.25.0 - diff --git a/0001-python-Use-correct-paths-for-installed-modules.patch b/0001-python-Use-correct-paths-for-installed-modules.patch deleted file mode 100644 index d12bb22..0000000 --- a/0001-python-Use-correct-paths-for-installed-modules.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 57c0042ead87249bed5964eeec45b97543674060 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Wed, 16 Oct 2019 11:27:54 +0200 -Subject: [PATCH] python: Use correct paths for installed modules - -Non-compiled (without C bits) Python modules should be installed into -architecture-independent directory (/usr/lib/python3.x/site-packages -in the case of Fedora). - -This commit fixes both -* the spec file, where %{python3_sitelib} should be used rather than - %{python3_sitearch} which is to be used for compiled extensions; and -* the automake scripts, where $(pythondir) should be used in place of - $(pyexecdir) for the same reason. - -This is a follow-up to 20dcf7fb4. ---- - abrt.spec.in | 14 +++++++------- - src/cli/abrtcli/Makefile.am | 2 +- - src/cli/abrtcli/cli/Makefile.am | 2 +- - src/hooks/Makefile.am | 2 +- - 4 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/abrt.spec.in b/abrt.spec.in -index 1c6c48ad..fe0b2278 100644 ---- a/abrt.spec.in -+++ b/abrt.spec.in -@@ -935,14 +935,14 @@ killall abrt-dbus >/dev/null 2>&1 || : - %{_journalcatalogdir}/python3_abrt.catalog - %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf - %{_mandir}/man5/python3_event.conf.5* --%{python3_sitearch}/abrt3.pth --%{python3_sitearch}/abrt_exception_handler3.py --%{python3_sitearch}/__pycache__/abrt_exception_handler3.* -+%{python3_sitelib}/abrt3.pth -+%{python3_sitelib}/abrt_exception_handler3.py -+%{python3_sitelib}/__pycache__/abrt_exception_handler3.* - - %files -n python3-abrt-container-addon --%{python3_sitearch}/abrt3_container.pth --%{python3_sitearch}/abrt_exception_handler3_container.py --%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.* -+%{python3_sitelib}/abrt3_container.pth -+%{python3_sitelib}/abrt_exception_handler3_container.py -+%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* - %endif # with python3 - - %files plugin-sosreport -@@ -959,7 +959,7 @@ killall abrt-dbus >/dev/null 2>&1 || : - %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion - %{_bindir}/abrt - %{_bindir}/abrt-cli --%{python3_sitearch}/abrtcli/ -+%{python3_sitelib}/abrtcli/ - %{_mandir}/man1/abrt.1* - %{_mandir}/man1/abrt-cli.1* - %endif # with python3 -diff --git a/src/cli/abrtcli/Makefile.am b/src/cli/abrtcli/Makefile.am -index d11355a2..a599d0b5 100644 ---- a/src/cli/abrtcli/Makefile.am -+++ b/src/cli/abrtcli/Makefile.am -@@ -9,7 +9,7 @@ PYFILES= \ - utils.py - - abrtcli_PYTHON = $(PYFILES) --abrtclidir = $(pyexecdir)/abrtcli -+abrtclidir = $(pythondir)/abrtcli - - config.py: config.py.in - sed -e s,\@LOCALE_DIR\@,$(localedir),g \ -diff --git a/src/cli/abrtcli/cli/Makefile.am b/src/cli/abrtcli/cli/Makefile.am -index 17ff216b..c796074d 100644 ---- a/src/cli/abrtcli/cli/Makefile.am -+++ b/src/cli/abrtcli/cli/Makefile.am -@@ -10,4 +10,4 @@ abrtclicommands_PYTHON = \ - retrace.py \ - status.py - --abrtclicommandsdir = $(pyexecdir)/abrtcli/cli -+abrtclicommandsdir = $(pythondir)/abrtcli/cli -diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am -index 6e35887f..bdef0329 100644 ---- a/src/hooks/Makefile.am -+++ b/src/hooks/Makefile.am -@@ -35,7 +35,7 @@ EXTRA_DIST = \ - ALL_DEPENDENCES = - - if BUILD_PYTHON3 --py3hookdir = $(pyexecdir) -+py3hookdir = $(pythondir) - dist_pluginsconf_DATA += python3.conf - ALL_DEPENDENCES += abrt_exception_handler3.py - --- -2.21.0 - diff --git a/0002-Fix-build-failure-with-gcc-fno-common.patch b/0002-Fix-build-failure-with-gcc-fno-common.patch deleted file mode 100644 index f85b10f..0000000 --- a/0002-Fix-build-failure-with-gcc-fno-common.patch +++ /dev/null @@ -1,165 +0,0 @@ -From f58c435e4e4f5030af44d2cde8042bcf10d24615 Mon Sep 17 00:00:00 2001 -From: Michal Fabik -Date: Tue, 28 Jan 2020 13:45:14 +0100 -Subject: [PATCH] Fix build failure with gcc -fno-common - -Signed-off-by: Michal Fabik ---- - src/configuration-gui/abrt-config-widget.c | 2 +- - src/dbus/abrt_problems2_service.c | 4 ++-- - src/dbus/abrt_problems2_service.h | 8 ++++---- - src/dbus/abrt_problems2_session.c | 2 +- - src/dbus/abrt_problems2_task.c | 2 +- - src/plugins/oops-utils.c | 2 ++ - src/plugins/oops-utils.h | 2 +- - src/plugins/xorg-utils.c | 2 ++ - src/plugins/xorg-utils.h | 2 +- - 9 files changed, 15 insertions(+), 11 deletions(-) - -diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c -index aa3b5c01b..518ecd1d0 100644 ---- a/src/configuration-gui/abrt-config-widget.c -+++ b/src/configuration-gui/abrt-config-widget.c -@@ -109,7 +109,7 @@ G_DEFINE_TYPE_WITH_PRIVATE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX) - enum { - SN_CHANGED, - SN_LAST_SIGNAL --} SignalNumber; -+}; - - static guint s_signals[SN_LAST_SIGNAL] = { 0 }; - -diff --git a/src/dbus/abrt_problems2_service.c b/src/dbus/abrt_problems2_service.c -index a0d2a3ce6..a1e7ae322 100644 ---- a/src/dbus/abrt_problems2_service.c -+++ b/src/dbus/abrt_problems2_service.c -@@ -1589,7 +1589,7 @@ AbrtP2Object *abrt_p2_service_get_entry_object(AbrtP2Service *service, - - AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service, - const char *problem_id, -- int flags, -+ AbrtP2ServiceEntryLookupFlags flags, - GError **error) - { - char *entry_path = entry_object_dir_name_to_path(problem_id); -@@ -2062,7 +2062,7 @@ GVariant *abrt_p2_service_callers_session(AbrtP2Service *service, - - GVariant *abrt_p2_service_get_problems(AbrtP2Service *service, - uid_t caller_uid, -- gint32 flags, -+ AbrtP2ServiceGetProblemsFlags flags, - GVariant *options, - GError **error) - { -diff --git a/src/dbus/abrt_problems2_service.h b/src/dbus/abrt_problems2_service.h -index f82cf503a..22b97a6e8 100644 ---- a/src/dbus/abrt_problems2_service.h -+++ b/src/dbus/abrt_problems2_service.h -@@ -86,14 +86,14 @@ GVariant *abrt_p2_service_entry_problem_data(AbrtP2Service *service, - GError **error); - - --enum { -+typedef enum { - ABRT_P2_SERVICE_ENTRY_LOOKUP_NOFLAGS = 0x0, ///< return with error if not found - ABRT_P2_SERVICE_ENTRY_LOOKUP_OPTIONAL = 0x1, ///< return NULL if not found --} AbrtP2ServiceEntryLookupFlag; -+} AbrtP2ServiceEntryLookupFlags; - - AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service, - const char *problem_id, -- int flags, -+ AbrtP2ServiceEntryLookupFlags flags, - GError **error); - - struct _AbrtP2Entry; -@@ -145,7 +145,7 @@ typedef enum - - GVariant *abrt_p2_service_get_problems(AbrtP2Service *service, - uid_t caller_uid, -- gint32 flags, -+ AbrtP2ServiceGetProblemsFlags flags, - GVariant *options, - GError **error); - -diff --git a/src/dbus/abrt_problems2_session.c b/src/dbus/abrt_problems2_session.c -index 96db4ccc5..85ee78887 100644 ---- a/src/dbus/abrt_problems2_session.c -+++ b/src/dbus/abrt_problems2_session.c -@@ -97,7 +97,7 @@ struct check_auth_cb_params - enum { - SN_AUTHORIZATION_CHANGED, - SN_LAST_SIGNAL --} SignalNumber; -+}; - - static guint s_signals[SN_LAST_SIGNAL] = { 0 }; - -diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c -index cba6b469a..e6ae171c7 100644 ---- a/src/dbus/abrt_problems2_task.c -+++ b/src/dbus/abrt_problems2_task.c -@@ -21,7 +21,7 @@ - enum { - SN_STATUS_CHANGED, - SN_LAST_SIGNAL --} SignalNumber; -+}; - - static guint s_signals[SN_LAST_SIGNAL] = { 0 }; - -diff --git a/src/plugins/oops-utils.c b/src/plugins/oops-utils.c -index caa1d8d5d..a77b4424f 100644 ---- a/src/plugins/oops-utils.c -+++ b/src/plugins/oops-utils.c -@@ -22,6 +22,8 @@ - #include "oops-utils.h" - #include "libabrt.h" - -+int g_abrt_oops_sleep_woke_up_on_signal; -+ - int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags) - { - unsigned errors = 0; -diff --git a/src/plugins/oops-utils.h b/src/plugins/oops-utils.h -index 5181f91c7..bdd61cac2 100644 ---- a/src/plugins/oops-utils.h -+++ b/src/plugins/oops-utils.h -@@ -33,7 +33,7 @@ enum { - ABRT_OOPS_PRINT_STDOUT = 1 << 2, - }; - --int g_abrt_oops_sleep_woke_up_on_signal; -+extern int g_abrt_oops_sleep_woke_up_on_signal; - - int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags); - unsigned abrt_oops_create_dump_dirs(GList *oops_list, const char *dump_location, const char *analyzer, int flags); -diff --git a/src/plugins/xorg-utils.c b/src/plugins/xorg-utils.c -index a8dfc512a..4ecf8cb63 100644 ---- a/src/plugins/xorg-utils.c -+++ b/src/plugins/xorg-utils.c -@@ -23,6 +23,8 @@ - - #define DEFAULT_XORG_CRASH_REASON "Display server crashed" - -+int g_abrt_xorg_sleep_woke_up_on_signal; -+ - int abrt_xorg_signaled_sleep(int seconds) - { - sigset_t set; -diff --git a/src/plugins/xorg-utils.h b/src/plugins/xorg-utils.h -index c53bc460d..d9f44681a 100644 ---- a/src/plugins/xorg-utils.h -+++ b/src/plugins/xorg-utils.h -@@ -35,7 +35,7 @@ enum { - ABRT_XORG_PRINT_STDOUT = 1 << 2, - }; - --int g_abrt_xorg_sleep_woke_up_on_signal; -+extern int g_abrt_xorg_sleep_woke_up_on_signal; - int abrt_xorg_signaled_sleep(int seconds); - - /* --- -2.24.1 - diff --git a/0003-bodhi-Initialize-karma-values-with-default.patch b/0003-bodhi-Initialize-karma-values-with-default.patch deleted file mode 100644 index f3df79b..0000000 --- a/0003-bodhi-Initialize-karma-values-with-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c6562f15f2b72348aa447e3acbb91de5cf221695 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Thu, 30 Jan 2020 16:19:51 +0100 -Subject: [PATCH] bodhi: Initialize karma values with default - -During a rebuilt on s390x this error came up: -bodhi.c:340:12: - error: - 'unstable_karma' may be used uninitialized in this function - -Signed-off-by: Martin Kutlak ---- - src/plugins/bodhi.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c -index 14d65ad37..9b5177be9 100644 ---- a/src/plugins/bodhi.c -+++ b/src/plugins/bodhi.c -@@ -334,7 +334,8 @@ static GHashTable *bodhi_parse_json(json_object *json, const char *release) - if (!builds_item) /* broken json */ - continue; - -- int karma, unstable_karma; -+ int karma = 0; -+ int unstable_karma = 0; - bodhi_read_value(updates_item, "karma", &karma, BODHI_READ_INT); - bodhi_read_value(updates_item, "unstable_karma", &unstable_karma, BODHI_READ_INT); - if (karma <= unstable_karma) --- -2.24.1 - diff --git a/0004-dbus-Fix-possibly-uninitialized-variable.patch b/0004-dbus-Fix-possibly-uninitialized-variable.patch deleted file mode 100644 index 5ad921b..0000000 --- a/0004-dbus-Fix-possibly-uninitialized-variable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f81bbaa60ad6c5c99dba499044255fdde5d5ed4a Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Fri, 31 Jan 2020 10:12:37 +0100 -Subject: [PATCH] dbus: Fix possibly uninitialized variable - -abrt_problems2_task.c:419:21: error: -'response' may be used uninitialized in this function [-Werror=maybe-uninitialized] - -Signed-off-by: Martin Kutlak ---- - src/dbus/abrt_problems2_task.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c -index e6ae171c7..af47660aa 100644 ---- a/src/dbus/abrt_problems2_task.c -+++ b/src/dbus/abrt_problems2_task.c -@@ -403,7 +403,7 @@ static void abrt_p2_task_autonomous_cb(AbrtP2Task *task, - - case ABRT_P2_TASK_STATUS_FAILED: - { -- GVariant *response; -+ GVariant *response = NULL; - gint32 code; - GError *error = NULL; - abrt_p2_task_finish(task, &response, &code, &error); --- -2.24.1 - diff --git a/abrt.spec b/abrt.spec index 8ab97a0..b2cc875 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,23 +48,12 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.13.0 -Release: 5%{?dist} +Version: 2.14.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0001: 0001-python-Use-correct-paths-for-installed-modules.patch -Patch0002: 0002-Fix-build-failure-with-gcc-fno-common.patch -Patch0003: 0003-bodhi-Initialize-karma-values-with-default.patch -Patch0004: 0004-dbus-Fix-possibly-uninitialized-variable.patch -# https://github.com/abrt/abrt/commit/16468b57579997971c056687ecc8438a406d57c2 -Patch0005: 0001-Use-GChecksum-to-compute-checksums.patch -# https://github.com/abrt/abrt/commit/439fe1daddd62d53bf2ee72c45b631f5248daf5d -Patch0006: 0001-koops-Avoid-explicit-dependency-on-hash-size.patch -# https://github.com/abrt/abrt/commit/3f5003af92d2b2b0e4f5565ccd90b29e32e6b30b -Patch0007: 0001-Stop-using-parse_list.patch - BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -1026,6 +1015,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Feb 07 2020 Ernestas Kulik - 2.14.0-1 +- Update to 2.14.0 + * Fri Feb 07 2020 Igor Raits - 2.13.0-5 - Rebuild for satyr 0.30 diff --git a/sources b/sources index 76c1515..fe58d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.13.0.tar.gz) = 936c83293dcb71051b8dd89e84718cf0f76c7d7998b414a2c41d43b8e2a4dc6718f42d8fd47186bd15bac3ea06081f411ab3a7ed3729343da9e6e91edb046568 +SHA512 (abrt-2.14.0.tar.gz) = 2d817b7761d5afdca00a825281b759bc084a17d7393fcdf87df1a901b5c1a75595e3a733e481b30b02d068a123f8eac26163e2e55366e7cc20266a95e863967e From 400b28eb78110f8060f98aee29d12d057f95f713 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Fri, 7 Feb 2020 09:32:24 +0100 Subject: [PATCH 045/125] Sync spec changes from upstream --- abrt.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index b2cc875..a05fc68 100644 --- a/abrt.spec +++ b/abrt.spec @@ -129,7 +129,7 @@ BuildRequires: gdb-headless BuildRequires: polkit-devel %if %{with python3} #python3-abrt -BuildRequires: python3-nose +BuildRequires: python3-pytest BuildRequires: python3-sphinx BuildRequires: python3-libreport #python3-abrt-doc @@ -815,6 +815,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_libexecdir}/abrt-gdb-exploitable %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_journal_ccpp_format.conf %{_unitdir}/abrt-journal-core.service +%{_journalcatalogdir}/abrt_ccpp.catalog %dir %{_localstatedir}/lib/abrt From e161563d645846a3a9d792ffea4f09096b09560d Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Fri, 7 Feb 2020 10:52:02 +0100 Subject: [PATCH 046/125] Bump libreport dependency --- abrt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/abrt.spec b/abrt.spec index a05fc68..c210274 100644 --- a/abrt.spec +++ b/abrt.spec @@ -43,13 +43,13 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.10.0 +%define libreport_ver 2.12.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1016,6 +1016,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Feb 07 2020 Ernestas Kulik - 2.14.0-2 +- Bump libreport dependency + * Fri Feb 07 2020 Ernestas Kulik - 2.14.0-1 - Update to 2.14.0 From 61c6c411a8cae41f1494a0d30214114c3336ac40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 22 Apr 2020 00:01:43 +0200 Subject: [PATCH 047/125] Rebuild (json-c) --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index c210274..322cf59 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1016,6 +1016,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Apr 21 2020 Björn Esser - 2.14.0-3 +- Rebuild (json-c) + * Fri Feb 07 2020 Ernestas Kulik - 2.14.0-2 - Bump libreport dependency From bf7b8afe4ac802bc48874414e591c1631c139249 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Fri, 24 Apr 2020 18:15:58 +0200 Subject: [PATCH 048/125] New upstream release 2.14.1 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 27 +++++++++++++++++++++++---- sources | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 41d1ef0..3af754d 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ abrt-1.1.13.tar.gz /abrt-2.12.2.tar.gz /abrt-2.13.0.tar.gz /abrt-2.14.0.tar.gz +/abrt-2.14.1.tar.gz diff --git a/abrt.spec b/abrt.spec index 322cf59..50eaa33 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,8 +48,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.0 -Release: 3%{?dist} +Version: 2.14.1 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -114,7 +114,6 @@ BuildRequires: libreport-gtk-devel >= %{libreport_ver} BuildRequires: gsettings-desktop-schemas-devel >= 3.15 #addon-ccpp BuildRequires: gdb-headless -BuildRequires: libcap-devel #addon-kerneloops BuildRequires: systemd-devel BuildRequires: %{libjson_devel} @@ -750,7 +749,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %attr(0751, root, abrt) %{default_dump_dir} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload # abrtd runs as root -%dir %attr(0755, root, root) %{_localstatedir}/run/%{name} +%ghost %dir %attr(0755, root, root) %{_localstatedir}/run/%{name} %ghost %attr(0666, -, -) %{_localstatedir}/run/%{name}/abrt.socket %ghost %attr(0644, -, -) %{_localstatedir}/run/%{name}/abrtd.pid @@ -1016,6 +1015,26 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Apr 24 2020 Michal Fabik - 2.14.1-1 +- tests: Add perl, php R and tcl to dont-blame-interpret +- a-a-save-package-data: Add R and tcl to interpreted langs +- a-a-save-package-data: Use regexps to match interpreters +- .travis.yml: Update secret +- plugins: xorg-utils: Loopify parsing +- Add namespace to libreport function and global names +- cli: Correct debug directories in config +- cli: Show defaults in help output +- cli: Fix verbosity option +- cli: Fix descriptions for --since and --until +- autogen.sh: Handle NOCONFIGURE per the Build API +- plugins: journal: Fix ci_mapping being overwritten +- plugins: abrt-journal-core: Don’t assume anything about uid_t +- lib,plugins: Accomodate for multiple debug directories +- dbus: Drop bogus dependency +- dbus: Drop abrt_problems2 +- Drop libcap dependency +- Drop Travis config + * Tue Apr 21 2020 Björn Esser - 2.14.0-3 - Rebuild (json-c) diff --git a/sources b/sources index fe58d9f..08f6991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.0.tar.gz) = 2d817b7761d5afdca00a825281b759bc084a17d7393fcdf87df1a901b5c1a75595e3a733e481b30b02d068a123f8eac26163e2e55366e7cc20266a95e863967e +SHA512 (abrt-2.14.1.tar.gz) = 5486a4174e7db902f5a30c44159b3c0745341b1b4cb89df903cf42f9bf64ee2309708a20d8312760276db0171655972e9f2847e3463af0e34c66c4ea28cf2c6c From 9f7a213711c78e231f3cf7db188d375e0664f6e3 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Sat, 25 Apr 2020 11:12:34 +0200 Subject: [PATCH 049/125] Bump libreport dependency --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 50eaa33..5352c9b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -43,7 +43,7 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.12.0 +%define libreport_ver 2.13.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool From 438b4b73c73029c56364e645569af4b969d3c2f8 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Tue, 12 May 2020 10:11:37 +0200 Subject: [PATCH 050/125] New upstream release 2.14.2 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3af754d..16cc618 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ abrt-1.1.13.tar.gz /abrt-2.13.0.tar.gz /abrt-2.14.0.tar.gz /abrt-2.14.1.tar.gz +/abrt-2.14.2.tar.gz diff --git a/abrt.spec b/abrt.spec index 5352c9b..8e2a7db 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,7 +48,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.1 +Version: 2.14.2 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -1015,6 +1015,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue May 12 2020 Michal Fabik - 2.14.2-1 +- Fix broken builds with --enable-authenticated-autoreporting + * Fri Apr 24 2020 Michal Fabik - 2.14.1-1 - tests: Add perl, php R and tcl to dont-blame-interpret - a-a-save-package-data: Add R and tcl to interpreted langs diff --git a/sources b/sources index 08f6991..ad6df13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.1.tar.gz) = 5486a4174e7db902f5a30c44159b3c0745341b1b4cb89df903cf42f9bf64ee2309708a20d8312760276db0171655972e9f2847e3463af0e34c66c4ea28cf2c6c +SHA512 (abrt-2.14.2.tar.gz) = 020bd0550c41b2358a718a4f0f0c3a839d86fd46fc0c4f4cfc4b7d7f851baf2d5179e008ac1912b350f9f0fbfbfee94e422de3aadce5eb0f7f84a04f233349ff From 18305b2c5069a8dac7653bc51479c87c929f15ab Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Thu, 21 May 2020 15:58:39 +0200 Subject: [PATCH 051/125] Add fix for #1836190 --- ...s-instance-pointer-to-signal-handler.patch | 28 +++++++++++++++++++ 0002-applet-Chain-up-in-dispose.patch | 26 +++++++++++++++++ abrt.spec | 8 +++++- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0001-applet-Pass-instance-pointer-to-signal-handler.patch create mode 100644 0002-applet-Chain-up-in-dispose.patch diff --git a/0001-applet-Pass-instance-pointer-to-signal-handler.patch b/0001-applet-Pass-instance-pointer-to-signal-handler.patch new file mode 100644 index 0000000..9010657 --- /dev/null +++ b/0001-applet-Pass-instance-pointer-to-signal-handler.patch @@ -0,0 +1,28 @@ +From 5618985d3d7f830ebba0ef78e2ee6d3d6f9f6c55 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Fri, 15 May 2020 15:49:59 +0200 +Subject: [PATCH] applet: Pass instance pointer to signal handler + +Some fallout from 802a40a2f7c971b6533162e70b860e01ae3b5a27. + +https://bugzilla.redhat.com/show_bug.cgi?id=1836190 +--- + src/applet/abrt-applet-application.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c +index d982c9f9..8ea653bb 100644 +--- a/src/applet/abrt-applet-application.c ++++ b/src/applet/abrt-applet-application.c +@@ -177,7 +177,7 @@ abrt_applet_application_init (AbrtAppletApplication *self) + g_signal_connect (network_monitor, "notify::connectivity", + G_CALLBACK (on_connectivity_changed), self); + g_signal_connect (network_monitor, "notify::network-available", +- G_CALLBACK (on_connectivity_changed), NULL); ++ G_CALLBACK (on_connectivity_changed), self); + + self->deferred_problems = g_ptr_array_new_with_free_func (g_object_unref); + } +-- +2.26.2 + diff --git a/0002-applet-Chain-up-in-dispose.patch b/0002-applet-Chain-up-in-dispose.patch new file mode 100644 index 0000000..7d749e1 --- /dev/null +++ b/0002-applet-Chain-up-in-dispose.patch @@ -0,0 +1,26 @@ +From b08e7cbd26704b0a5400fdfab1f3f2e3922b102f Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Fri, 15 May 2020 15:50:50 +0200 +Subject: [PATCH] applet: Chain up in dispose() + +Also something missed in 802a40a2f7c971b6533162e70b860e01ae3b5a27. +--- + src/applet/abrt-applet-application.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c +index 8ea653bb..52ed5529 100644 +--- a/src/applet/abrt-applet-application.c ++++ b/src/applet/abrt-applet-application.c +@@ -985,6 +985,8 @@ abrt_applet_application_dispose (GObject *object) + self = ABRT_APPLET_APPLICATION (object); + + g_clear_pointer (&self->deferred_problems, g_ptr_array_unref); ++ ++ G_OBJECT_CLASS (abrt_applet_application_parent_class)->dispose (object); + } + + static void +-- +2.26.2 + diff --git a/abrt.spec b/abrt.spec index 8e2a7db..52a89fb 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,11 +49,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-applet-Pass-instance-pointer-to-signal-handler.patch +Patch1: 0002-applet-Chain-up-in-dispose.patch + BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -1015,6 +1018,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu May 21 2020 Ernestas Kulik - 2.14.2-2 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1836190 + * Tue May 12 2020 Michal Fabik - 2.14.2-1 - Fix broken builds with --enable-authenticated-autoreporting From a2bcded0dc78c0f676737459ec0241286f06af8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 24 May 2020 09:41:56 +0200 Subject: [PATCH 052/125] Rebuilt for Python 3.9 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 52a89fb..74b9237 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1018,6 +1018,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sun May 24 2020 Miro Hrončok - 2.14.2-3 +- Rebuilt for Python 3.9 + * Thu May 21 2020 Ernestas Kulik - 2.14.2-2 - Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1836190 From d8a4ccc6c2a4dd70dab98fb4894f14c95f7e912f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:40:43 +0000 Subject: [PATCH 053/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 74b9237..a3236fa 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1018,6 +1018,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.14.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun May 24 2020 Miro Hrončok - 2.14.2-3 - Rebuilt for Python 3.9 From 935456c7d9fb67ed6f63a65dc6661ec4c896ee7d Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 28 Jul 2020 16:21:15 +0200 Subject: [PATCH 054/125] Add patch for #1860903 --- ...on-Fix-crash-when-processing-deferre.patch | 59 +++++++++++++++++++ abrt.spec | 6 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 0003-applet-application-Fix-crash-when-processing-deferre.patch diff --git a/0003-applet-application-Fix-crash-when-processing-deferre.patch b/0003-applet-application-Fix-crash-when-processing-deferre.patch new file mode 100644 index 0000000..1cb1394 --- /dev/null +++ b/0003-applet-application-Fix-crash-when-processing-deferre.patch @@ -0,0 +1,59 @@ +From b28fcc053db224c11f1f88d2885eba88d60a7322 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Tue, 28 Jul 2020 15:39:43 +0200 +Subject: [PATCH] applet: application: Fix crash when processing deferred + +Currently, when processing the deferred problems, if reporting fails, +the problem is re-added to the queue, but the object is not +re-referenced, leading to invalid reads later on. +--- + src/applet/abrt-applet-application.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c +index 28e55135..4716524b 100644 +--- a/src/applet/abrt-applet-application.c ++++ b/src/applet/abrt-applet-application.c +@@ -771,11 +771,9 @@ handle_event_output_cb (GIOChannel *gio, + gpointer data) + { + EventProcessingState *state; +- AbrtAppletProblemInfo *problem_info; + int status; + + state = data; +- problem_info = state->problem_info; + + /* Read streamed data and split lines */ + for (;;) +@@ -836,21 +834,23 @@ handle_event_output_cb (GIOChannel *gio, + + if (WIFEXITED (status) && WEXITSTATUS (status) == EXIT_STOP_EVENT_RUN) + { +- abrt_applet_problem_info_set_known (problem_info, true); ++ abrt_applet_problem_info_set_known (state->problem_info, true); + status = 0; + } + + if (status == 0) + { +- abrt_applet_problem_info_set_reported (problem_info, true); ++ abrt_applet_problem_info_set_reported (state->problem_info, true); + + log_debug ("fast report finished successfully"); +- abrt_applet_application_send_problem_notification (state->application, problem_info); ++ abrt_applet_application_send_problem_notification (state->application, ++ state->problem_info); + } + else + { + log_debug ("fast report failed, deferring"); +- g_ptr_array_add (state->application->deferred_problems, problem_info); ++ g_ptr_array_add (state->application->deferred_problems, ++ g_steal_pointer (&state->problem_info)); + } + + event_processing_state_free (state); +-- +2.26.2 + diff --git a/abrt.spec b/abrt.spec index a3236fa..14c4988 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,13 +49,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-applet-Pass-instance-pointer-to-signal-handler.patch Patch1: 0002-applet-Chain-up-in-dispose.patch +Patch2: 0003-applet-application-Fix-crash-when-processing-deferre.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -1018,6 +1019,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jul 28 2020 - Ernestas Kulik - 2.14.2-5 +- Add patch for https://bugzilla.redhat.com/show_bug.cgi?id=1860903 + * Mon Jul 27 2020 Fedora Release Engineering - 2.14.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 92ab2eb5b35b1276565cbd93044dc661ea87474e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 13 Aug 2020 16:42:48 -0700 Subject: [PATCH 055/125] Rebuild for libreport soname bump --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 14c4988..5eb632b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1019,6 +1019,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Aug 13 2020 Adam Williamson - 2.14.2-6 +- Rebuild for libreport soname bump + * Tue Jul 28 2020 - Ernestas Kulik - 2.14.2-5 - Add patch for https://bugzilla.redhat.com/show_bug.cgi?id=1860903 From 5e37f501924d9d1589b02a4ac36cff66c590f511 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Thu, 13 Aug 2020 12:59:36 +0200 Subject: [PATCH 056/125] New upstream release 2.14.3 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 53 +++++++++++++++++++++++++++-------------------------- sources | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 16cc618..7d8f72d 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ abrt-1.1.13.tar.gz /abrt-2.14.0.tar.gz /abrt-2.14.1.tar.gz /abrt-2.14.2.tar.gz +/abrt-2.14.3.tar.gz diff --git a/abrt.spec b/abrt.spec index 5eb632b..396a9f7 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,16 +48,12 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.2 -Release: 6%{?dist} +Version: 2.14.3 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-applet-Pass-instance-pointer-to-signal-handler.patch -Patch1: 0002-applet-Chain-up-in-dispose.patch -Patch2: 0003-applet-application-Fix-crash-when-processing-deferre.patch - BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -106,9 +102,6 @@ Requires: python3-dbus Requires: dmidecode %endif Requires: libreport-plugin-ureport -%if 0%{?rhel} -Requires: libreport-plugin-rhtsupport -%endif %if 0%{?fedora} Requires: libreport-plugin-systemd-journal %endif @@ -360,10 +353,7 @@ Requires: abrt-addon-ccpp Requires: python3-abrt-addon %endif Requires: abrt-addon-xorg -%if 0%{?rhel} -Requires: libreport-rhel >= %{libreport_ver} -Requires: libreport-plugin-rhtsupport >= %{libreport_ver} -%else +%if ! 0%{?rhel} %if %{with retrace} Requires: abrt-retrace-client %endif @@ -403,10 +393,7 @@ Requires: abrt-addon-xorg Requires: gdb-headless Requires: abrt-gui Requires: gnome-abrt -%if 0%{?rhel} -Requires: libreport-rhel >= %{libreport_ver} -Requires: libreport-plugin-rhtsupport >= %{libreport_ver} -%else +%if ! 0%{?rhel} %if %{with retrace} Requires: abrt-retrace-client %endif @@ -506,9 +493,6 @@ CFLAGS="%{optflags} -Werror" %configure \ %if %{without retrace} --without-retrace \ %endif -%if 0%{?rhel} - --enable-authenticated-autoreporting \ -%endif %ifnarch %{arm} --enable-native-unwinder \ %endif @@ -576,10 +560,12 @@ exit 0 %systemd_post abrtd.service %post addon-ccpp -# this is required for transition from 1.1.x to 2.x -# because /cache/abrt-di/* was created under root with root:root -# so 2.x fails when it tries to extract debuginfo there.. -chown -R abrt:abrt %{_localstatedir}/cache/abrt-di +# migration from 2.14.1.18 +if [ ! -e "%{_localstatedir}/cache/abrt-di/.migration-group-add" ]; then + chmod -R g+w %{_localstatedir}/cache/abrt-di + touch "%{_localstatedir}/cache/abrt-di/.migration-group-add" +fi + %systemd_post abrt-journal-core.service %journal_catalog_update @@ -822,8 +808,8 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %{_localstatedir}/lib/abrt -# attr(6755) ~= SETUID|SETGID -%attr(6755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache +# attr(6755) ~= SETGID +%attr(2755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache %{_bindir}/abrt-action-analyze-c %{_bindir}/abrt-action-trim-files @@ -1019,6 +1005,21 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Aug 13 2020 Michal Fabik - 2.14.3-1 +- plugins: abrt-dump-journal-core: Handle zstd compression +- applet: application: Use GLib for logging +- Replace various utility functions with stock GLib ones +- Various coding style improvements +- Update documentation +- applet: application: Fix crash when processing deferred problems +- dbus: Remove session objects when owner disconnects +- python-problem: Use org.freedesktop.Problems2 API +- abrt-console-notification: Work around noclobber +- daemon: rpm: Use NEVRA instead of ENVRA +- abrtd: Don't delete new problem dirs +- Make sure that former caches are group writable +- Various memory management fixes + * Thu Aug 13 2020 Adam Williamson - 2.14.2-6 - Rebuild for libreport soname bump diff --git a/sources b/sources index ad6df13..51e3cda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.2.tar.gz) = 020bd0550c41b2358a718a4f0f0c3a839d86fd46fc0c4f4cfc4b7d7f851baf2d5179e008ac1912b350f9f0fbfbfee94e422de3aadce5eb0f7f84a04f233349ff +SHA512 (abrt-2.14.3.tar.gz) = 34aeffa9fac4d97adee9511dee525a0208112fdeb2f75180f02795d40ff094c1a60a50dabcb15fc4729c549c407ef97ae23f18ad5ea1df2fd5114c41185a3606 From 3de7b9d0b781037c51fcc375eef6dc84ff7e38bc Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Mon, 17 Aug 2020 16:51:17 +0200 Subject: [PATCH 057/125] New upstream release 2.14.4 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7d8f72d..39856b1 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ abrt-1.1.13.tar.gz /abrt-2.14.1.tar.gz /abrt-2.14.2.tar.gz /abrt-2.14.3.tar.gz +/abrt-2.14.4.tar.gz diff --git a/abrt.spec b/abrt.spec index 396a9f7..b2d9ebe 100644 --- a/abrt.spec +++ b/abrt.spec @@ -43,12 +43,12 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.13.0 +%define libreport_ver 2.14.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.3 +Version: 2.14.4 Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ @@ -79,6 +79,7 @@ BuildRequires: libselinux-devel BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete +BuildRequires: python3-dbus %endif Requires: libreport >= %{libreport_ver} @@ -267,7 +268,7 @@ Summary: %{name}'s pstore oops addon Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} Requires: abrt-addon-kerneloops -Obsoletes: abrt-addon-uefioops +Obsoletes: abrt-addon-uefioops <= 2.1.6 %description addon-pstoreoops This package contains plugin for collecting kernel oopses from pstore storage. @@ -276,7 +277,7 @@ This package contains plugin for collecting kernel oopses from pstore storage. %package plugin-bodhi Summary: %{name}'s bodhi plugin Requires: %{name} = %{version}-%{release} -Obsoletes: libreport-plugin-bodhi > 0.0.1 +Obsoletes: libreport-plugin-bodhi <= 2.0.10 Provides: libreport-plugin-bodhi = %{version}-%{release} %description plugin-bodhi @@ -545,6 +546,7 @@ make check|| { # find and print the logs of failed test # do not cat tests/testsuite.log because it contains a lot of bloat find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \; + cat src/cli/test-suite.log exit 1 } @@ -808,7 +810,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %{_localstatedir}/lib/abrt -# attr(6755) ~= SETGID +# attr(2755) ~= SETGID %attr(2755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache %{_bindir}/abrt-action-analyze-c @@ -1005,6 +1007,11 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Aug 17 2020 Michal Fabik - 2.14.4-1 +- Fix broken release 2.14.3 +- oops-utils: Respect the 'world-readable' flag +- Decommission libreport_list_free_with_free + * Thu Aug 13 2020 Michal Fabik - 2.14.3-1 - plugins: abrt-dump-journal-core: Handle zstd compression - applet: application: Use GLib for logging diff --git a/sources b/sources index 51e3cda..c3a1c22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.3.tar.gz) = 34aeffa9fac4d97adee9511dee525a0208112fdeb2f75180f02795d40ff094c1a60a50dabcb15fc4729c549c407ef97ae23f18ad5ea1df2fd5114c41185a3606 +SHA512 (abrt-2.14.4.tar.gz) = b45808453187743c165914f7e72fcbca57684cb93a043fecd36414094ae8423fa661e6e07176773a15aaf468013386be300283e0d1b9d102d2e381ee9154e111 From 00422605f435f8d7f6d4084e94ddc462a50df656 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Mon, 24 Aug 2020 09:38:50 +0200 Subject: [PATCH 058/125] spec: Add Provides to Obsoletes Signed-off-by: Michal Fabik --- abrt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abrt.spec b/abrt.spec index b2d9ebe..1e930f1 100644 --- a/abrt.spec +++ b/abrt.spec @@ -269,6 +269,7 @@ Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} Requires: abrt-addon-kerneloops Obsoletes: abrt-addon-uefioops <= 2.1.6 +Provides: abrt-addon-uefioops = %{version}-%{release} %description addon-pstoreoops This package contains plugin for collecting kernel oopses from pstore storage. From 1ab9d3859ffa8bbfd002a95e79f9808f864b23a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 24 Sep 2020 10:07:28 +0200 Subject: [PATCH 059/125] Add patch for #1881745 --- ...s-instance-pointer-to-signal-handler.patch | 28 --------- 0001-hooklib-Don-t-g_autofree-backtrace.patch | 40 +++++++++++++ 0002-applet-Chain-up-in-dispose.patch | 26 -------- ...on-Fix-crash-when-processing-deferre.patch | 59 ------------------- abrt.spec | 7 ++- 5 files changed, 46 insertions(+), 114 deletions(-) delete mode 100644 0001-applet-Pass-instance-pointer-to-signal-handler.patch create mode 100644 0001-hooklib-Don-t-g_autofree-backtrace.patch delete mode 100644 0002-applet-Chain-up-in-dispose.patch delete mode 100644 0003-applet-application-Fix-crash-when-processing-deferre.patch diff --git a/0001-applet-Pass-instance-pointer-to-signal-handler.patch b/0001-applet-Pass-instance-pointer-to-signal-handler.patch deleted file mode 100644 index 9010657..0000000 --- a/0001-applet-Pass-instance-pointer-to-signal-handler.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5618985d3d7f830ebba0ef78e2ee6d3d6f9f6c55 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Fri, 15 May 2020 15:49:59 +0200 -Subject: [PATCH] applet: Pass instance pointer to signal handler - -Some fallout from 802a40a2f7c971b6533162e70b860e01ae3b5a27. - -https://bugzilla.redhat.com/show_bug.cgi?id=1836190 ---- - src/applet/abrt-applet-application.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c -index d982c9f9..8ea653bb 100644 ---- a/src/applet/abrt-applet-application.c -+++ b/src/applet/abrt-applet-application.c -@@ -177,7 +177,7 @@ abrt_applet_application_init (AbrtAppletApplication *self) - g_signal_connect (network_monitor, "notify::connectivity", - G_CALLBACK (on_connectivity_changed), self); - g_signal_connect (network_monitor, "notify::network-available", -- G_CALLBACK (on_connectivity_changed), NULL); -+ G_CALLBACK (on_connectivity_changed), self); - - self->deferred_problems = g_ptr_array_new_with_free_func (g_object_unref); - } --- -2.26.2 - diff --git a/0001-hooklib-Don-t-g_autofree-backtrace.patch b/0001-hooklib-Don-t-g_autofree-backtrace.patch new file mode 100644 index 0000000..1225177 --- /dev/null +++ b/0001-hooklib-Don-t-g_autofree-backtrace.patch @@ -0,0 +1,40 @@ +From 1f2963b0611d4023957abe3c7391eab86256ba82 Mon Sep 17 00:00:00 2001 +From: Michal Fabik +Date: Wed, 23 Sep 2020 16:55:25 +0200 +Subject: [PATCH] hooklib: Don't g_autofree backtrace + +The result of abrt_get_backtrace was being freed every time, even when +no error occured. + +Resolves: +https://github.com/abrt/abrt/issues/1528 +https://bugzilla.redhat.com/show_bug.cgi?id=1881745 +Signed-off-by: Michal Fabik +--- + src/lib/hooklib.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c +index dceaeb16..56b77bc3 100644 +--- a/src/lib/hooklib.c ++++ b/src/lib/hooklib.c +@@ -348,7 +348,7 @@ char *abrt_get_backtrace(struct dump_dir *dd, unsigned timeout_sec, const char * + unsigned bt_depth = 1024; + const char *thread_apply_all = "thread apply all -ascending"; + const char *full = "full "; +- g_autofree char *bt = NULL; ++ char *bt = NULL; + while (1) + { + args[bt_cmd_index] = g_strdup_printf("%s backtrace %s%u", thread_apply_all, full, bt_depth); +@@ -367,6 +367,7 @@ char *abrt_get_backtrace(struct dump_dir *dd, unsigned timeout_sec, const char * + /* (NB: in fact, current impl. of exec_vp() never returns NULL) */ + log_warning("Failed to generate backtrace, reducing depth to %u", + bt_depth); ++ free(bt); + + /* Replace -ex disassemble (which disasms entire function $pc points to) + * to a version which analyzes limited, small patch of code around $pc. +-- +2.26.2 + diff --git a/0002-applet-Chain-up-in-dispose.patch b/0002-applet-Chain-up-in-dispose.patch deleted file mode 100644 index 7d749e1..0000000 --- a/0002-applet-Chain-up-in-dispose.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b08e7cbd26704b0a5400fdfab1f3f2e3922b102f Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Fri, 15 May 2020 15:50:50 +0200 -Subject: [PATCH] applet: Chain up in dispose() - -Also something missed in 802a40a2f7c971b6533162e70b860e01ae3b5a27. ---- - src/applet/abrt-applet-application.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c -index 8ea653bb..52ed5529 100644 ---- a/src/applet/abrt-applet-application.c -+++ b/src/applet/abrt-applet-application.c -@@ -985,6 +985,8 @@ abrt_applet_application_dispose (GObject *object) - self = ABRT_APPLET_APPLICATION (object); - - g_clear_pointer (&self->deferred_problems, g_ptr_array_unref); -+ -+ G_OBJECT_CLASS (abrt_applet_application_parent_class)->dispose (object); - } - - static void --- -2.26.2 - diff --git a/0003-applet-application-Fix-crash-when-processing-deferre.patch b/0003-applet-application-Fix-crash-when-processing-deferre.patch deleted file mode 100644 index 1cb1394..0000000 --- a/0003-applet-application-Fix-crash-when-processing-deferre.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b28fcc053db224c11f1f88d2885eba88d60a7322 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Tue, 28 Jul 2020 15:39:43 +0200 -Subject: [PATCH] applet: application: Fix crash when processing deferred - -Currently, when processing the deferred problems, if reporting fails, -the problem is re-added to the queue, but the object is not -re-referenced, leading to invalid reads later on. ---- - src/applet/abrt-applet-application.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c -index 28e55135..4716524b 100644 ---- a/src/applet/abrt-applet-application.c -+++ b/src/applet/abrt-applet-application.c -@@ -771,11 +771,9 @@ handle_event_output_cb (GIOChannel *gio, - gpointer data) - { - EventProcessingState *state; -- AbrtAppletProblemInfo *problem_info; - int status; - - state = data; -- problem_info = state->problem_info; - - /* Read streamed data and split lines */ - for (;;) -@@ -836,21 +834,23 @@ handle_event_output_cb (GIOChannel *gio, - - if (WIFEXITED (status) && WEXITSTATUS (status) == EXIT_STOP_EVENT_RUN) - { -- abrt_applet_problem_info_set_known (problem_info, true); -+ abrt_applet_problem_info_set_known (state->problem_info, true); - status = 0; - } - - if (status == 0) - { -- abrt_applet_problem_info_set_reported (problem_info, true); -+ abrt_applet_problem_info_set_reported (state->problem_info, true); - - log_debug ("fast report finished successfully"); -- abrt_applet_application_send_problem_notification (state->application, problem_info); -+ abrt_applet_application_send_problem_notification (state->application, -+ state->problem_info); - } - else - { - log_debug ("fast report failed, deferring"); -- g_ptr_array_add (state->application->deferred_problems, problem_info); -+ g_ptr_array_add (state->application->deferred_problems, -+ g_steal_pointer (&state->problem_info)); - } - - event_processing_state_free (state); --- -2.26.2 - diff --git a/abrt.spec b/abrt.spec index 1e930f1..362d5ef 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,11 +49,13 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-hooklib-Don-t-g_autofree-backtrace.patch + BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname @@ -1008,6 +1010,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Sep 24 2020 Matěj Grabovský - 2.14.4-2 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1881745 + * Mon Aug 17 2020 Michal Fabik - 2.14.4-1 - Fix broken release 2.14.3 - oops-utils: Respect the 'world-readable' flag From 511e6ce6d4dbeef23afc3b7f3b5f744b70398353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Tue, 13 Oct 2020 11:11:22 +0200 Subject: [PATCH 060/125] Add upstream patch for an invalid read bug --- ...-hooklib-Proper-freeing-of-backtrace.patch | 40 +++++++++++++++++++ abrt.spec | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0002-hooklib-Proper-freeing-of-backtrace.patch diff --git a/0002-hooklib-Proper-freeing-of-backtrace.patch b/0002-hooklib-Proper-freeing-of-backtrace.patch new file mode 100644 index 0000000..a9ded17 --- /dev/null +++ b/0002-hooklib-Proper-freeing-of-backtrace.patch @@ -0,0 +1,40 @@ +From 5fa7b1f84fb02ca5dcf50d27f4bc14563c1918f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Mon, 12 Oct 2020 19:14:03 +0200 +Subject: [PATCH] hooklib: Proper freeing of backtrace + +Improper bracing caused the bt variable to be freed every time in every +iteration no matter what. This would then lead to an invalid (freed) +pointer being returned by the function. + +The mistake was made in 1f2963b0 and reported by Jeff Law. +--- + src/lib/hooklib.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c +index 56b77bc3..fc2a6a00 100644 +--- a/src/lib/hooklib.c ++++ b/src/lib/hooklib.c +@@ -361,13 +361,17 @@ char *abrt_get_backtrace(struct dump_dir *dd, unsigned timeout_sec, const char * + + bt_depth /= 2; + if (bt) ++ { + log_warning("Backtrace is too big (%u bytes), reducing depth to %u", + (unsigned)strlen(bt), bt_depth); ++ } + else ++ { + /* (NB: in fact, current impl. of exec_vp() never returns NULL) */ + log_warning("Failed to generate backtrace, reducing depth to %u", + bt_depth); +- free(bt); ++ g_clear_pointer(&bt, free); ++ } + + /* Replace -ex disassemble (which disasms entire function $pc points to) + * to a version which analyzes limited, small patch of code around $pc. +-- +2.26.2 + diff --git a/abrt.spec b/abrt.spec index 362d5ef..b82ff38 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,12 +49,13 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-hooklib-Don-t-g_autofree-backtrace.patch +Patch1: 0002-hooklib-Proper-freeing-of-backtrace.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -1010,6 +1011,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Oct 13 2020 Matěj Grabovský - 2.14.4-3 +- Add upstream patch for an invalid read bug + * Thu Sep 24 2020 Matěj Grabovský - 2.14.4-2 - Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1881745 From 82eb0a22c32e5fbd1163b90b324220ea7afb2706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 13 Nov 2020 11:17:17 +0100 Subject: [PATCH 061/125] Use autoreconf in %build instead of plain autoconf This way, when stuff is fixed in automake, the source tarball does not need to be re-generated in upstream to use the fix. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1897489 --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index b82ff38..22462d8 100644 --- a/abrt.spec +++ b/abrt.spec @@ -481,7 +481,7 @@ to the shell %build -autoconf +autoreconf %define default_dump_dir %{_localstatedir}/spool/abrt From 003b0187a1b6e0e4785a2bf591683bd190faeea8 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Tue, 1 Dec 2020 15:05:20 +0100 Subject: [PATCH 062/125] New upstream release 2.14.5 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 30 ++++++++++++------------------ sources | 2 +- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 39856b1..122dd2f 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ abrt-1.1.13.tar.gz /abrt-2.14.2.tar.gz /abrt-2.14.3.tar.gz /abrt-2.14.4.tar.gz +/abrt-2.14.5.tar.gz diff --git a/abrt.spec b/abrt.spec index 22462d8..5ab21c4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,14 +48,11 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.4 -Release: 3%{?dist} +Version: 2.14.5 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ -Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz - -Patch0: 0001-hooklib-Don-t-g_autofree-backtrace.patch -Patch1: 0002-hooklib-Proper-freeing-of-backtrace.patch +Source: https://github.com/abrt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -66,6 +63,7 @@ BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel #why? BuildRequires: file-devel +BuildRequires: make BuildRequires: gettext BuildRequires: libxml2-devel BuildRequires: intltool @@ -310,15 +308,6 @@ This package contains python 3 hook and handling uncaught exception in python 3 programs in container. %endif -%package plugin-sosreport -Summary: %{name}'s plugin for building automatic sosreports -Requires: sos >= 3.6 -Requires: %{name} = %{version}-%{release} - -%description plugin-sosreport -This package contains a configuration snippet to enable automatic generation -of sosreports for abrt events. - %package plugin-machine-id Summary: %{name}'s plugin to generate machine_id based off dmidecode Requires: %{name} = %{version}-%{release} @@ -549,6 +538,7 @@ rm -f %{buildroot}%{_infodir}/dir make check|| { # find and print the logs of failed test # do not cat tests/testsuite.log because it contains a lot of bloat + find src -name "test-suite.log" -print -exec cat '{}' \; find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \; cat src/cli/test-suite.log exit 1 @@ -943,9 +933,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* %endif -%files plugin-sosreport -%config(noreplace) %{_sysconfdir}/libreport/events.d/sosreport_event.conf - %files plugin-machine-id %config(noreplace) %{_sysconfdir}/libreport/events.d/machine-id_event.conf %{_libexecdir}/abrt-action-generate-machine-id @@ -1011,6 +998,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Dec 01 2020 Michal Fabik 2.14.5-1 +- Fix invalid free (rhbz#1895660) +- Fix crash during local processing (rhbz#1881745) +- Fix reported numbers of missing debuginfo packages in abrt-action-install-debuginfo +- Correct the format of NEVRA generated for packages where a problem occurred (rhbz#1900982) +- Drop --raw flag in abrt-action-generate-core-backtrace + * Tue Oct 13 2020 Matěj Grabovský - 2.14.4-3 - Add upstream patch for an invalid read bug diff --git a/sources b/sources index c3a1c22..cf3278c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.4.tar.gz) = b45808453187743c165914f7e72fcbca57684cb93a043fecd36414094ae8423fa661e6e07176773a15aaf468013386be300283e0d1b9d102d2e381ee9154e111 +SHA512 (abrt-2.14.5.tar.gz) = ceb55d1e31966fe795bea19f96b1f0af2d4e97c3a7da29858f222a6a9442ebe00e589001b2e4cafd2e5b3a2d6db362b895bd6df63365cabe82fc0111428b05b6 From dacf4e649a88ed804dc0f6f19bf293876be95714 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:44:28 +0000 Subject: [PATCH 063/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 5ab21c4..42dc290 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz @@ -998,6 +998,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.14.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 01 2020 Michal Fabik 2.14.5-1 - Fix invalid free (rhbz#1895660) - Fix crash during local processing (rhbz#1881745) From 7e139599174419dbdfff3d24915b38aec58a4a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= Date: Wed, 17 Feb 2021 13:49:44 +0100 Subject: [PATCH 064/125] gating: Add gating.yaml --- gating.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..b54b7ba --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} From 074ab8b76c6970191d59f45a184a3df1dd288978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:14 +0100 Subject: [PATCH 065/125] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- abrt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 42dc290..ccdc024 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz @@ -998,6 +998,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.14.5-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Jan 25 2021 Fedora Release Engineering - 2.14.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a1c9e8ff22b79f5f779556bef0861fbf347e5afc Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Thu, 4 Mar 2021 17:31:09 +0100 Subject: [PATCH 066/125] Add simple smoke test --- .fmf/version | 1 + gating.yaml | 2 ++ tests/smoke.fmf | 3 +++ 3 files changed, 6 insertions(+) create mode 100644 .fmf/version create mode 100644 tests/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml index b54b7ba..db67165 100644 --- a/gating.yaml +++ b/gating.yaml @@ -7,6 +7,7 @@ rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy product_versions: @@ -17,3 +18,4 @@ rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/tests/smoke.fmf b/tests/smoke.fmf new file mode 100644 index 0000000..ca74391 --- /dev/null +++ b/tests/smoke.fmf @@ -0,0 +1,3 @@ +summary: Basic smoke test for abrt +execute: + script: abrt-action-notify --help From 126031c3215ba44a95960acba94192edad7154ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 30 Apr 2021 22:37:59 +0100 Subject: [PATCH 067/125] Obsoletes abrt-plugin-sosreport, to fix upgrade path --- abrt.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index ccdc024..a5abea8 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz @@ -107,6 +107,8 @@ Requires: libreport-plugin-ureport %if 0%{?fedora} Requires: libreport-plugin-systemd-journal %endif +# to fix upgrade path abrt-plugin-sosreport was removed in 2.14.5 version. +Obsoletes: abrt-plugin-sosreport < 2.14.5 #gui BuildRequires: libreport-gtk-devel >= %{libreport_ver} @@ -998,6 +1000,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Apr 30 2021 Sérgio Basto - 2.14.5-4 +- Obsoletes abrt-plugin-sosreport, to fix upgrade path + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.14.5-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 26627dbec37bffbf4598af835faa2fdbe6ecf755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 1 May 2021 20:29:26 +0100 Subject: [PATCH 068/125] Add dependency on python3-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 566e2eaacb21e07a8301c3e16408924c46045ad9 Author: Matěj Grabovský Date: Wed Jan 13 12:16:57 2021 +0100 spec: Add dependency on python3-systemd abrt-action-check-oops-for-hw-error from the abrt-addon-vmcore package imports systemd.journal but the python3-systemd package is not declared as a dependency, which causes the script to crash if python3-systemd is not installed on the system. This commit fixes this by adding the formal dependency in the spec file. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1914170 --- abrt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abrt.spec b/abrt.spec index a5abea8..f6e27e9 100644 --- a/abrt.spec +++ b/abrt.spec @@ -259,6 +259,7 @@ Requires: kexec-tools %if %{with python3} Requires: python3-abrt Requires: python3-augeas +Requires: python3-systemd %endif Requires: util-linux From 094983af73f51de6a0d6d3223a826688608c38ec Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Tue, 25 May 2021 12:52:10 +0200 Subject: [PATCH 069/125] New upstream release 2.14.6 Signed-off-by: Michal Fabik --- .gitignore | 1 + abrt.spec | 18 ++++++++++++++---- sources | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 122dd2f..75abc74 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ abrt-1.1.13.tar.gz /abrt-2.14.3.tar.gz /abrt-2.14.4.tar.gz /abrt-2.14.5.tar.gz +/abrt-2.14.6.tar.gz diff --git a/abrt.spec b/abrt.spec index f6e27e9..765bbfa 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,11 +48,11 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.5 -Release: 4%{?dist} +Version: 2.14.6 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ -Source: https://github.com/abrt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -473,7 +473,7 @@ to the shell %build -autoreconf +./autogen.sh %define default_dump_dir %{_localstatedir}/spool/abrt @@ -1001,6 +1001,16 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue May 25 2021 Michal Fabik - 2.14.6-1 +- Add support of master + subkeys gpg. +- hooks: Remove stale workaround for a fixed bug +- cli: Gracefully handle disappearance of problem directory +- libs: Add version info script +- retrace-client: Output task ID to console in batch mode +- retrace-client: Separate commands by commas +- Doc: Improve man page for abrt-action-analyze-vulnerability +- Various memory management and other fixes + * Fri Apr 30 2021 Sérgio Basto - 2.14.5-4 - Obsoletes abrt-plugin-sosreport, to fix upgrade path diff --git a/sources b/sources index cf3278c..601ce96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.5.tar.gz) = ceb55d1e31966fe795bea19f96b1f0af2d4e97c3a7da29858f222a6a9442ebe00e589001b2e4cafd2e5b3a2d6db362b895bd6df63365cabe82fc0111428b05b6 +SHA512 (abrt-2.14.6.tar.gz) = eb1ba2f624d51eeccd203bb23060493347f5a9142fad7d0570d46134071d870a9c66b4fbfb8210e7d6f87c0c039f31eb486d18a36b10fba318e2180aa09df9fe From a4e0effc616b94a0710c7f7117b7ce00c573e83c Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Wed, 2 Jun 2021 20:59:37 +0200 Subject: [PATCH 070/125] Rebuild against libreport-2.15.2 Signed-off-by: Michal Fabik --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 765bbfa..35afcdc 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz From f99a7f835a99136af01e8f809fe39234a67847b7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 11:19:26 +0200 Subject: [PATCH 071/125] Rebuilt for Python 3.10 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 35afcdc..2e4d528 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1001,6 +1001,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Jun 04 2021 Python Maint - 2.14.6-3 +- Rebuilt for Python 3.10 + * Tue May 25 2021 Michal Fabik - 2.14.6-1 - Add support of master + subkeys gpg. - hooks: Remove stale workaround for a fixed bug From 61c2c079e010c9515f94665ede64418b1de0ebbb Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Fri, 4 Jun 2021 15:02:12 +0200 Subject: [PATCH 072/125] Bump release to rebuild in new side tag Signed-off-by: Michal Fabik --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 2e4d528..ec5947d 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz From 4f5933399291cec7f1a00cf535ab9025c6f51831 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 7 Jun 2021 17:17:41 +0200 Subject: [PATCH 073/125] Rebuilt for Python 3.10 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index ec5947d..a07d4dc 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1001,6 +1001,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Jun 07 2021 Python Maint - 2.14.6-5 +- Rebuilt for Python 3.10 + * Fri Jun 04 2021 Python Maint - 2.14.6-3 - Rebuilt for Python 3.10 From 1d49502fa75c6e503d2b2906ad610ea6bea72034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 10 Jul 2021 11:51:13 +0200 Subject: [PATCH 074/125] Rebuild for versioned symbols in json-c --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index a07d4dc..9639e44 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1001,6 +1001,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sat Jul 10 2021 Björn Esser - 2.14.6-6 +- Rebuild for versioned symbols in json-c + * Mon Jun 07 2021 Python Maint - 2.14.6-5 - Rebuilt for Python 3.10 From e3d620d8fc5e5e28dc86d0fc9b95c772bcd55351 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:16:28 +0000 Subject: [PATCH 075/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From d99ab08e76bc3f2b9bfa38277ef21c66bf4d1920 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:11:34 +0000 Subject: [PATCH 076/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 9639e44..fb88956 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1001,6 +1001,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.14.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 10 2021 Björn Esser - 2.14.6-6 - Rebuild for versioned symbols in json-c From 7c6ec28dde3eded86606d12de0cf84a631fe14fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Mon, 27 Sep 2021 12:34:36 +0200 Subject: [PATCH 077/125] Backport Python lazy loading patch (rhbz#2007664) --- ...y-imports-in-abrt_exception_handler3.patch | 57 +++++++++++++++++++ 0001-hooklib-Don-t-g_autofree-backtrace.patch | 40 ------------- ...-hooklib-Proper-freeing-of-backtrace.patch | 40 ------------- abrt.spec | 8 ++- 4 files changed, 64 insertions(+), 81 deletions(-) create mode 100644 0001-Use-lazy-imports-in-abrt_exception_handler3.patch delete mode 100644 0001-hooklib-Don-t-g_autofree-backtrace.patch delete mode 100644 0002-hooklib-Proper-freeing-of-backtrace.patch diff --git a/0001-Use-lazy-imports-in-abrt_exception_handler3.patch b/0001-Use-lazy-imports-in-abrt_exception_handler3.patch new file mode 100644 index 0000000..5c892a8 --- /dev/null +++ b/0001-Use-lazy-imports-in-abrt_exception_handler3.patch @@ -0,0 +1,57 @@ +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 + diff --git a/0001-hooklib-Don-t-g_autofree-backtrace.patch b/0001-hooklib-Don-t-g_autofree-backtrace.patch deleted file mode 100644 index 1225177..0000000 --- a/0001-hooklib-Don-t-g_autofree-backtrace.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1f2963b0611d4023957abe3c7391eab86256ba82 Mon Sep 17 00:00:00 2001 -From: Michal Fabik -Date: Wed, 23 Sep 2020 16:55:25 +0200 -Subject: [PATCH] hooklib: Don't g_autofree backtrace - -The result of abrt_get_backtrace was being freed every time, even when -no error occured. - -Resolves: -https://github.com/abrt/abrt/issues/1528 -https://bugzilla.redhat.com/show_bug.cgi?id=1881745 -Signed-off-by: Michal Fabik ---- - src/lib/hooklib.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c -index dceaeb16..56b77bc3 100644 ---- a/src/lib/hooklib.c -+++ b/src/lib/hooklib.c -@@ -348,7 +348,7 @@ char *abrt_get_backtrace(struct dump_dir *dd, unsigned timeout_sec, const char * - unsigned bt_depth = 1024; - const char *thread_apply_all = "thread apply all -ascending"; - const char *full = "full "; -- g_autofree char *bt = NULL; -+ char *bt = NULL; - while (1) - { - args[bt_cmd_index] = g_strdup_printf("%s backtrace %s%u", thread_apply_all, full, bt_depth); -@@ -367,6 +367,7 @@ char *abrt_get_backtrace(struct dump_dir *dd, unsigned timeout_sec, const char * - /* (NB: in fact, current impl. of exec_vp() never returns NULL) */ - log_warning("Failed to generate backtrace, reducing depth to %u", - bt_depth); -+ free(bt); - - /* Replace -ex disassemble (which disasms entire function $pc points to) - * to a version which analyzes limited, small patch of code around $pc. --- -2.26.2 - diff --git a/0002-hooklib-Proper-freeing-of-backtrace.patch b/0002-hooklib-Proper-freeing-of-backtrace.patch deleted file mode 100644 index a9ded17..0000000 --- a/0002-hooklib-Proper-freeing-of-backtrace.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5fa7b1f84fb02ca5dcf50d27f4bc14563c1918f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Mon, 12 Oct 2020 19:14:03 +0200 -Subject: [PATCH] hooklib: Proper freeing of backtrace - -Improper bracing caused the bt variable to be freed every time in every -iteration no matter what. This would then lead to an invalid (freed) -pointer being returned by the function. - -The mistake was made in 1f2963b0 and reported by Jeff Law. ---- - src/lib/hooklib.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c -index 56b77bc3..fc2a6a00 100644 ---- a/src/lib/hooklib.c -+++ b/src/lib/hooklib.c -@@ -361,13 +361,17 @@ char *abrt_get_backtrace(struct dump_dir *dd, unsigned timeout_sec, const char * - - bt_depth /= 2; - if (bt) -+ { - log_warning("Backtrace is too big (%u bytes), reducing depth to %u", - (unsigned)strlen(bt), bt_depth); -+ } - else -+ { - /* (NB: in fact, current impl. of exec_vp() never returns NULL) */ - log_warning("Failed to generate backtrace, reducing depth to %u", - bt_depth); -- free(bt); -+ g_clear_pointer(&bt, free); -+ } - - /* Replace -ex disassemble (which disasms entire function $pc points to) - * to a version which analyzes limited, small patch of code around $pc. --- -2.26.2 - diff --git a/abrt.spec b/abrt.spec index fb88956..3aef1ba 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -136,6 +136,8 @@ BuildRequires: python3-libreport BuildRequires: python3-devel %endif +Patch0: 0001-Use-lazy-imports-in-abrt_exception_handler3.patch + %description %{name} is a tool to help users to detect defects in applications and to create a bug report with all information needed by maintainer to fix it. @@ -1001,6 +1003,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Sep 27 2021 Matěj Grabovský - 2.14.6-8 +- Use lazy import in the Python exception handler to avoid slowdown in Python + startup (rhbz#2007664) + * Wed Jul 21 2021 Fedora Release Engineering - 2.14.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1b8bae307ac40653f80f4baae1df283d5d1850ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 22 Dec 2021 11:22:22 +0100 Subject: [PATCH 078/125] Rebuild for satyr 0.39 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 3aef1ba..7fa1705 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1003,6 +1003,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Dec 22 2021 Matěj Grabovský - 2.14.6-9 +- Rebuild for satyr 0.39 + * Mon Sep 27 2021 Matěj Grabovský - 2.14.6-8 - Use lazy import in the Python exception handler to avoid slowdown in Python startup (rhbz#2007664) From 810fcb191126868bbbe733ade0f0988c375e4964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 6 Jan 2022 14:56:23 +0100 Subject: [PATCH 079/125] Do not install conflicting packages in test --- tests/smoke.fmf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/smoke.fmf b/tests/smoke.fmf index ca74391..f879d5c 100644 --- a/tests/smoke.fmf +++ b/tests/smoke.fmf @@ -1,3 +1,9 @@ summary: Basic smoke test for abrt +prepare: + how: install + # Do not attempt to install conflicting subpackages. + exclude: + - abrt-atomic + - python3-abrt-container-addon execute: script: abrt-action-notify --help From 1c9f6e51cf55421457d220f34dc655e4587f906b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 6 Jan 2022 15:10:12 +0100 Subject: [PATCH 080/125] Bump release for rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 7fa1705..558be8b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1003,6 +1003,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jan 06 2022 Matěj Grabovský - 2.14.6-10 +- Bump release for rebuild + * Wed Dec 22 2021 Matěj Grabovský - 2.14.6-9 - Rebuild for satyr 0.39 From 88895e18b5cfe2def0c89a959af80bad4d5dd327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 12 Jan 2022 16:24:16 +0100 Subject: [PATCH 081/125] Fix issues with conflicting multilib packages --- abrt.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 558be8b..51289a2 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.14.6 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -81,6 +81,10 @@ BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete BuildRequires: python3-dbus + +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility +%global py_reproducible_pyc_path %{buildroot}%{python3_sitelib} +BuildRequires: /usr/bin/marshalparser %endif Requires: libreport >= %{libreport_ver} @@ -305,6 +309,7 @@ uncaught exception in python 3 programs. %package -n python3-abrt-container-addon Summary: %{name}'s container addon for catching Python 3 exceptions +BuildArch: noarch Conflicts: python3-abrt-addon Requires: container-exception-logger @@ -323,6 +328,7 @@ of machine_id for abrt events. %package tui Summary: %{name}'s command line interface +BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release} @@ -1003,6 +1009,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jan 12 2022 Miro Hrončok - 2.14.6-11 +- Make abrt-tui and python3-abrt-container-addon noarch as they contain no architecture-specific content +- Ensure Python bytecode in noarch subpackages is reproducible + * Thu Jan 06 2022 Matěj Grabovský - 2.14.6-10 - Bump release for rebuild From 0302f37126a25ca5e73a01ea8cce0e249634eaa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Mon, 17 Jan 2022 19:27:36 +0100 Subject: [PATCH 082/125] New upstream release 2.15.0 --- .gitignore | 1 + ...y-imports-in-abrt_exception_handler3.patch | 57 ------------------- abrt.spec | 16 ++++-- sources | 2 +- 4 files changed, 14 insertions(+), 62 deletions(-) delete mode 100644 0001-Use-lazy-imports-in-abrt_exception_handler3.patch diff --git a/.gitignore b/.gitignore index 75abc74..faaae41 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ abrt-1.1.13.tar.gz /abrt-2.14.4.tar.gz /abrt-2.14.5.tar.gz /abrt-2.14.6.tar.gz +/abrt-2.15.0.tar.gz diff --git a/0001-Use-lazy-imports-in-abrt_exception_handler3.patch b/0001-Use-lazy-imports-in-abrt_exception_handler3.patch deleted file mode 100644 index 5c892a8..0000000 --- a/0001-Use-lazy-imports-in-abrt_exception_handler3.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 - diff --git a/abrt.spec b/abrt.spec index 51289a2..c340e01 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,8 +48,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.14.6 -Release: 11%{?dist} +Version: 2.15.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -140,8 +140,6 @@ BuildRequires: python3-libreport BuildRequires: python3-devel %endif -Patch0: 0001-Use-lazy-imports-in-abrt_exception_handler3.patch - %description %{name} is a tool to help users to detect defects in applications and to create a bug report with all information needed by maintainer to fix it. @@ -1009,6 +1007,16 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Jan 17 2022 Matěj Grabovský - 2.15.0-1 +- Bump abrt library version to 1:0:1 +- cli: Fix path and glob matching for abrt info etc. +- abrt-dump-oops: Fix vmcore call trace parsing +- Use lazy imports in abrt_exception_handler3 +- Don't copy coredump to problem dir +- Detect Python 3.10 and Perl correctly in abrt-action-save-package-data +- Fix calls to deprecated methods in tests +- Update translations + * Wed Jan 12 2022 Miro Hrončok - 2.14.6-11 - Make abrt-tui and python3-abrt-container-addon noarch as they contain no architecture-specific content - Ensure Python bytecode in noarch subpackages is reproducible diff --git a/sources b/sources index 601ce96..adf93c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.14.6.tar.gz) = eb1ba2f624d51eeccd203bb23060493347f5a9142fad7d0570d46134071d870a9c66b4fbfb8210e7d6f87c0c039f31eb486d18a36b10fba318e2180aa09df9fe +SHA512 (abrt-2.15.0.tar.gz) = 2d6c1287c1f01990aeb30f956f465c7a6399a6e53dc667602e263c136f94bc4090b58876acba678b29671c0db89ae8e7dd6994cf8d0d2d9fbc375f54ae6cd935 From 15bea33e034cd5275bc734d08e549700665cd51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 19 Jan 2022 12:27:20 +0100 Subject: [PATCH 083/125] tests: Add one more conflicting package --- tests/smoke.fmf | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/smoke.fmf b/tests/smoke.fmf index f879d5c..69759b3 100644 --- a/tests/smoke.fmf +++ b/tests/smoke.fmf @@ -4,6 +4,7 @@ prepare: # Do not attempt to install conflicting subpackages. exclude: - abrt-atomic + - abrt-java-connector-container - python3-abrt-container-addon execute: script: abrt-action-notify --help From fcc2f68d2d33f263829a065fc0dd8c1eea446da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 19 Jan 2022 14:54:57 +0100 Subject: [PATCH 084/125] Rebuild for testing --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index c340e01..6094cfc 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.15.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1007,6 +1007,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jan 19 2022 Matěj Grabovský - 2.15.0-2 +- Rebuild for testing + * Mon Jan 17 2022 Matěj Grabovský - 2.15.0-1 - Bump abrt library version to 1:0:1 - cli: Fix path and glob matching for abrt info etc. From f9fd407b73ecb5a9a7eba95392049700e57cc81a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:51:29 +0000 Subject: [PATCH 085/125] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 6094cfc..028ffc4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.15.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1007,6 +1007,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 19 2022 Matěj Grabovský - 2.15.0-2 - Rebuild for testing From 3f24d622892a3f97fb0544df933a546f1e892603 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 10 Mar 2022 21:48:33 +0100 Subject: [PATCH 086/125] Update to 2.15.1 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index faaae41..302a9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ abrt-1.1.13.tar.gz /abrt-2.14.5.tar.gz /abrt-2.14.6.tar.gz /abrt-2.15.0.tar.gz +/abrt-2.15.1.tar.gz diff --git a/abrt.spec b/abrt.spec index 028ffc4..a700fbc 100644 --- a/abrt.spec +++ b/abrt.spec @@ -48,8 +48,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.15.0 -Release: 3%{?dist} +Version: 2.15.1 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1007,6 +1007,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Mar 10 2022 Michal Srb - 2.15.1-1 +- Update to 2.15.1 + * Wed Jan 19 2022 Fedora Release Engineering - 2.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index adf93c6..d9aac56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.15.0.tar.gz) = 2d6c1287c1f01990aeb30f956f465c7a6399a6e53dc667602e263c136f94bc4090b58876acba678b29671c0db89ae8e7dd6994cf8d0d2d9fbc375f54ae6cd935 +SHA512 (abrt-2.15.1.tar.gz) = 745c513969b78ee7c76c310a8c2fc0bafd1e50375130fa773ad950bf123ee50cfa237da9b331f2c0af2851b35b162cbc908f2e00d59283867ed8ffd72236d0ea From f144023834a27b166d06ee9d74fb4715509f2dc1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 15 Jun 2022 18:15:40 +0200 Subject: [PATCH 087/125] Rebuilt for Python 3.11 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index a700fbc..85e5185 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.15.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1007,6 +1007,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jun 15 2022 Python Maint - 2.15.1-2 +- Rebuilt for Python 3.11 + * Thu Mar 10 2022 Michal Srb - 2.15.1-1 - Update to 2.15.1 From 1e992dd7d9da7666d5da2be286a4568de4a5217f Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 16 Jun 2022 13:24:42 +0200 Subject: [PATCH 088/125] Fix FTBFS Resolves: rhbz#2093924 Signed-off-by: Michal Srb --- 0001-Fix-for-rpm-4.18.patch | 59 +++++++++++++++++++++++++++++++++++++ abrt.spec | 7 ++++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-for-rpm-4.18.patch diff --git a/0001-Fix-for-rpm-4.18.patch b/0001-Fix-for-rpm-4.18.patch new file mode 100644 index 0000000..606d0e9 --- /dev/null +++ b/0001-Fix-for-rpm-4.18.patch @@ -0,0 +1,59 @@ +From ca26ccfff7e5e89eb48d67e707722d4a740f4511 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Thu, 16 Jun 2022 13:13:59 +0200 +Subject: [PATCH] Fix for rpm 4.18 + +pgpHexStr() function has been deprecated and renamed to rpmhex(). + +Since the replacement is only available in Rawhide (f37), let's +continue using the old name for now. + +This commit tells gcc to ignore the deprecation warning. + +See the commit: +https://github.com/rpm-software-management/rpm/commit/d44be2cbc1c3265d55f05b47daa69334a7a133e6 + +Signed-off-by: Michal Srb +--- + src/daemon/rpm.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c +index c84f1221..b9ac9767 100644 +--- a/src/daemon/rpm.c ++++ b/src/daemon/rpm.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + struct rpmPubkey_s { +@@ -92,6 +93,15 @@ void rpm_destroy() + g_list_free_full(g_steal_pointer(&list_fingerprints), free); + } + ++ ++// TODO: pgpHexStr() has been renamed to rpmhex() recently, and ++// pgpHexStr() is now deprecated and it will be dropped ++// in the future. Let's keep using the old name for now ++// as the replacement is only available in Rawhide (f37). ++// https://github.com/rpm-software-management/rpm/commit/d44be2cbc1c3265d55f05b47daa69334a7a133e6 ++// Ignore the deprecation warning in this function ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + void rpm_load_gpgkey(const char* filename) + { + #ifdef HAVE_LIBRPM +@@ -133,6 +143,7 @@ void rpm_load_gpgkey(const char* filename) + return; + #endif + } ++#pragma GCC diagnostic pop + + int rpm_chk_fingerprint(const char* pkg) + { +-- +2.36.1 + diff --git a/abrt.spec b/abrt.spec index 85e5185..feea9e4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,10 +49,11 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.15.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-Fix-for-rpm-4.18.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -1007,6 +1008,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jun 16 2022 Michal Srb - 2.15.1-3 +- Fix FTBFS +- Resolves: rhbz#2093924 + * Wed Jun 15 2022 Python Maint - 2.15.1-2 - Rebuilt for Python 3.11 From d3f14892f8b4c2fb8030bcb07db2d313ca8242a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:22:13 +0000 Subject: [PATCH 089/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index feea9e4..b5632b6 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.15.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -1008,6 +1008,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.15.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 16 2022 Michal Srb - 2.15.1-3 - Fix FTBFS - Resolves: rhbz#2093924 From 534292e248ea6cfd1b3ce048b867ff3dedca9a61 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 12 Oct 2022 09:43:01 +0200 Subject: [PATCH 090/125] abrt-journal: call sd_journal_get_fd() right after sd_journal_open() Resolves: rhbz#2128662 Signed-off-by: Michal Srb --- ...l-sd_journal_get_fd-right-after-sd_j.patch | 65 +++++++++++++++++++ abrt.spec | 7 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch diff --git a/0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch b/0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch new file mode 100644 index 0000000..9c42e6e --- /dev/null +++ b/0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch @@ -0,0 +1,65 @@ +From 4ebe2699287844d2766f87062c48d8953b292bfe Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Tue, 11 Oct 2022 22:41:33 +0200 +Subject: [PATCH] abrt-journal: call sd_journal_get_fd() right after + sd_journal_open() + +See: rhbz#2128662 + +Under certain circumstances, abrt-dump-journal can be running, +but not receiving any event notifications from journal. + +The culprit of the issue seems to be the delayed call +to sd_journal_get_fd(), as discussed in various +issues and pull-requests in other projects. +See for example [1], [2], or [3]. + +[1]: https://github.com/systemd/systemd/issues/7998 +[2]: https://github.com/ledbettj/systemd-journal/pull/78 +[3]: https://github.com/rsyslog/rsyslog/issues/2436 + +Signed-off-by: Michal Srb +--- + src/plugins/abrt-journal.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/abrt-journal.c b/src/plugins/abrt-journal.c +index adc9440e..48ae8c99 100644 +--- a/src/plugins/abrt-journal.c ++++ b/src/plugins/abrt-journal.c +@@ -35,12 +35,15 @@ + struct abrt_journal + { + sd_journal *j; ++ int fd; + }; + + static int abrt_journal_new_flags(abrt_journal_t **journal, int flags) + { + sd_journal *j; + const int r = sd_journal_open(&j, flags); ++ const int fd = sd_journal_get_fd(j); ++ + if (r < 0) + { + log_notice("Failed to open journal: %s", strerror(-r)); +@@ -49,6 +52,7 @@ static int abrt_journal_new_flags(abrt_journal_t **journal, int flags) + + *journal = g_malloc0(sizeof(**journal)); + (*journal)->j = j; ++ (*journal)->fd = fd; + + return 0; + } +@@ -452,7 +456,7 @@ int abrt_journal_watch_run_sync(abrt_journal_watch_t *watch) + sigdelset(&mask, SIGKILL); + + struct pollfd pollfd; +- pollfd.fd = sd_journal_get_fd(watch->j->j); ++ pollfd.fd = watch->j->fd; + pollfd.events = sd_journal_get_events(watch->j->j); + + int r = 0; +-- +2.37.3 + diff --git a/abrt.spec b/abrt.spec index b5632b6..201f845 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,11 +49,12 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.15.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-Fix-for-rpm-4.18.patch +Patch1: 0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -1008,6 +1009,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Oct 12 2022 Michal Srb - 2.15.1-5 +- abrt-journal: call sd_journal_get_fd() right after sd_journal_open() +- Resolves: rhbz#2128662 + * Wed Jul 20 2022 Fedora Release Engineering - 2.15.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 4f63977e6d3dff1d0c666e0baa1d64c12c28f777 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 12 Oct 2022 09:44:21 +0200 Subject: [PATCH 091/125] Adjust gating.yaml for non-Rawhide release Fedora CI still doesn't run the generic tests for non-Rawhide releases :/ Signed-off-by: Michal Srb --- gating.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gating.yaml b/gating.yaml index db67165..f075ad7 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,9 +4,6 @@ product_versions: decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy @@ -15,7 +12,4 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From c8a122775e01e31dcb0435ff904c1e61b6c64f55 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 12 Oct 2022 09:59:26 +0200 Subject: [PATCH 092/125] applet: Update GLib constant name This fixes FTBFS in F37+ Signed-off-by: Michal Srb --- 0003-applet-Update-GLib-constant-name.patch | 48 +++++++++++++++++++++ abrt.spec | 1 + 2 files changed, 49 insertions(+) create mode 100644 0003-applet-Update-GLib-constant-name.patch diff --git a/0003-applet-Update-GLib-constant-name.patch b/0003-applet-Update-GLib-constant-name.patch new file mode 100644 index 0000000..ae96953 --- /dev/null +++ b/0003-applet-Update-GLib-constant-name.patch @@ -0,0 +1,48 @@ +From 8f67ddc99b4a72718290daae323fa5bc3c1d59eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Thu, 15 Sep 2022 12:59:23 +0200 +Subject: [PATCH] applet: Update GLib constant name + +The `G_APPLICATION_FLAGS_NONE` constant has apparently been deprecated +and removed 2.73. Also bump the version constraint in the spec file. +--- + abrt.spec | 3 ++- + src/applet/abrt-applet-application.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/abrt.spec b/abrt.spec +index 2f2c3027..03beca7d 100644 +--- a/abrt.spec ++++ b/abrt.spec +@@ -43,6 +43,7 @@ + %define docdirversion -%{version} + %endif + ++%define glib_ver 2.73.3 + %define libreport_ver 2.14.0 + %define satyr_ver 0.24 + +@@ -56,7 +57,7 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta + BuildRequires: %{dbus_devel} + BuildRequires: hostname + BuildRequires: gtk3-devel +-BuildRequires: glib2-devel >= 2.43.4 ++BuildRequires: glib2-devel >= %{glib_ver} + BuildRequires: rpm-devel >= 4.6 + BuildRequires: desktop-file-utils + BuildRequires: libnotify-devel +diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c +index 394d52b7..6faa8cf7 100644 +--- a/src/applet/abrt-applet-application.c ++++ b/src/applet/abrt-applet-application.c +@@ -1215,6 +1215,6 @@ abrt_applet_application_new (void) + { + return g_object_new (ABRT_APPLET_TYPE_APPLICATION, + "application-id", ABRT_DBUS_NAME ".applet", +- "flags", G_APPLICATION_FLAGS_NONE, ++ "flags", G_APPLICATION_DEFAULT_FLAGS, + NULL); + } +-- +2.37.3 + diff --git a/abrt.spec b/abrt.spec index 201f845..e6c1ad1 100644 --- a/abrt.spec +++ b/abrt.spec @@ -55,6 +55,7 @@ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-Fix-for-rpm-4.18.patch Patch1: 0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch +Patch2: 0003-applet-Update-GLib-constant-name.patch BuildRequires: git-core BuildRequires: %{dbus_devel} From a20ba81e1de969ff5310297d05ac94a95a09e71d Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 19 Oct 2022 15:41:54 +0200 Subject: [PATCH 093/125] abrt-journal: First seek the journal tail and then set filters Resolves: rhbz#2128662 Signed-off-by: Michal Srb --- ...ore-First-seek-the-journal-tail-and-.patch | 61 +++++++++++++++++++ abrt.spec | 7 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch diff --git a/0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch b/0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch new file mode 100644 index 0000000..8d130b8 --- /dev/null +++ b/0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch @@ -0,0 +1,61 @@ +From 428bdf417b33d65fa5fbdcd292f12eef704bae95 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 19 Oct 2022 06:43:38 +0200 +Subject: [PATCH] a-dump-journal-core: First seek the journal tail and then set + filters + +See: rhbz#2128662 + +a-dump-journal-core uses filters to jump between +systemd-coredump entries in journal. + +However, we should first jump to the starting position +(journal tail) and only then set filters. +I suspect that setting the filters early, before we are +at the starting position, can lead to the strange +behavior that we are seeing in Fedora. + +This patch makes the problem go away on my freshly-installed +Fedora 37 VM. + +Signed-off-by: Michal Srb +--- + src/plugins/abrt-dump-journal-core.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/src/plugins/abrt-dump-journal-core.c b/src/plugins/abrt-dump-journal-core.c +index 68d5b320..1bb793a2 100644 +--- a/src/plugins/abrt-dump-journal-core.c ++++ b/src/plugins/abrt-dump-journal-core.c +@@ -628,17 +628,22 @@ main(int argc, char *argv[]) + error_msg_and_die(_("Cannot open systemd-journal")); + } + +- if (abrt_journal_set_journal_filter(journal, coredump_journal_filter) < 0) +- error_msg_and_die(_("Cannot filter systemd-journal to systemd-coredump data only")); ++ if (opts & OPT_e) { ++ if (abrt_journal_seek_tail(journal) < 0) ++ error_msg_and_die(_("Cannot seek to the end of journal")); + +- g_list_free(coredump_journal_filter); +- +- if ((opts & OPT_e) && abrt_journal_seek_tail(journal) < 0) +- error_msg_and_die(_("Cannot seek to the end of journal")); ++ if (abrt_journal_save_current_position(journal, ABRT_JOURNAL_WATCH_STATE_FILE) < 0) ++ log_warning("Failed to save the starting cursor position"); ++ } + + if (cursor && abrt_journal_set_cursor(journal, cursor)) + error_msg_and_die(_("Failed to set systemd-journal cursor '%s'"), cursor); + ++ if (abrt_journal_set_journal_filter(journal, coredump_journal_filter) < 0) ++ error_msg_and_die(_("Cannot filter systemd-journal to systemd-coredump data only")); ++ ++ g_list_free(coredump_journal_filter); ++ + if ((opts & OPT_f)) + { + if (!cursor && !(opts & OPT_e)) +-- +2.37.3 + diff --git a/abrt.spec b/abrt.spec index e6c1ad1..15ae1a0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,13 +49,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.15.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-Fix-for-rpm-4.18.patch Patch1: 0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch Patch2: 0003-applet-Update-GLib-constant-name.patch +Patch3: 0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -1010,6 +1011,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Oct 19 2022 Michal Srb - 2.15.1-6 +- abrt-journal: First seek the journal tail and then set filters +- Resolves: rhbz#2128662 + * Wed Oct 12 2022 Michal Srb - 2.15.1-5 - abrt-journal: call sd_journal_get_fd() right after sd_journal_open() - Resolves: rhbz#2128662 From 50a321fe1d1726d0ef76ed09e8da2cf4531fa318 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 24 Oct 2022 18:00:03 +0200 Subject: [PATCH 094/125] Update to upstream release 2.16.0 Signed-off-by: Michal Srb --- .gitignore | 1 + 0001-Fix-for-rpm-4.18.patch | 59 --------------- ...l-sd_journal_get_fd-right-after-sd_j.patch | 65 ---------------- 0003-applet-Update-GLib-constant-name.patch | 48 ------------ ...ore-First-seek-the-journal-tail-and-.patch | 61 --------------- abrt.spec | 74 ++++--------------- sources | 2 +- 7 files changed, 18 insertions(+), 292 deletions(-) delete mode 100644 0001-Fix-for-rpm-4.18.patch delete mode 100644 0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch delete mode 100644 0003-applet-Update-GLib-constant-name.patch delete mode 100644 0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch diff --git a/.gitignore b/.gitignore index 302a9d3..424d319 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ abrt-1.1.13.tar.gz /abrt-2.14.6.tar.gz /abrt-2.15.0.tar.gz /abrt-2.15.1.tar.gz +/abrt-2.16.0.tar.gz diff --git a/0001-Fix-for-rpm-4.18.patch b/0001-Fix-for-rpm-4.18.patch deleted file mode 100644 index 606d0e9..0000000 --- a/0001-Fix-for-rpm-4.18.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ca26ccfff7e5e89eb48d67e707722d4a740f4511 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Thu, 16 Jun 2022 13:13:59 +0200 -Subject: [PATCH] Fix for rpm 4.18 - -pgpHexStr() function has been deprecated and renamed to rpmhex(). - -Since the replacement is only available in Rawhide (f37), let's -continue using the old name for now. - -This commit tells gcc to ignore the deprecation warning. - -See the commit: -https://github.com/rpm-software-management/rpm/commit/d44be2cbc1c3265d55f05b47daa69334a7a133e6 - -Signed-off-by: Michal Srb ---- - src/daemon/rpm.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c -index c84f1221..b9ac9767 100644 ---- a/src/daemon/rpm.c -+++ b/src/daemon/rpm.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - struct rpmPubkey_s { -@@ -92,6 +93,15 @@ void rpm_destroy() - g_list_free_full(g_steal_pointer(&list_fingerprints), free); - } - -+ -+// TODO: pgpHexStr() has been renamed to rpmhex() recently, and -+// pgpHexStr() is now deprecated and it will be dropped -+// in the future. Let's keep using the old name for now -+// as the replacement is only available in Rawhide (f37). -+// https://github.com/rpm-software-management/rpm/commit/d44be2cbc1c3265d55f05b47daa69334a7a133e6 -+// Ignore the deprecation warning in this function -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - void rpm_load_gpgkey(const char* filename) - { - #ifdef HAVE_LIBRPM -@@ -133,6 +143,7 @@ void rpm_load_gpgkey(const char* filename) - return; - #endif - } -+#pragma GCC diagnostic pop - - int rpm_chk_fingerprint(const char* pkg) - { --- -2.36.1 - diff --git a/0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch b/0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch deleted file mode 100644 index 9c42e6e..0000000 --- a/0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4ebe2699287844d2766f87062c48d8953b292bfe Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Tue, 11 Oct 2022 22:41:33 +0200 -Subject: [PATCH] abrt-journal: call sd_journal_get_fd() right after - sd_journal_open() - -See: rhbz#2128662 - -Under certain circumstances, abrt-dump-journal can be running, -but not receiving any event notifications from journal. - -The culprit of the issue seems to be the delayed call -to sd_journal_get_fd(), as discussed in various -issues and pull-requests in other projects. -See for example [1], [2], or [3]. - -[1]: https://github.com/systemd/systemd/issues/7998 -[2]: https://github.com/ledbettj/systemd-journal/pull/78 -[3]: https://github.com/rsyslog/rsyslog/issues/2436 - -Signed-off-by: Michal Srb ---- - src/plugins/abrt-journal.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/abrt-journal.c b/src/plugins/abrt-journal.c -index adc9440e..48ae8c99 100644 ---- a/src/plugins/abrt-journal.c -+++ b/src/plugins/abrt-journal.c -@@ -35,12 +35,15 @@ - struct abrt_journal - { - sd_journal *j; -+ int fd; - }; - - static int abrt_journal_new_flags(abrt_journal_t **journal, int flags) - { - sd_journal *j; - const int r = sd_journal_open(&j, flags); -+ const int fd = sd_journal_get_fd(j); -+ - if (r < 0) - { - log_notice("Failed to open journal: %s", strerror(-r)); -@@ -49,6 +52,7 @@ static int abrt_journal_new_flags(abrt_journal_t **journal, int flags) - - *journal = g_malloc0(sizeof(**journal)); - (*journal)->j = j; -+ (*journal)->fd = fd; - - return 0; - } -@@ -452,7 +456,7 @@ int abrt_journal_watch_run_sync(abrt_journal_watch_t *watch) - sigdelset(&mask, SIGKILL); - - struct pollfd pollfd; -- pollfd.fd = sd_journal_get_fd(watch->j->j); -+ pollfd.fd = watch->j->fd; - pollfd.events = sd_journal_get_events(watch->j->j); - - int r = 0; --- -2.37.3 - diff --git a/0003-applet-Update-GLib-constant-name.patch b/0003-applet-Update-GLib-constant-name.patch deleted file mode 100644 index ae96953..0000000 --- a/0003-applet-Update-GLib-constant-name.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8f67ddc99b4a72718290daae323fa5bc3c1d59eb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Thu, 15 Sep 2022 12:59:23 +0200 -Subject: [PATCH] applet: Update GLib constant name - -The `G_APPLICATION_FLAGS_NONE` constant has apparently been deprecated -and removed 2.73. Also bump the version constraint in the spec file. ---- - abrt.spec | 3 ++- - src/applet/abrt-applet-application.c | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/abrt.spec b/abrt.spec -index 2f2c3027..03beca7d 100644 ---- a/abrt.spec -+++ b/abrt.spec -@@ -43,6 +43,7 @@ - %define docdirversion -%{version} - %endif - -+%define glib_ver 2.73.3 - %define libreport_ver 2.14.0 - %define satyr_ver 0.24 - -@@ -56,7 +57,7 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta - BuildRequires: %{dbus_devel} - BuildRequires: hostname - BuildRequires: gtk3-devel --BuildRequires: glib2-devel >= 2.43.4 -+BuildRequires: glib2-devel >= %{glib_ver} - BuildRequires: rpm-devel >= 4.6 - BuildRequires: desktop-file-utils - BuildRequires: libnotify-devel -diff --git a/src/applet/abrt-applet-application.c b/src/applet/abrt-applet-application.c -index 394d52b7..6faa8cf7 100644 ---- a/src/applet/abrt-applet-application.c -+++ b/src/applet/abrt-applet-application.c -@@ -1215,6 +1215,6 @@ abrt_applet_application_new (void) - { - return g_object_new (ABRT_APPLET_TYPE_APPLICATION, - "application-id", ABRT_DBUS_NAME ".applet", -- "flags", G_APPLICATION_FLAGS_NONE, -+ "flags", G_APPLICATION_DEFAULT_FLAGS, - NULL); - } --- -2.37.3 - diff --git a/0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch b/0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch deleted file mode 100644 index 8d130b8..0000000 --- a/0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 428bdf417b33d65fa5fbdcd292f12eef704bae95 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 19 Oct 2022 06:43:38 +0200 -Subject: [PATCH] a-dump-journal-core: First seek the journal tail and then set - filters - -See: rhbz#2128662 - -a-dump-journal-core uses filters to jump between -systemd-coredump entries in journal. - -However, we should first jump to the starting position -(journal tail) and only then set filters. -I suspect that setting the filters early, before we are -at the starting position, can lead to the strange -behavior that we are seeing in Fedora. - -This patch makes the problem go away on my freshly-installed -Fedora 37 VM. - -Signed-off-by: Michal Srb ---- - src/plugins/abrt-dump-journal-core.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/plugins/abrt-dump-journal-core.c b/src/plugins/abrt-dump-journal-core.c -index 68d5b320..1bb793a2 100644 ---- a/src/plugins/abrt-dump-journal-core.c -+++ b/src/plugins/abrt-dump-journal-core.c -@@ -628,17 +628,22 @@ main(int argc, char *argv[]) - error_msg_and_die(_("Cannot open systemd-journal")); - } - -- if (abrt_journal_set_journal_filter(journal, coredump_journal_filter) < 0) -- error_msg_and_die(_("Cannot filter systemd-journal to systemd-coredump data only")); -+ if (opts & OPT_e) { -+ if (abrt_journal_seek_tail(journal) < 0) -+ error_msg_and_die(_("Cannot seek to the end of journal")); - -- g_list_free(coredump_journal_filter); -- -- if ((opts & OPT_e) && abrt_journal_seek_tail(journal) < 0) -- error_msg_and_die(_("Cannot seek to the end of journal")); -+ if (abrt_journal_save_current_position(journal, ABRT_JOURNAL_WATCH_STATE_FILE) < 0) -+ log_warning("Failed to save the starting cursor position"); -+ } - - if (cursor && abrt_journal_set_cursor(journal, cursor)) - error_msg_and_die(_("Failed to set systemd-journal cursor '%s'"), cursor); - -+ if (abrt_journal_set_journal_filter(journal, coredump_journal_filter) < 0) -+ error_msg_and_die(_("Cannot filter systemd-journal to systemd-coredump data only")); -+ -+ g_list_free(coredump_journal_filter); -+ - if ((opts & OPT_f)) - { - if (!cursor && !(opts & OPT_e)) --- -2.37.3 - diff --git a/abrt.spec b/abrt.spec index 15ae1a0..db4fc89 100644 --- a/abrt.spec +++ b/abrt.spec @@ -22,7 +22,7 @@ %bcond_without retrace # rpmbuild --define 'desktopvendor mystring' -%if "x%{desktopvendor}" == "x" +%if "x%{?desktopvendor}" == "x" %define desktopvendor %(source /etc/os-release; echo ${ID}) %endif @@ -43,26 +43,22 @@ %define docdirversion -%{version} %endif +%define glib_ver 2.73.3 %define libreport_ver 2.14.0 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.15.1 -Release: 6%{?dist} +Version: 2.16.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-Fix-for-rpm-4.18.patch -Patch1: 0002-abrt-journal-call-sd_journal_get_fd-right-after-sd_j.patch -Patch2: 0003-applet-Update-GLib-constant-name.patch -Patch3: 0004-a-dump-journal-core-First-seek-the-journal-tail-and-.patch - BuildRequires: git-core BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel -BuildRequires: glib2-devel >= 2.43.4 +BuildRequires: glib2-devel >= %{glib_ver} BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel @@ -72,7 +68,7 @@ BuildRequires: gettext BuildRequires: libxml2-devel BuildRequires: intltool BuildRequires: libtool -BuildRequires: libsoup-devel +BuildRequires: libsoup3-devel BuildRequires: asciidoc BuildRequires: doxygen BuildRequires: xmlto @@ -80,16 +76,20 @@ BuildRequires: libreport-devel >= %{libreport_ver} BuildRequires: satyr-devel >= %{satyr_ver} BuildRequires: augeas BuildRequires: libselinux-devel +# Required for the %%{_unitdir} and %%{_tmpfilesdir} macros. +BuildRequires: systemd-rpm-macros %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete BuildRequires: python3-dbus +%if 0%{?fedora} # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility %global py_reproducible_pyc_path %{buildroot}%{python3_sitelib} BuildRequires: /usr/bin/marshalparser %endif +%endif Requires: libreport >= %{libreport_ver} Requires: satyr >= %{satyr_ver} @@ -197,11 +197,9 @@ Summary: %{name}'s C/C++ addon Requires: cpio Requires: gdb-headless Requires: elfutils +# Required for local retracing with GDB. +Requires: elfutils-debuginfod-client %if 0%{!?rhel:1} -%if %{with retrace} -# abrt-action-perform-ccpp-analysis wants to run analyze_RetraceServer: -Requires: %{name}-retrace-client -%endif %endif Requires: %{name} = %{version}-%{release} Requires: abrt-libs = %{version}-%{release} @@ -209,6 +207,7 @@ Requires: abrt-libs = %{version}-%{release} Requires: python3-libreport %endif Obsoletes: abrt-addon-coredump-helper <= 2.12.2 +Obsoletes: abrt-retrace-client <= 2.15.1 %description addon-ccpp @@ -222,20 +221,6 @@ Requires: abrt-libs = %{version}-%{release} %description addon-upload-watch This package contains hook for uploaded problems. -%if %{with retrace} -%package retrace-client -Summary: %{name}'s retrace client -Requires: %{name} = %{version}-%{release} -Requires: xz -Requires: tar -Requires: p11-kit-trust -Requires: libsoup - -%description retrace-client -This package contains the client application for Retrace server -which is able to analyze C/C++ crashes remotely. -%endif - %package addon-kerneloops Summary: %{name}'s kerneloops addon Requires: curl @@ -361,9 +346,6 @@ Requires: python3-abrt-addon %endif Requires: abrt-addon-xorg %if ! 0%{?rhel} -%if %{with retrace} -Requires: abrt-retrace-client -%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -401,9 +383,6 @@ Requires: gdb-headless Requires: abrt-gui Requires: gnome-abrt %if ! 0%{?rhel} -%if %{with retrace} -Requires: abrt-retrace-client -%endif %if %{with bodhi} Requires: abrt-plugin-bodhi %endif @@ -481,7 +460,6 @@ to the shell %global __scm_apply_git(qp:m:) %{__git} am --exclude doc/design --exclude doc/project/abrt.tex %autosetup -S git -p 0 - %build ./autogen.sh @@ -497,9 +475,6 @@ CFLAGS="%{optflags} -Werror" %configure \ %if %{without atomic} --without-atomic \ %endif -%if %{without retrace} - --without-retrace \ -%endif %ifnarch %{arm} --enable-native-unwinder \ %endif @@ -553,7 +528,6 @@ make check|| { # do not cat tests/testsuite.log because it contains a lot of bloat find src -name "test-suite.log" -print -exec cat '{}' \; find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \; - cat src/cli/test-suite.log exit 1 } @@ -817,19 +791,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %{_localstatedir}/lib/abrt -# attr(2755) ~= SETGID -%attr(2755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache - %{_bindir}/abrt-action-analyze-c %{_bindir}/abrt-action-trim-files -%{_bindir}/abrt-action-analyze-core %{_bindir}/abrt-action-analyze-vulnerability -%{_bindir}/abrt-action-install-debuginfo %{_bindir}/abrt-action-generate-backtrace %{_bindir}/abrt-action-generate-core-backtrace %{_bindir}/abrt-action-analyze-backtrace %{_bindir}/abrt-action-list-dsos -%{_bindir}/abrt-action-perform-ccpp-analysis %{_bindir}/abrt-action-analyze-ccpp-local %{_bindir}/abrt-dump-journal-core %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_event.conf @@ -840,7 +808,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man5/vimrc_event.conf.5* %{_datadir}/libreport/events/analyze_CCpp.xml %{_datadir}/libreport/events/analyze_LocalGDB.xml -%{_datadir}/libreport/events/analyze_RetraceServer.xml %{_datadir}/libreport/events/collect_xsession_errors.xml %{_datadir}/libreport/events/collect_GConf.xml %{_datadir}/libreport/events/collect_vimrc_user.xml @@ -852,11 +819,8 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-action-generate-core-backtrace.* %{_mandir}/man*/abrt-action-analyze-backtrace.* %{_mandir}/man*/abrt-action-list-dsos.* -%{_mandir}/man*/abrt-action-install-debuginfo.* %{_mandir}/man*/abrt-action-analyze-ccpp-local.* -%{_mandir}/man*/abrt-action-analyze-core.* %{_mandir}/man*/abrt-action-analyze-vulnerability.* -%{_mandir}/man*/abrt-action-perform-ccpp-analysis.* %{_mandir}/man1/abrt-dump-journal-core.1* %files addon-upload-watch @@ -865,14 +829,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/abrt-upload-watch.* -%if %{with retrace} -%files retrace-client -%{_bindir}/abrt-retrace-client -%{_mandir}/man1/abrt-retrace-client.1* -%config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf -%{_mandir}/man5/ccpp_retrace_event.conf.5* -%endif - %files addon-kerneloops %config(noreplace) %{_sysconfdir}/libreport/events.d/koops_event.conf %{_journalcatalogdir}/abrt_koops.catalog @@ -954,7 +910,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %files tui %if %{with python3} -%config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion %{_bindir}/abrt %{_bindir}/abrt-cli %{python3_sitelib}/abrtcli/ @@ -1011,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Oct 24 2022 Michal Srb - 2.16.0-1 +- Update to upstream release 2.16.0 + * Wed Oct 19 2022 Michal Srb - 2.15.1-6 - abrt-journal: First seek the journal tail and then set filters - Resolves: rhbz#2128662 diff --git a/sources b/sources index d9aac56..b028c85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.15.1.tar.gz) = 745c513969b78ee7c76c310a8c2fc0bafd1e50375130fa773ad950bf123ee50cfa237da9b331f2c0af2851b35b162cbc908f2e00d59283867ed8ffd72236d0ea +SHA512 (abrt-2.16.0.tar.gz) = 243594580ad728bfa96c42005d29b3f76f0910cc80a4f4243f1ead7d2087e8ba5a5eadcc5405739bffaa43ed1b4bc0822ee1796ab2d16938a45a6823cfe9f1a5 From e73a64df97c48f6fd0a4f61456caf3b7ff602ce9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:19:42 +0000 Subject: [PATCH 095/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index db4fc89..974234c 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.16.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.16.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Oct 24 2022 Michal Srb - 2.16.0-1 - Update to upstream release 2.16.0 From 8c7bdb15235b4d343765e906f2cfc47de2f690c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 2 Feb 2023 15:54:58 +0100 Subject: [PATCH 096/125] Use SPDX format for license field See [the wiki][1] for details. [1]: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 --- abrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 974234c..d85b1de 100644 --- a/abrt.spec +++ b/abrt.spec @@ -51,7 +51,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.16.0 Release: 2%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: git-core From e65ab2c3e6f5b68c125b4d7d544ce98b25f359d1 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 30 Mar 2023 11:37:17 +0200 Subject: [PATCH 097/125] Update to upstream release 2.16.1 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 424d319..b777d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ abrt-1.1.13.tar.gz /abrt-2.15.0.tar.gz /abrt-2.15.1.tar.gz /abrt-2.16.0.tar.gz +/abrt-2.16.1.tar.gz diff --git a/abrt.spec b/abrt.spec index d85b1de..1c62018 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,8 +49,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.16.0 -Release: 2%{?dist} +Version: 2.16.1 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Mar 30 2023 Michal Srb - 2.16.1-1 +- Update to upstream release 2.16.1 + * Wed Jan 18 2023 Fedora Release Engineering - 2.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b028c85..a543ab6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.16.0.tar.gz) = 243594580ad728bfa96c42005d29b3f76f0910cc80a4f4243f1ead7d2087e8ba5a5eadcc5405739bffaa43ed1b4bc0822ee1796ab2d16938a45a6823cfe9f1a5 +SHA512 (abrt-2.16.1.tar.gz) = a5babbc6fb67ff8ffbf648eec1195132e2128c27b27da9ec5272f894720d75abb147887a0327399a27fdbb87f2aa00a9d894b787e66433a369912c2b9c34c7c5 From 1f0eac990d8017977be50d92271969d55e4436b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Mon, 22 May 2023 11:38:34 +0200 Subject: [PATCH 098/125] Update to upstream release 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matěj Grabovský --- .gitignore | 1 + abrt.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b777d6a..c236681 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ abrt-1.1.13.tar.gz /abrt-2.15.1.tar.gz /abrt-2.16.0.tar.gz /abrt-2.16.1.tar.gz +/abrt-2.17.0.tar.gz diff --git a/abrt.spec b/abrt.spec index 1c62018..994f919 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.16.1 +Version: 2.17.0 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ @@ -59,7 +59,7 @@ BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel BuildRequires: glib2-devel >= %{glib_ver} -BuildRequires: rpm-devel >= 4.6 +BuildRequires: rpm-devel >= 4.18 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel #why? BuildRequires: file-devel @@ -966,6 +966,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon May 22 2023 Matěj Grabovský - 2.17.0-1 +- Update to upstream release 2.17.0 +- Bump rpm-devel dependency to 4.18 + * Thu Mar 30 2023 Michal Srb - 2.16.1-1 - Update to upstream release 2.16.1 diff --git a/sources b/sources index a543ab6..ca6e2ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.16.1.tar.gz) = a5babbc6fb67ff8ffbf648eec1195132e2128c27b27da9ec5272f894720d75abb147887a0327399a27fdbb87f2aa00a9d894b787e66433a369912c2b9c34c7c5 +SHA512 (abrt-2.17.0.tar.gz) = 6a2e66436ad097af3a270613ecdbe1b3f67820b7912c2607e3fea7f4b31166d99aa467757eb9504397163fa269af5ab6a88abbd2fa0cbad34f3e938ddddc49e7 From 7073ad434640c52324e9ef7d466fbfc2f437b756 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 28 Jun 2023 19:02:20 +0200 Subject: [PATCH 099/125] Rebuilt for Python 3.12 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 994f919..4244f4f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jun 28 2023 Python Maint - 2.17.0-2 +- Rebuilt for Python 3.12 + * Mon May 22 2023 Matěj Grabovský - 2.17.0-1 - Update to upstream release 2.17.0 - Bump rpm-devel dependency to 4.18 From e76a84e22db7e8b28b6791721202b84b022942bd Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 30 Jun 2023 13:29:27 +0200 Subject: [PATCH 100/125] Update to upstream release 2.17.1 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c236681..9883f4e 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ abrt-1.1.13.tar.gz /abrt-2.16.0.tar.gz /abrt-2.16.1.tar.gz /abrt-2.17.0.tar.gz +/abrt-2.17.1.tar.gz diff --git a/abrt.spec b/abrt.spec index 4244f4f..898033e 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,8 +49,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.17.0 -Release: 2%{?dist} +Version: 2.17.1 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Jun 30 2023 Michal Srb - 2.17.1-1 +- Update to upstream release 2.17.1 + * Wed Jun 28 2023 Python Maint - 2.17.0-2 - Rebuilt for Python 3.12 diff --git a/sources b/sources index ca6e2ec..04baaf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.17.0.tar.gz) = 6a2e66436ad097af3a270613ecdbe1b3f67820b7912c2607e3fea7f4b31166d99aa467757eb9504397163fa269af5ab6a88abbd2fa0cbad34f3e938ddddc49e7 +SHA512 (abrt-2.17.1.tar.gz) = 6f4a1eca2ee2fc87974b32984f3750a86469502e5a0a7f7063d9992e0e5e1dff60bc2e0001908bbb1bbc2956c10a9319342b7dd869437bdded82fc8a4ef09c20 From bbc9c5edc4de4a1f52333530c5e7c4f4b451a90a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 1 Jul 2023 11:44:59 +0200 Subject: [PATCH 101/125] Rebuilt for Python 3.12 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 898033e..b08708d 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sat Jul 01 2023 Python Maint - 2.17.1-2 +- Rebuilt for Python 3.12 + * Fri Jun 30 2023 Michal Srb - 2.17.1-1 - Update to upstream release 2.17.1 From 32054b4681227b8b419ac523e0cdd562ffdea89f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:49:45 +0000 Subject: [PATCH 102/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index b08708d..967587c 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jul 01 2023 Python Maint - 2.17.1-2 - Rebuilt for Python 3.12 From f1adb645779b4a5adca5c42220dec2d3458383de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:03:02 +0000 Subject: [PATCH 103/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 967587c..f772532 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.17.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.17.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7eebe59cc3fdda898007447a82d2faeb0f6a9f53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:34:46 +0000 Subject: [PATCH 104/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index f772532..819cbca 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.17.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.17.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7fea67f0edba61c9435260ef87eeffd249c1ba18 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Sun, 4 Feb 2024 23:45:24 +0100 Subject: [PATCH 105/125] Update to upstream release 2.17.2 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9883f4e..ffbcf8a 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ abrt-1.1.13.tar.gz /abrt-2.16.1.tar.gz /abrt-2.17.0.tar.gz /abrt-2.17.1.tar.gz +/abrt-2.17.2.tar.gz diff --git a/abrt.spec b/abrt.spec index 819cbca..9d0c3e8 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,8 +49,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.17.1 -Release: 5%{?dist} +Version: 2.17.2 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -966,6 +966,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sun Feb 04 2024 Michal Srb - 2.17.2-1 +- Update to upstream release 2.17.2 + * Mon Jan 22 2024 Fedora Release Engineering - 2.17.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 04baaf7..b30f820 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.17.1.tar.gz) = 6f4a1eca2ee2fc87974b32984f3750a86469502e5a0a7f7063d9992e0e5e1dff60bc2e0001908bbb1bbc2956c10a9319342b7dd869437bdded82fc8a4ef09c20 +SHA512 (abrt-2.17.2.tar.gz) = 47113739e400739c61a0eaf29377fb8c1f43c24f323ab984e6844dccf66de201606369cffdde502807767df5d5398a5e0d909d30e0d8349ef1c816969e3385af From 58c69f3384c825595a98da11d8351dac5d594df9 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 5 Feb 2024 22:35:28 +0100 Subject: [PATCH 106/125] Update spec file Signed-off-by: Michal Srb --- abrt.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 9d0c3e8..102f43a 100644 --- a/abrt.spec +++ b/abrt.spec @@ -44,7 +44,7 @@ %endif %define glib_ver 2.73.3 -%define libreport_ver 2.14.0 +%define libreport_ver 2.17.13 %define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool @@ -275,6 +275,7 @@ This package contains plugin for collecting kernel oopses from pstore storage. %package plugin-bodhi Summary: %{name}'s bodhi plugin Requires: %{name} = %{version}-%{release} +Requires: abrt-libs = %{version}-%{release} Obsoletes: libreport-plugin-bodhi <= 2.0.10 Provides: libreport-plugin-bodhi = %{version}-%{release} @@ -785,6 +786,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf %{_mandir}/man5/abrt-CCpp.conf.5* %{_libexecdir}/abrt-gdb-exploitable +%{_libexecdir}/abrt-action-coredump %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_journal_ccpp_format.conf %{_unitdir}/abrt-journal-core.service %{_journalcatalogdir}/abrt_ccpp.catalog From e8f18508dab09e7c91bc988e89e08a63ea6eb4da Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 12 Feb 2024 22:59:07 +0100 Subject: [PATCH 107/125] Update to upstream release 2.17.4 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ffbcf8a..61d905a 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ abrt-1.1.13.tar.gz /abrt-2.17.0.tar.gz /abrt-2.17.1.tar.gz /abrt-2.17.2.tar.gz +/abrt-2.17.4.tar.gz diff --git a/abrt.spec b/abrt.spec index 102f43a..3014e18 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.17.2 +Version: 2.17.4 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ @@ -968,6 +968,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Feb 12 2024 Michal Srb - 2.17.4-1 +- Update to upstream release 2.17.4 + * Sun Feb 04 2024 Michal Srb - 2.17.2-1 - Update to upstream release 2.17.2 diff --git a/sources b/sources index b30f820..36c4712 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.17.2.tar.gz) = 47113739e400739c61a0eaf29377fb8c1f43c24f323ab984e6844dccf66de201606369cffdde502807767df5d5398a5e0d909d30e0d8349ef1c816969e3385af +SHA512 (abrt-2.17.4.tar.gz) = a4b809d677ff658fd7b66875153b62fc17e6f08f7817a399615db0c867e8cf927f33f3159869be562a857c74b16168fe367b5bbc7d6b2a332f4c90470473270b From 202231f9cb648b867cc5b22dff77b91103e73979 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 19 Feb 2024 19:59:39 +0100 Subject: [PATCH 108/125] Update to 2.17.5 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 61d905a..e4adccf 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ abrt-1.1.13.tar.gz /abrt-2.17.1.tar.gz /abrt-2.17.2.tar.gz /abrt-2.17.4.tar.gz +/abrt-2.17.5.tar.gz diff --git a/abrt.spec b/abrt.spec index 3014e18..5295a25 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,7 +49,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.17.4 +Version: 2.17.5 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ @@ -968,6 +968,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Feb 19 2024 Michal Srb - 2.17.5-1 +- Update to upstream release 2.17.5 + * Mon Feb 12 2024 Michal Srb - 2.17.4-1 - Update to upstream release 2.17.4 diff --git a/sources b/sources index 36c4712..e9aaae8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.17.4.tar.gz) = a4b809d677ff658fd7b66875153b62fc17e6f08f7817a399615db0c867e8cf927f33f3159869be562a857c74b16168fe367b5bbc7d6b2a332f4c90470473270b +SHA512 (abrt-2.17.5.tar.gz) = f72be9eb3f16ba7bbdce69282438f48e6217d2c3ebfce2b30cc60d1893c9f8afe0b526862dbf6a06b973ad0560bc773f685ff2321a7b18490030b26801391a6b From af451300aa03247db3c75b77ee52f7cffac8db66 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 02:46:55 +0200 Subject: [PATCH 109/125] Rebuilt for Python 3.13 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 5295a25..c8f8c04 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -968,6 +968,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sun Jun 09 2024 Python Maint - 2.17.5-2 +- Rebuilt for Python 3.13 + * Mon Feb 19 2024 Michal Srb - 2.17.5-1 - Update to upstream release 2.17.5 From 66812b6c9237d7d854469e95777c0b953e0a94a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 18 Jun 2024 13:04:35 +0200 Subject: [PATCH 110/125] Drop call to marshalparser This is now done automatically by add-determinism: https://fedoraproject.org/wiki/Changes/ReproduciblePackageBuilds --- abrt.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/abrt.spec b/abrt.spec index c8f8c04..4216157 100644 --- a/abrt.spec +++ b/abrt.spec @@ -83,12 +83,6 @@ BuildRequires: python3-devel BuildRequires: python3-systemd BuildRequires: python3-argcomplete BuildRequires: python3-dbus - -%if 0%{?fedora} -# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility -%global py_reproducible_pyc_path %{buildroot}%{python3_sitelib} -BuildRequires: /usr/bin/marshalparser -%endif %endif Requires: libreport >= %{libreport_ver} From e5b49f4be8e16c88e9ab3921ca8e103abfd2fbe7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:31:08 +0000 Subject: [PATCH 111/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 4216157..5893951 100644 --- a/abrt.spec +++ b/abrt.spec @@ -50,7 +50,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -962,6 +962,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.17.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jun 09 2024 Python Maint - 2.17.5-2 - Rebuilt for Python 3.13 From d48adf45004144dbf0bc479b2453cf60fefbd0b1 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Sun, 1 Sep 2024 15:24:09 +0200 Subject: [PATCH 112/125] Update to upstream release 2.17.6 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e4adccf..83c640b 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ abrt-1.1.13.tar.gz /abrt-2.17.2.tar.gz /abrt-2.17.4.tar.gz /abrt-2.17.5.tar.gz +/abrt-2.17.6.tar.gz diff --git a/abrt.spec b/abrt.spec index 5893951..5fb5923 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,8 +49,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.17.5 -Release: 3%{?dist} +Version: 2.17.6 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -962,6 +962,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Sun Sep 01 2024 Michal Srb - 2.17.6-1 +- Update to upstream release 2.17.6 +- Fix reading signature information from RPM headers (rhbz#2307278) + * Wed Jul 17 2024 Fedora Release Engineering - 2.17.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e9aaae8..77e5b6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.17.5.tar.gz) = f72be9eb3f16ba7bbdce69282438f48e6217d2c3ebfce2b30cc60d1893c9f8afe0b526862dbf6a06b973ad0560bc773f685ff2321a7b18490030b26801391a6b +SHA512 (abrt-2.17.6.tar.gz) = 1e3729187c609f72e6d72c91815fc74e9ff8bed14dd678c093e4c47eafecb4e00fbe0b185e3a1ece614b994302c35de6a171449d5e80157a4fee16ccc7e60277 From 1bb862864421a082c25fb635753f3d82e9b0a50e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 11 Sep 2024 12:56:30 +0200 Subject: [PATCH 113/125] Drop container handler (rhbz#2295150) --- abrt.spec | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 5fb5923..6d83b4d 100644 --- a/abrt.spec +++ b/abrt.spec @@ -9,6 +9,13 @@ %bcond_with python3 %endif +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 +%bcond_with container_handler +%else +%bcond_without container_handler +%endif + + %if 0%{?rhel}%{?suse_version} %bcond_with bodhi %else @@ -50,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -289,6 +296,7 @@ Requires: python3-abrt This package contains python 3 hook and python analyzer plugin for handling uncaught exception in python 3 programs. +%if %{with container_handler} %package -n python3-abrt-container-addon Summary: %{name}'s container addon for catching Python 3 exceptions BuildArch: noarch @@ -300,6 +308,8 @@ This package contains python 3 hook and handling uncaught exception in python 3 programs in container. %endif +%endif + %package plugin-machine-id Summary: %{name}'s plugin to generate machine_id based off dmidecode Requires: %{name} = %{version}-%{release} @@ -512,6 +522,13 @@ ln -sf %{_datadir}/applications/org.freedesktop.problems.applet.desktop %{buildr %if %{with python3} ln -sf %{_bindir}/abrt %{buildroot}%{_bindir}/abrt-cli ln -sf %{_mandir}/man1/abrt.1 %{buildroot}%{_mandir}/man1/abrt-cli.1 + +%if ! %{with container_handler} +rm -vf %{buildroot}%{python3_sitelib}/abrt3_container.pth +rm -vf %{buildroot}%{python3_sitelib}/abrt_exception_handler3_container.py +rm -vf %{buildroot}%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* +%endif + %endif # After everything is installed, remove info dir @@ -892,12 +909,15 @@ killall abrt-dbus >/dev/null 2>&1 || : %{python3_sitelib}/abrt_exception_handler3.py %{python3_sitelib}/__pycache__/abrt_exception_handler3.* +%if %{with container_handler} %files -n python3-abrt-container-addon %{python3_sitelib}/abrt3_container.pth %{python3_sitelib}/abrt_exception_handler3_container.py %{python3_sitelib}/__pycache__/abrt_exception_handler3_container.* %endif +%endif + %files plugin-machine-id %config(noreplace) %{_sysconfdir}/libreport/events.d/machine-id_event.conf %{_libexecdir}/abrt-action-generate-machine-id @@ -962,6 +982,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Sep 11 2024 Neal Gompa - 2.17.6-2 +- Drop container handler (rhbz#2295150) + * Sun Sep 01 2024 Michal Srb - 2.17.6-1 - Update to upstream release 2.17.6 - Fix reading signature information from RPM headers (rhbz#2307278) From 67fc5aa7565f8695eda11f3ba88f8edb2d6483f9 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 20 Nov 2024 16:45:35 +0000 Subject: [PATCH 114/125] Disable Requires on kexec-tools for riscv64 kexec is supported for riscv64 on the kernel side, but the tooling side is not yet upstreamed. Status is unknown. See recent failed kexec-tools builds on riscv64 here: http://fedora.riscv.rocks/koji/packageinfo?packageID=17577 Signed-off-by: David Abdurachmanov Signed-off-by: Richard W.M. Jones --- abrt.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 6d83b4d..783d3c4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -249,7 +249,11 @@ log. Summary: %{name}'s vmcore addon Requires: %{name} = %{version}-%{release} Requires: abrt-addon-kerneloops +# On riscv64, kexec-tools does not compile: +# "configure: error: unsupported architecture riscv64" +%ifnarch riscv64 Requires: kexec-tools +%endif %if %{with python3} Requires: python3-abrt Requires: python3-augeas @@ -982,6 +986,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Nov 20 2024 David Abdurachmanov - 2.17.6-3 +- Disable Requires for kexec-tools on riscv64 (not supported) + * Wed Sep 11 2024 Neal Gompa - 2.17.6-2 - Drop container handler (rhbz#2295150) From c76a737f5a69b6e7debfae90bf14f4f1c34dff38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:29:17 +0000 Subject: [PATCH 115/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 783d3c4..3efaa98 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -986,6 +986,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.17.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Nov 20 2024 David Abdurachmanov - 2.17.6-3 - Disable Requires for kexec-tools on riscv64 (not supported) From 3063be65d9f436a61e6574e60725dba73de68a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 17:01:20 +0100 Subject: [PATCH 116/125] Add sysusers.d config file to allow rpm to create users/groups automatically --- abrt.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/abrt.spec b/abrt.spec index 3efaa98..d003e87 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -469,6 +469,13 @@ to the shell %global __scm_apply_git(qp:m:) %{__git} am --exclude doc/design --exclude doc/project/abrt.tex %autosetup -S git -p 0 +# Create a sysusers.d config file +#uidgid pair 173:173 reserved in setup rhbz#670231 +%global abrt_gid_uid 173 +cat >abrt.sysusers.conf </dev/null || groupadd -f -g %{abrt_gid_uid} --system abrt -getent passwd abrt >/dev/null || useradd --system -g abrt -u %{abrt_gid_uid} -d /etc/abrt -s /sbin/nologin abrt -exit 0 - %post # $1 == 1 if install; 2 if upgrade %systemd_post abrtd.service @@ -753,6 +755,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man5/abrt-action-save-package-data.conf.5* %{_mandir}/man5/gpg_keys.conf.5* %{_mandir}/man8/abrtd.8* +%{_sysusersdir}/abrt.conf %files libs %{_libdir}/libabrt.so.* @@ -986,6 +989,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 2.17.6-5 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Jan 16 2025 Fedora Release Engineering - 2.17.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b8a18969b7d2f0c86e3ad294fddb8cc067ddbea5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:33:02 +0200 Subject: [PATCH 117/125] Rebuilt for Python 3.14 --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index d003e87..cba345b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -989,6 +989,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Tue Jun 03 2025 Python Maint - 2.17.6-6 +- Rebuilt for Python 3.14 + * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 2.17.6-5 - Add sysusers.d config file to allow rpm to create users/groups automatically From ea69665c753d6816df1bd599a28171cf73e528be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:42:37 +0000 Subject: [PATCH 118/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index cba345b..93a20c5 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -989,6 +989,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.17.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 2.17.6-6 - Rebuilt for Python 3.14 From 3e192a597d9539c4f37f1deacbeb8c99091ce299 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 25 Jul 2025 14:27:51 -0700 Subject: [PATCH 119/125] Obsolete fros packages fros was recently retired: https://src.fedoraproject.org/rpms/fros/c/1d5c887 it was added to comps to support abrt-desktop: https://pagure.io/fedora-comps/c/e845f70 so it seems most appropriate to have abrt obsolete it, if we don't just use obsolete-packages. Signed-off-by: Adam Williamson --- abrt.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/abrt.spec b/abrt.spec index 93a20c5..0053e72 100644 --- a/abrt.spec +++ b/abrt.spec @@ -118,6 +118,11 @@ Requires: libreport-plugin-systemd-journal %endif # to fix upgrade path abrt-plugin-sosreport was removed in 2.14.5 version. Obsoletes: abrt-plugin-sosreport < 2.14.5 +# fros was retired 2025-07, and was initially added to comps to support +# abrt-desktop, so let's obsolete it here +Obsoletes: fros < 1.1-42 +Obsoletes: fros-gnome < 1.1-42 +Obsoletes: fros-recordmydesktop < 1.1-42 #gui BuildRequires: libreport-gtk-devel >= %{libreport_ver} From 026c727cd2ab021685606ff451d69c3e8a928653 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 1 Aug 2025 10:49:36 -0700 Subject: [PATCH 120/125] Bump release --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 0053e72..94b5143 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -994,6 +994,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Aug 01 2025 Adam Williamson - 2.17.6-8 +- Obsolete fros packages + * Wed Jul 23 2025 Fedora Release Engineering - 2.17.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 54bdc1243fac6524a8b3703146a93e60b09831f0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:37:49 +0200 Subject: [PATCH 121/125] Rebuilt for Python 3.14.0rc2 bytecode --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 94b5143..ed6ab01 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -994,6 +994,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Aug 15 2025 Python Maint - 2.17.6-9 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Aug 01 2025 Adam Williamson - 2.17.6-8 - Obsolete fros packages From ba57e0bbb5605d5ac0259e624c495e8513c1a7ed Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:06:17 +0200 Subject: [PATCH 122/125] Rebuilt for Python 3.14.0rc3 bytecode --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index ed6ab01..a5b19ef 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.6 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -994,6 +994,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Sep 19 2025 Python Maint - 2.17.6-10 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 2.17.6-9 - Rebuilt for Python 3.14.0rc2 bytecode From b36cf8c4991ed7eace2563fd98c3f0d92434227f Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 2 Oct 2025 10:36:26 +0200 Subject: [PATCH 123/125] Update to 2.17.7 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 83c640b..cc954d8 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ abrt-1.1.13.tar.gz /abrt-2.17.4.tar.gz /abrt-2.17.5.tar.gz /abrt-2.17.6.tar.gz +/abrt-2.17.7.tar.gz diff --git a/abrt.spec b/abrt.spec index a5b19ef..d6cfac9 100644 --- a/abrt.spec +++ b/abrt.spec @@ -56,8 +56,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.17.6 -Release: 10%{?dist} +Version: 2.17.7 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -66,7 +66,7 @@ BuildRequires: %{dbus_devel} BuildRequires: hostname BuildRequires: gtk3-devel BuildRequires: glib2-devel >= %{glib_ver} -BuildRequires: rpm-devel >= 4.18 +BuildRequires: rpm-devel >= 6.0.0 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel #why? BuildRequires: file-devel @@ -994,6 +994,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Oct 02 2025 Michal Srb - 2.17.7-1 +- Update to upstream release 2.17.7 +- Fix reading gpg keys with RPM 6.0.0 (rhbz#2396899) + * Fri Sep 19 2025 Python Maint - 2.17.6-10 - Rebuilt for Python 3.14.0rc3 bytecode diff --git a/sources b/sources index 77e5b6a..080308e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.17.6.tar.gz) = 1e3729187c609f72e6d72c91815fc74e9ff8bed14dd678c093e4c47eafecb4e00fbe0b185e3a1ece614b994302c35de6a171449d5e80157a4fee16ccc7e60277 +SHA512 (abrt-2.17.7.tar.gz) = 0e9c05a897387e20b930b616c58b187dd27f6e3372a9067b77f849d70e59443688022c5ae9fcad5968d8e637c4db7f6b500ddbb5aa59e61872b14867c5c7124a From fb86abde3bc96a04de006b456a59009817cca515 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 4 Dec 2025 20:32:21 +0100 Subject: [PATCH 124/125] a-a-save-container-data: validate input Resolves: CVE-2025-12744 Signed-off-by: Michal Srb --- .gitignore | 1 + abrt.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cc954d8..643f820 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ abrt-1.1.13.tar.gz /abrt-2.17.5.tar.gz /abrt-2.17.6.tar.gz /abrt-2.17.7.tar.gz +/abrt-2.17.8.tar.gz diff --git a/abrt.spec b/abrt.spec index d6cfac9..94695b0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -56,7 +56,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.17.7 +Version: 2.17.8 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ @@ -994,6 +994,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Dec 04 2025 Michal Srb - 2.17.8-1 +- a-a-save-container-data: validate input +- Resolves: CVE-2025-12744 + * Thu Oct 02 2025 Michal Srb - 2.17.7-1 - Update to upstream release 2.17.7 - Fix reading gpg keys with RPM 6.0.0 (rhbz#2396899) diff --git a/sources b/sources index 080308e..4e58c99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.17.7.tar.gz) = 0e9c05a897387e20b930b616c58b187dd27f6e3372a9067b77f849d70e59443688022c5ae9fcad5968d8e637c4db7f6b500ddbb5aa59e61872b14867c5c7124a +SHA512 (abrt-2.17.8.tar.gz) = 90b74229412e0186bfa109ee940a60c9f3c0f7ce8c1216acad6f05619a1bb591e7f0bae87363143a05034312c9f14fe5ace341b84f680780ceb93a1e624705b3 From 0baf939494e4c94b47b2d746756ce280ff8b85db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:23:57 +0000 Subject: [PATCH 125/125] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- abrt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abrt.spec b/abrt.spec index 94695b0..3bdd3fe 100644 --- a/abrt.spec +++ b/abrt.spec @@ -57,7 +57,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.17.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -994,6 +994,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.17.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Dec 04 2025 Michal Srb - 2.17.8-1 - a-a-save-container-data: validate input - Resolves: CVE-2025-12744