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/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-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/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-2.13.0.tar.gz b/abrt-2.13.0.tar.gz deleted file mode 100644 index ef0cf84..0000000 Binary files a/abrt-2.13.0.tar.gz and /dev/null differ diff --git a/abrt-2.14.2.tar.gz b/abrt-2.14.2.tar.gz new file mode 100644 index 0000000..e8b21c9 Binary files /dev/null and b/abrt-2.14.2.tar.gz differ diff --git a/abrt.spec b/abrt.spec index faa7464..4914633 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,21 +1,25 @@ Name: abrt -Version: 2.13.0 -Release: 7 +Version: 2.14.2 +Release: 1 Summary: A tool for automatic bug detection and reporting 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 + +Patch0001: 0001-applet-Pass-instance-pointer-to-signal-handler.patch +Patch0002: 0002-applet-Chain-up-in-dispose.patch +Patch0003: 0003-applet-application-Fix-crash-when-processing-deferre.patch BuildRequires: git-core dbus-devel hostname gtk3-devel glib2-devel >= 2.43.4 rpm-devel >= 4.6 BuildRequires: desktop-file-utils libnotify-devel gettext libxml2-devel intltool libtool -BuildRequires: libsoup-devel asciidoc doxygen xmlto libreport-devel >= 2.10.0 +BuildRequires: libsoup-devel asciidoc doxygen xmlto libreport-devel >= 2.13.0 python3-pytest BuildRequires: satyr-devel >= 0.24 augeas libselinux-devel python3-devel python3-systemd BuildRequires: python3-nose python3-sphinx python3-libreport python3-devel python3-argcomplete -BuildRequires: libreport-gtk-devel >= 2.10.0 gsettings-desktop-schemas-devel >= 3.15 +BuildRequires: libreport-gtk-devel >= 2.13.0 gsettings-desktop-schemas-devel >= 3.15 BuildRequires: gdb-headless libcap-devel systemd-devel json-c-devel gdb-headless polkit-devel -Requires: libreport >= 2.10.0 satyr >= 0.24 + +Requires: libreport >= 2.13.0 satyr >= 0.24 Requires: systemd python3-%{name} = %{version}-%{release} python3-augeas python3-dbus Requires: dmidecode Requires: %{name}-libs = %{version}-%{release} @@ -453,7 +457,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %dir %{_localstatedir}/lib/abrt %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di %{_libexecdir}/abrt-gdb-exploitable +%{_journalcatalogdir}/abrt_ccpp.catalog %{_unitdir}/abrt-journal-core.service + %attr(6755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache %{_bindir}/abrt-action-analyze-c @@ -574,6 +580,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man*/* %changelog +* Fri Aug 07 2020 zhangjiapeng - 2.14.2-1 +- update to 2.14.2 to slove compilation failure + * Thu Jul 23 2020 wutao - 2.13.0-7 - fix build error because of automake updating