From 98605f2fec75b76461f2a43628c58416536f29d7 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Fri, 20 Mar 2020 19:15:11 +0100 Subject: [PATCH 01/16] Add patch for #1815544 --- ...i-wizard-gtk-Wrap-event-log-messages.patch | 32 ++ libreport.spec | 310 +----------------- 2 files changed, 40 insertions(+), 302 deletions(-) create mode 100644 0001-gui-wizard-gtk-Wrap-event-log-messages.patch diff --git a/0001-gui-wizard-gtk-Wrap-event-log-messages.patch b/0001-gui-wizard-gtk-Wrap-event-log-messages.patch new file mode 100644 index 0000000..eda89e9 --- /dev/null +++ b/0001-gui-wizard-gtk-Wrap-event-log-messages.patch @@ -0,0 +1,32 @@ +From 1f14c9fa96937e589354589665eb8c64d6d16d80 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Fri, 20 Mar 2020 18:04:19 +0100 +Subject: [PATCH] gui-wizard-gtk: Wrap event log messages + +Currently, large logs received by abrt-retrace-client may cause +X/Wayland protocol errors due to an overly large buffer being allocated +for GtkTextView. Enabling word wrapping and eliminating horizontal +scrolling seems to prevent that from happening. + +Cf. https://gitlab.gnome.org/GNOME/gtk/issues/1143 + +https://bugzilla.redhat.com/show_bug.cgi?id=1815544 +--- + src/gui-wizard-gtk/wizard.glade | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade +index e86fc90b..f7782ba2 100644 +--- a/src/gui-wizard-gtk/wizard.glade ++++ b/src/gui-wizard-gtk/wizard.glade +@@ -705,6 +705,7 @@ + True + True + False ++ word + + + +-- +2.25.1 + diff --git a/libreport.spec b/libreport.spec index 2e750cc..c630e35 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,10 +15,12 @@ Summary: Generic library for reporting various problems Name: libreport 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 +Patch0001: 0001-gui-wizard-gtk-Wrap-event-log-messages.patch + BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel BuildRequires: curl-devel @@ -37,6 +39,7 @@ BuildRequires: libproxy-devel BuildRequires: satyr-devel >= 0.24 BuildRequires: glib2-devel >= %{glib_ver} BuildRequires: nettle-devel +BuildRequires: git-core %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 # A test case uses zh_CN locale to verify XML event translations @@ -310,7 +313,7 @@ data over ftp/scp... %endif %prep -%setup -q +%autosetup -S git %build autoconf @@ -745,6 +748,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Mar 20 2020 Ernestas Kulik - 2.12.0-3 +- Add patch for https://bugzilla.redhat.com/show_bug.cgi?id=1815544 + * Fri Feb 07 2020 Ernestas Kulik - 2.12.0-2 - Bump release for side tag rebuild @@ -852,303 +858,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update to 2.10.0 - Bump GLib dependency - Add patch to work around issue with test - -* Fri Feb 01 2019 Fedora Release Engineering - 2.9.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 07 2019 Martin Kutlak 2.9.7-2 -- rhbz: Replace nomail flag with minor_update - -* Fri Dec 07 2018 Matej Marusak 2.9.7-1 -- reportclient: Search for required packages recursively -- event_config: Modify unusable backtrace message -- reportclient: Find and download required debuginfo packages -- lib: Explicitly do not use DST -- autogen: List make in sysdeps command -- lib: Seek beginning of mountinfo file -- report-client: Find debuginfos in own method -- lib: Add a null guard -- gui-wizard-gtk: Require GTK+ 3.10 -- gui-wizard-gtk: Don’t set GtkButton:xalign -- gui-wizard-gtk: Replace use of GtkTable -- gui-wizard-gtk: Show warnings inline on progress page -- gui-wizard-gtk: Remove unused size group -- gui-wizard-gtk: Replace Gtk{H,V}Box with GtkBox -- gui-wizard-gtk: Remove unneeded windows -- gtk-helpers: config_dialog: Hide tree view header -- augeas: Use generic augeas modules - -* Mon Oct 8 2018 Martin Kutlak 2.9.6-1 -- Fix majority of bugs found by Coverity Scan. -- Remove option to screencast problems -- tests: Adjust format of truncated backtrace for python and core -- gui: Replace deprecated g_type_class_add_private -- potfiles: fix issue in POTFILES.in -- lib: fix a SEGV in list_possible_events() -- ureport: use python3 to get consumerCertDir -- r-mailx: Add comment explaining expected values in config -- reporter-mailx: Remove double quotes from config -- spec: Make libreport-filesystem subpackage noarch -- spec: drop dependency on python-rhsm - -* Fri Jul 13 2018 Fedora Release Engineering - 2.9.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 18 2018 Matej Habrnal 2.9.5-3 -- Make this build without /usr/bin/python -- Resolves #1592073 - -* Sat Jun 16 2018 Miro Hrončok - 2.9.5-2 -- Rebuilt for Python 3.7 - -* Tue Apr 24 2018 Matej Habrnal 2.9.5-1 -- spec: actualize according to downstream -- spec: Conditionalize the Python2 and Python3 -- report-python: fix tests if configure --without-python2 -- autogen: correctly parse buildrequires from spec file - -* Tue Mar 27 2018 Martin Kutlak 2.9.4-1 -- Translation updates -- Revert "use /usr/sbin/" -- ureport: remove json-c is_error() usage -- ldconfig and gtk-update-icon-cache is not needed in rawhide -- reporter-rhtsupport: Remove dependency on redhat-access-insights -- do not expand macro in changelog -- move defattr which match the defaults -- use /usr/sbin/ -- macro python_sitearch is always defined on rhel7+ -- remove rhel6 specific items and accomodate to rhel7+ -- This package uses names with ambiguous `python-` prefix in requirements. -- reporter-{bugzilla,mantisbt,rhtsupport}: fix free -- reporter-mailx: rely on configured email -- spec: fix unowned directories -- augeas: include local config path -- doc: update to contain newly added user's local config -- reporter-mantisbt: read configuration from user's home -- reporter-rhtsupport: read configuration from user's home -- reporter-bugzilla: read configuration from user's home -- reporter-bugzilla: ask concrete bz when requiring login -- makefile: fix make release - -* Thu Nov 02 2017 Julius Milan 2.9.3-1 -- Translation updates -- commit to delete -- workflows: fix description in workflow_RHELJavaScript.xml.in -- workflows: add workflow for adding data to existing case -- client-python,report-python: Allow python to be optional at build time -- ignored words: add SYSTEMD_NSS_BYPASS_BUS -- reporter-ureport: add 'ProcessUnpackaged' option -- spec: add workflow for adding data to existing case -- rep-sys-journal: fix in finding executable basename -- remove old obsolete -- Group is not used any more -- remove old changelogs -- requires pythonX-dnf instead of dnf -- doc: fix obsolete doxygen tags & complains -- lib: Introduce pid_for_children element from ns -- client-python: Do not try to unlink None -- spec: rename Python binary packages - -* Thu Mar 16 2017 Matej Habrnal 2.9.1-1 -- build: create tarball in release-* target -- problem_data: fix double const -- wizard: fix error found by -Werror=format-security -- run_event: fix cmp between pointer and zero character -- build: do not upload tarball to fedorahosted.org -- spec: do not use fedorahosted.org as source -- build: fix generating list of dependences in autogen.sh -- build: generate new release entries with date -- report-newt: free allocated variables, don't close dd twice -- build: fix scratch-build target -- changelog: reflect the PR -- lib: several bug fixes in parsing of mountinfo -- lib: correctly recognize chroot in container -- lib: declare CONTAINER_ROOTS element name -- lib: add more log wrappers for perror -- reporter-bugzilla: use /etc/os-release for default url -- configure.ac: Remove nss dependency -- spec: include testsuite headers in the devel package -- tests: include testsuite.h in the dist archive -- maint: check pulled .po files for errors -- build: fix bug in changelog generating in release target -- changelog: fix typos - -* Fri Dec 02 2016 Jakub Filak 2.9.0-1 -- Translation updates -- build: make the release-* targets smarter -- add CHANGELOG.md -- reporter-s-journal: enable SYSLOG_IDENTIFIER from env -- report-python: add method run_event_on_problem_dir -- lib: use lz4 instead of lz4cat -- reportclient: honor ABRT_VERBOSE -- tree-wide: introduce 'stop_on_not_reportable' option -- client: add support for $releasever to debuginfo -- lib: correct test for own root -- workflows: run analyze_BodhiUpdates event on Fedora -- man: fix formating -- reporter-systemd-journal: introduce reporter-systemd-journal -- problem_data: add function which returns all problem data keys -- include: add exception_type element constant -- spec: changes related to reporter-systemd-journal -- problem_report: add normalization of crashed thread -- problem_report: make generate report configurable -- problem_report: use core_backtrace if there is no backtrace -- lib: refuse to parse negative number as unsigned int -- spec: simplify and remove old conditional -- build: add gettext-devel to sysdeps -- dd: add check for validity of new file FD -- build: configure tree for debugging by default -- spec: use %%buildroot macro -- spec: remove defattr which match the defaults -- spec: do not clean buildroot -- spec: remove Groups -- spec: code cleanup -- lib: fix a bug in dealing with errno -- lib: add convenient wrappers for uint in map_string_t -- problem_report: ensure C-string null terminator -- lib: fix invalid cgroup namespace ID -- lib: make die function configurable -- lib: allow using FD of /proc/[pid] instead of pid_t -- dd: add functions for opening dd item -- lib: add xfdopen -- problem data: search for sensitive words in more files -- dd: add dd_copy_file_at -- ignored words: add "systemd-logind" and "hawkey" -- build: reset the default version with each release -- doc: make README more verbose -- tree-wide: produce less messages in NOTICE log lvl -- ureport: less confusing logging -- spec: install JavaScript workflows -- workflow: add JavaScript workflows -- bugzilla: stop including package details - -* Fri Sep 09 2016 Jakub Filak 2.8.0-1 -- lib: fix a memory leak in create_dump_dir fn -- rhtsupport: fix a double free of config at exit -- autogen: fix typo in usage help string -- debuginfo: dnf API logging workarounds list -- lib: don't warn when user word file doesn't exist -- testuite: add test for forbidden_words -- lib: be able to define base conf dir at runtime -- wizard: use dnf instead of yum in add a screencast note -- problem_report: document resevered elements - -* Mon Jul 18 2016 Matej Habrnal 2.7.2-1 -- Translation updates -- wizard: do not create reproducible if complex_detail == no -- include: save_user_settings function declaration isn’t a prototype -- Bugzilla: fix typo in comment don -> don't -- client-python: fix a typo in error check -- dd: do not log missing uid file when creating new dump dir -- build: update searched pkg names for systemd - -* Wed May 18 2016 Matej Habrnal 2.7.1-1 -- spec: compression updates -- lib: add lz4 decompression -- lib: avoid the need to link against lzma -- all: format security -- lib: add cgroup namespace -- dd: introduce functions getting occurrence stamps -- dd: introduce dd_get_env_variable -- lib: add get env variable from a file -- RHTSupport: include count in Support cases -- lib: problem report API check fseek return code -- ignored words: remove 'kwallet_jwakely' which I added wrongly - -* Fri Apr 08 2016 Matej Habrnal 2.7.0-1 -- ignored words: update ignored words -- mailx: introduce debug parameter -D -- mailx: mail formatting: add comment right after %%oneline -- mailx: use problem report api to define an emais' content -- lib: remove unused function make_description_bz -- augeas: trim spaces before key value -- Revert "xml parser: be more verbose in case xml file cannot be opened" -- xml parser: be more verbose in case xml file cannot be opened -- spec: add workflows.d to filesystem package -- makefile: define LANG in release target -- mailx: stop creating dead.letter on mailx failures -- workflows: add comments to ambiguous functions -- workflows: NULL for the default configuration dir -- workflows: publish the function loading configuration -- build: fix build on Fedora24 -- augeas: exclude mantisbt format configurations -- reporter-mantisbt: add missing '=' to conf file -- curl: fix typo Ingoring -> Ignoring -- rhtsupport: attach all dump dir's element to a new case -- rhtsupport: add pkg_vendor, reproducer and reproducible to description -- report client: add silent mode to clean_up() -- doc: add documentation for requires-details attribute -- rhtsupport: Discourage users from reporting in non Red Hat stuff -- rhtsupport: Discourage users from opening one-shot crashes -- report-gtk: Require Reproducer for RHTSupport -- Add workflow for RHEL anonymous report -- spec: add workflow for RHEL anonymous report files -- wizard: fix the broken widget expansion -- dd: add documentation of dd_create_skeleton -- workflow: add extern C to the header file -- Fix minor typos -- Translation updates -- translations: update zanata configuration -- wizard: fix the broken "Show log" widget -- wizard: remove the code correcting Bugzilla groups - -* Tue Feb 02 2016 Matej Habrnal 2.6.4-1 -- doc: add option -o and -O into reporter-ureport man page -- rhtsupport: use problme report API to create description -- bugzilla: make the event configurable -- report-gtk: offer users to create private ticket -- bugzilla|centos: declare 'restricted access' support -- event config: add support for 'restricted access' -- lib: move CREATE_PRIVATE_TICKET to the global configuration -- dd: dd_delete_item does not die -- dd: add function getting stat of item -- dd: correct handling of TYPE when creating dump directory -- dd: add function computing dump dir file system size -- dd: add function counting number of dd items -- dd: add function copying file descriptor to element -- dd: allow 1 and 2 letter long element names -- problem_data: factor out function reading single problem element -- formatdup: more universal comment -- dd: make function uid_in_group() public -- Refactoring conditional directives that break parts of statements. -- bugzilla: actualize man pages -- bugzilla: don't report private problem as comment -- uploader: move username and password to the advanced options -- uploader: allow empty username and password -- spec: add uploader config files and related man page -- uploader: add possibility to set SSH keyfiles -- curl: add possibility to configure SSH keys -- desktop-utils: deal with Destkop files without command line -- ureport: enable attaching of arbitrary values -- update .gitignore -- uploader: save remote name in reported_to -- curl: return URLs without userinfo -- lib: add function for removing userinfo from URIs -- plugins: port reporters to add_reported_to_entry -- reported_to: add a function formatting reported_to lines -- lib: introduce parser of ISO date strings -- uploader: use shared dd_create_archive function -- dd: add a function for compressing dumpdirs -- problem_report: add examples to the documentation -- client: document environment variables - -* Thu Oct 15 2015 Matej Habrnal 2.6.3-1 -- wizard: correct comments in save_text_if_changed() -- events: improve example -- reporter-bugzilla: add parameter -p -- wizard: fix save users changes after reviewing dump dir files -- dd: make function load_text_file non-static -- bugzilla: don't attach build_ids -- run_event: rewrite event rule parser -- dd: add convenience wrappers fro loading numbers -- ureport: improve curl's error messages -- ureport: use Red Hat Certificate Authority to make rhsm cert trusted -- curl: add posibility to use own Certificate Authority cert -- spec: add redhat-access-insights to Requires of l-p-rhtsupport -- bugzilla: put VARIANT_ID= to Whiteboard -- autogen: use dnf instead of yum to install dependencies -- configure: use hex value for dump dir mode -- curl: add a helper for HTTP GET -- dd: don't warn about missing 'type' if the locking fails -- dd: stop warning about corrupted mandatory files -- Use a dgettext function returning strings instead of bytes From 7a6f8af0455771551dc901a197d15c67288cb3c7 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Fri, 24 Apr 2020 15:01:09 +0200 Subject: [PATCH 02/16] New upstream release 2.13.0 Signed-off-by: Michal Fabik --- .gitignore | 1 + ...i-wizard-gtk-Wrap-event-log-messages.patch | 32 ------------------- libreport.spec | 9 ++---- sources | 2 +- 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 0001-gui-wizard-gtk-Wrap-event-log-messages.patch diff --git a/.gitignore b/.gitignore index 634b63b..7b7863d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /libreport-2.11.2.tar.gz /libreport-2.11.3.tar.gz /libreport-2.12.0.tar.gz +/libreport-2.13.0.tar.gz diff --git a/0001-gui-wizard-gtk-Wrap-event-log-messages.patch b/0001-gui-wizard-gtk-Wrap-event-log-messages.patch deleted file mode 100644 index eda89e9..0000000 --- a/0001-gui-wizard-gtk-Wrap-event-log-messages.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1f14c9fa96937e589354589665eb8c64d6d16d80 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Fri, 20 Mar 2020 18:04:19 +0100 -Subject: [PATCH] gui-wizard-gtk: Wrap event log messages - -Currently, large logs received by abrt-retrace-client may cause -X/Wayland protocol errors due to an overly large buffer being allocated -for GtkTextView. Enabling word wrapping and eliminating horizontal -scrolling seems to prevent that from happening. - -Cf. https://gitlab.gnome.org/GNOME/gtk/issues/1143 - -https://bugzilla.redhat.com/show_bug.cgi?id=1815544 ---- - src/gui-wizard-gtk/wizard.glade | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade -index e86fc90b..f7782ba2 100644 ---- a/src/gui-wizard-gtk/wizard.glade -+++ b/src/gui-wizard-gtk/wizard.glade -@@ -705,6 +705,7 @@ - True - True - False -+ word - - - --- -2.25.1 - diff --git a/libreport.spec b/libreport.spec index c630e35..4b828e3 100644 --- a/libreport.spec +++ b/libreport.spec @@ -14,13 +14,11 @@ Summary: Generic library for reporting various problems Name: libreport -Version: 2.12.0 -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 -Patch0001: 0001-gui-wizard-gtk-Wrap-event-log-messages.patch - BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel BuildRequires: curl-devel @@ -449,7 +447,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/%{name}/ignored_words.conf %{_datadir}/%{name}/conf.d/libreport.conf %{_libdir}/libreport.so.* -%{_libdir}/libabrt_dbus.so.* %{_mandir}/man5/libreport.conf.5* %{_mandir}/man5/report_event.conf.5* %{_mandir}/man5/forbidden_words.conf.5* @@ -491,12 +488,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/libreport/reporters.h %{_includedir}/libreport/global_configuration.h # Private api headers: -%{_includedir}/libreport/internal_abrt_dbus.h %{_includedir}/libreport/internal_libreport.h %{_includedir}/libreport/xml_parser.h %{_includedir}/libreport/helpers %{_libdir}/libreport.so -%{_libdir}/libabrt_dbus.so %{_libdir}/pkgconfig/libreport.pc %dir %{_includedir}/libreport diff --git a/sources b/sources index 7a7c9a0..abe8c88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libreport-2.12.0.tar.gz) = e79163db3807c695aba636474441502c5d4f8c38bb6582d133179c324bc66451b89c2d9c7b60d5686bd85db64e6d6193815b07f0a364c23d98f8d1594a5e658f +SHA512 (libreport-2.13.0.tar.gz) = 9be3016770304ed3679bc4a7321425628cc5fc1d2927e1a36cbf9d0a743562f1b47c88e511537221276e0d1e04feaeb38de642a862dd8ca63ce7749db73a6f49 From ba9a0a2a0aef312370ffd0ea4bf4d265ee6895f5 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Fri, 24 Apr 2020 16:41:24 +0200 Subject: [PATCH 03/16] Update changelog, bump release to 2.13.0-2 Signed-off-by: Michal Fabik --- libreport.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libreport.spec b/libreport.spec index 4b828e3..65414e6 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,7 +15,7 @@ Summary: Generic library for reporting various problems Name: libreport 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 @@ -743,6 +743,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Apr 24 2020 Michal Fabik 2.13.0-2 +- Support new "time" and "time_for_children" kernel namespaces +- Remove preprocessor namespacing in favor of function name prefixes +- client-python: Accomodate for multiple debug directories +- gui-wizard-gtk: Wrap event log messages +- lib: Drop D-Bus code +- plugins: reporter-rhtsupport: Drop unused debugging code +- Update translations + * Fri Mar 20 2020 Ernestas Kulik - 2.12.0-3 - Add patch for https://bugzilla.redhat.com/show_bug.cgi?id=1815544 From 82bd383f82f7dd105a74d620fa8c62f70438aa5f Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Mon, 11 May 2020 23:03:32 +0200 Subject: [PATCH 04/16] New upstream release 2.13.1 Signed-off-by: Michal Fabik --- libreport.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libreport.spec b/libreport.spec index 65414e6..e1e5350 100644 --- a/libreport.spec +++ b/libreport.spec @@ -14,8 +14,8 @@ Summary: Generic library for reporting various problems Name: libreport -Version: 2.13.0 -Release: 2%{?dist} +Version: 2.13.1 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -37,7 +37,6 @@ BuildRequires: libproxy-devel BuildRequires: satyr-devel >= 0.24 BuildRequires: glib2-devel >= %{glib_ver} BuildRequires: nettle-devel -BuildRequires: git-core %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 # A test case uses zh_CN locale to verify XML event translations @@ -124,7 +123,7 @@ Requires: %{name} = %{version}-%{release} This package contains simple command line tool for working with problem dump reports -%package newt +gpackage newt Summary: %{name}'s newt interface Requires: %{name} = %{version}-%{release} Provides: report-newt = 0:0.23-1 @@ -316,7 +315,7 @@ data over ftp/scp... %build autoconf -CFLAGS="%{optflags} -Werror" %configure \ +%configure \ %if %{without bugzilla} --without-bugzilla \ %endif @@ -326,10 +325,10 @@ CFLAGS="%{optflags} -Werror" %configure \ --enable-doxygen-docs \ --disable-silent-rules -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} \ +%make_install \ %if %{with python3} PYTHON=%{__python3} \ %endif # with python3 @@ -743,6 +742,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon May 11 2020 Michal Fabik 2.13.1-1 +- Fix broken abrt-vmcore.service due to bad namespacing + * Fri Apr 24 2020 Michal Fabik 2.13.0-2 - Support new "time" and "time_for_children" kernel namespaces - Remove preprocessor namespacing in favor of function name prefixes From ca2a8efbeacdc97adeaedf82e1d075884f1607ba Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Mon, 11 May 2020 23:18:51 +0200 Subject: [PATCH 05/16] Bump release to rebuild Signed-off-by: Michal Fabik --- libreport.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libreport.spec b/libreport.spec index e1e5350..4481f39 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,7 +15,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.13.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 @@ -123,7 +123,7 @@ Requires: %{name} = %{version}-%{release} This package contains simple command line tool for working with problem dump reports -gpackage newt +%package newt Summary: %{name}'s newt interface Requires: %{name} = %{version}-%{release} Provides: report-newt = 0:0.23-1 @@ -742,6 +742,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon May 11 2020 Michal Fabik 2.13.1-2 +- Fix broken abrt-vmcore.service due to bad namespacing + * Mon May 11 2020 Michal Fabik 2.13.1-1 - Fix broken abrt-vmcore.service due to bad namespacing From 7427e3e0e7a8409f24cba15061002564048a1b59 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Mon, 11 May 2020 23:32:09 +0200 Subject: [PATCH 06/16] Bump release to rebuild Signed-off-by: Michal Fabik --- .gitignore | 1 + libreport.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b7863d..ebda8c9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libreport-2.11.3.tar.gz /libreport-2.12.0.tar.gz /libreport-2.13.0.tar.gz +/libreport-2.13.1.tar.gz diff --git a/libreport.spec b/libreport.spec index 4481f39..23ece64 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,7 +15,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.13.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 diff --git a/sources b/sources index abe8c88..36fbd1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libreport-2.13.0.tar.gz) = 9be3016770304ed3679bc4a7321425628cc5fc1d2927e1a36cbf9d0a743562f1b47c88e511537221276e0d1e04feaeb38de642a862dd8ca63ce7749db73a6f49 +SHA512 (libreport-2.13.1.tar.gz) = fc3db46ee6885053387b86e682f9ed1908d050149a5d820b40444b7db413af89afdcd6abef780179c5ca968ea036f3ae245884414b94d426547e58a89b8bbb65 From 150f15e45a0fc78b5c5288fe77089e44045dbf89 Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Mon, 11 May 2020 23:41:52 +0200 Subject: [PATCH 07/16] Bump release to rebuild Signed-off-by: Michal Fabik --- libreport.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreport.spec b/libreport.spec index 23ece64..adb9dba 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,7 +15,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.13.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 @@ -37,6 +37,7 @@ BuildRequires: libproxy-devel BuildRequires: satyr-devel >= 0.24 BuildRequires: glib2-devel >= %{glib_ver} BuildRequires: nettle-devel +BuildRequires: git-core %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 # A test case uses zh_CN locale to verify XML event translations From 4e41e0f5222d060e8439dbac5a0a02f62fc4b67a Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Thu, 13 Aug 2020 19:57:03 +0200 Subject: [PATCH 08/16] New upstream release 2.14.0 Signed-off-by: Michal Fabik --- .gitignore | 1 + libreport.spec | 149 ++++++++++++++----------------------------------- sources | 2 +- 3 files changed, 44 insertions(+), 108 deletions(-) diff --git a/.gitignore b/.gitignore index ebda8c9..23c2ea8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /libreport-2.12.0.tar.gz /libreport-2.13.0.tar.gz /libreport-2.13.1.tar.gz +/libreport-2.14.0.tar.gz diff --git a/libreport.spec b/libreport.spec index adb9dba..653faa6 100644 --- a/libreport.spec +++ b/libreport.spec @@ -14,29 +14,29 @@ Summary: Generic library for reporting various problems Name: libreport -Version: 2.13.1 -Release: 4%{?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 BuildRequires: %{dbus_devel} -BuildRequires: gtk3-devel -BuildRequires: curl-devel +BuildRequires: gtk3-devel%{?_isa} +BuildRequires: curl-devel%{?_isa} BuildRequires: desktop-file-utils BuildRequires: python3-devel BuildRequires: gettext -BuildRequires: libxml2-devel -BuildRequires: libtar-devel +BuildRequires: libxml2-devel%{?_isa} +BuildRequires: libtar-devel%{?_isa} BuildRequires: intltool BuildRequires: libtool BuildRequires: texinfo BuildRequires: asciidoc BuildRequires: xmlto -BuildRequires: newt-devel -BuildRequires: libproxy-devel -BuildRequires: satyr-devel >= 0.24 -BuildRequires: glib2-devel >= %{glib_ver} -BuildRequires: nettle-devel +BuildRequires: newt-devel%{?_isa} +BuildRequires: libproxy-devel%{?_isa} +BuildRequires: satyr-devel%{?_isa} >= 0.24 +BuildRequires: glib2-devel%{?_isa} >= %{glib_ver} +BuildRequires: nettle-devel%{?_isa} BuildRequires: git-core %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 @@ -48,23 +48,25 @@ BuildRequires: glibc-all-langpacks BuildRequires: xmlrpc-c-devel %endif BuildRequires: doxygen -BuildRequires: systemd-devel +BuildRequires: systemd-devel%{?_isa} BuildRequires: augeas-devel BuildRequires: augeas -BuildRequires: xz -BuildRequires: lz4 +BuildRequires: libarchive-devel%{?_isa} Requires: libreport-filesystem = %{version}-%{release} -Requires: satyr >= 0.24 -Requires: glib2 >= %{glib_ver} -Requires: xz -Requires: lz4 -Requires: nettle +Requires: satyr%{?_isa} >= 0.24 +Requires: glib2%{?_isa} >= %{glib_ver} +Requires: libarchive%{?_isa} +Requires: nettle%{?_isa} # Required for the temporary modularity hack, see below %if 0%{?_module_build} BuildRequires: sed %endif +Obsoletes: %{name}-compat < 2.13.2 +Obsoletes: %{name}-plugin-rhtsupport < 2.13.2 +Obsoletes: %{name}-rhel < 2.13.2 + %description Libraries providing API for reporting different problems in applications to different bug targets like Bugzilla, ftp, trac, etc... @@ -223,25 +225,6 @@ Requires: python3-subscription-manager-rhsm %description plugin-ureport Uploads micro-report to abrt server -%package plugin-rhtsupport -Summary: %{name}'s RHTSupport plugin -Requires: %{name} = %{version}-%{release} -Requires: libreport-web = %{version}-%{release} - -%description plugin-rhtsupport -Plugin to report bugs into RH support system. - -%if %{with bugzilla} -%package compat -Summary: %{name}'s compat layer for obsoleted 'report' package -Requires: libreport = %{version}-%{release} -Requires: %{name}-plugin-bugzilla = %{version}-%{release} -Requires: %{name}-plugin-rhtsupport = %{version}-%{release} - -%description compat -Provides 'report' command-line tool. -%endif - %package plugin-reportuploader Summary: %{name}'s reportuploader plugin Requires: %{name} = %{version}-%{release} @@ -262,16 +245,6 @@ install this package and you're done. %endif %if 0%{?rhel} -%package rhel -Summary: Default configuration for reporting bugs via Red Hat infrastructure -Requires: %{name} = %{version}-%{release} -Requires: %{name}-plugin-ureport - -%description rhel -Default configuration for reporting bugs via Red Hat infrastructure -used to easily configure the reporting process for Red Hat systems. Just -install this package and you're done. - %package rhel-bugzilla Summary: Default configuration for reporting bugs to Red Hat Bugzilla Requires: %{name} = %{version}-%{release} @@ -299,9 +272,7 @@ package and you're done. Summary: Default configuration for reporting anaconda bugs Requires: %{name} = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release} -%if 0%{?rhel} -Requires: libreport-plugin-rhtsupport = %{version}-%{release} -%else +%if ! 0%{?rhel} Requires: libreport-plugin-bugzilla = %{version}-%{release} %endif @@ -319,9 +290,6 @@ autoconf %configure \ %if %{without bugzilla} --without-bugzilla \ -%endif -%if 0%{?rhel} - --enable-import-rhtsupport-cert \ %endif --enable-doxygen-docs \ --disable-silent-rules @@ -374,16 +342,7 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml # Remove unwanted RHEL specific workflow configuration files %if 0%{!?rhel:1} -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELCCpp.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELKerneloops.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELPython.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELvmcore.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELxorg.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELLibreport.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJava.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJavaScript.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_uReport.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHEL.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHELBugzilla.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaCCpp.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaKerneloops.xml @@ -401,11 +360,8 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataxorg.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataLibreport.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJava.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJavaScript.xml -rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf -rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf -rm -f %{buildroot}%{_mandir}/man5/report_rhel.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5 %endif @@ -634,26 +590,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/centos_report_event.conf %{_mandir}/man5/centos_report_event.conf.5.gz -%files plugin-rhtsupport -%config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf -%{_datadir}/%{name}/conf.d/plugins/rhtsupport.conf -%{_datadir}/%{name}/events/report_RHTSupport.xml -%{_datadir}/%{name}/events/report_RHTSupport_AddData.xml -%if 0%{?rhel} -%attr(600,root,root)%{_sysconfdir}/%{name}/cert-api.access.redhat.com.pem -%endif -%config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf -%{_mandir}/man1/reporter-rhtsupport.1.gz -%{_mandir}/man5/rhtsupport.conf.5.* -%{_mandir}/man5/rhtsupport_event.conf.5.* -%{_bindir}/reporter-rhtsupport - -%if %{with bugzilla} -%files compat -%{_bindir}/report -%{_mandir}/man1/report.1.gz -%endif - %files plugin-reportuploader %{_mandir}/man*/reporter-upload.* %{_mandir}/man5/uploader_event.conf.5.* @@ -686,27 +622,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %if 0%{?rhel} -%files rhel -%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml -%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml -%{_datadir}/%{name}/workflows/workflow_RHELPython.xml -%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml -%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml -%{_datadir}/%{name}/workflows/workflow_RHELLibreport.xml -%{_datadir}/%{name}/workflows/workflow_RHELJava.xml -%{_datadir}/%{name}/workflows/workflow_RHELJavaScript.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataCCpp.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataJava.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataKerneloops.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataLibreport.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataPython.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDatavmcore.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataxorg.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataJavaScript.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf -%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf -%{_mandir}/man5/report_rhel.conf.5.* - %files rhel-bugzilla %{_datadir}/%{name}/workflows/workflow_RHELBugzillaCCpp.xml %{_datadir}/%{name}/workflows/workflow_RHELBugzillaKerneloops.xml @@ -743,6 +658,26 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Aug 13 2020 Michal Fabik 2.14.0-1 +- forbidden_words: Add potentially sensitive env vars +- lib: Add version script for libreport +- lib: compress: Use libarchive +- Replace various utility functions with stock GLib ones +- gtk,lib: Update symbol list +- dd: Update dd_get_owner to handle error return values +- dirsize: Don't pick .lock'd dirs for deletion +- setgid instead of setuid the abrt-action-install-debuginfo-to-abrt-cache +- Various coding style improvements +- Various memory management fixes +- lib: Check for errors when opening files +- gtk-helpers: Check return value +- doc: Exclude more files with --without-bugzilla +- lib: Don’t use external executables for decompression +- lib: Decommission libreport_list_free_with_free +- Drop Red Hat Customer Portal reporter +- ureport: Drop Strata integration +- lib: Remove creates-items tag parsing in event definitions + * Mon May 11 2020 Michal Fabik 2.13.1-2 - Fix broken abrt-vmcore.service due to bad namespacing diff --git a/sources b/sources index 36fbd1b..5f54412 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libreport-2.13.1.tar.gz) = fc3db46ee6885053387b86e682f9ed1908d050149a5d820b40444b7db413af89afdcd6abef780179c5ca968ea036f3ae245884414b94d426547e58a89b8bbb65 +SHA512 (libreport-2.14.0.tar.gz) = 3f299ec78a4b325b67649d43d9ea643c72e0e23942936ba44d666034422de79b48678cf9601806368623346c08b375db0328d75765e996826a0c5caf14562016 From b717ee6fd20afd24f1439ac336cad5c6f5f162ee Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Mon, 17 Aug 2020 14:46:12 +0200 Subject: [PATCH 09/16] spec: Drop %{?_isa} from BuildRequires https://github.com/abrt/libreport/issues/661 Signed-off-by: Michal Fabik --- libreport.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libreport.spec b/libreport.spec index 653faa6..65446a7 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,28 +15,28 @@ Summary: Generic library for reporting various problems Name: libreport 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 BuildRequires: %{dbus_devel} -BuildRequires: gtk3-devel%{?_isa} -BuildRequires: curl-devel%{?_isa} +BuildRequires: gtk3-devel +BuildRequires: curl-devel BuildRequires: desktop-file-utils BuildRequires: python3-devel BuildRequires: gettext -BuildRequires: libxml2-devel%{?_isa} -BuildRequires: libtar-devel%{?_isa} +BuildRequires: libxml2-devel +BuildRequires: libtar-devel BuildRequires: intltool BuildRequires: libtool BuildRequires: texinfo BuildRequires: asciidoc BuildRequires: xmlto -BuildRequires: newt-devel%{?_isa} -BuildRequires: libproxy-devel%{?_isa} -BuildRequires: satyr-devel%{?_isa} >= 0.24 -BuildRequires: glib2-devel%{?_isa} >= %{glib_ver} -BuildRequires: nettle-devel%{?_isa} +BuildRequires: newt-devel +BuildRequires: libproxy-devel +BuildRequires: satyr-devel >= 0.24 +BuildRequires: glib2-devel >= %{glib_ver} +BuildRequires: nettle-devel BuildRequires: git-core %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 @@ -48,10 +48,10 @@ BuildRequires: glibc-all-langpacks BuildRequires: xmlrpc-c-devel %endif BuildRequires: doxygen -BuildRequires: systemd-devel%{?_isa} +BuildRequires: systemd-devel BuildRequires: augeas-devel BuildRequires: augeas -BuildRequires: libarchive-devel%{?_isa} +BuildRequires: libarchive-devel Requires: libreport-filesystem = %{version}-%{release} Requires: satyr%{?_isa} >= 0.24 Requires: glib2%{?_isa} >= %{glib_ver} From 4109c2def06388fc3a43982f709390671d21827d Mon Sep 17 00:00:00 2001 From: Michal Fabik Date: Tue, 18 Aug 2020 16:11:30 +0200 Subject: [PATCH 10/16] Bump release to rebuild in side tag Signed-off-by: Michal Fabik --- libreport.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreport.spec b/libreport.spec index 65446a7..9c91412 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,7 +15,7 @@ Summary: Generic library for reporting various problems Name: libreport 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 From eca3409f80803485ffcf7eadcb451cc4fc5688e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Tue, 29 Sep 2020 16:15:42 +0200 Subject: [PATCH 11/16] Add patch for #1883410 --- 0005-gui-wizard-gtk-Fix-segfault.patch | 66 +++++++++++++++++++ ...l-autofree-pointers-before-returning.patch | 40 +++++++++++ libreport.spec | 8 ++- 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 0005-gui-wizard-gtk-Fix-segfault.patch create mode 100644 0006-event_config-Null-autofree-pointers-before-returning.patch diff --git a/0005-gui-wizard-gtk-Fix-segfault.patch b/0005-gui-wizard-gtk-Fix-segfault.patch new file mode 100644 index 0000000..29d65ae --- /dev/null +++ b/0005-gui-wizard-gtk-Fix-segfault.patch @@ -0,0 +1,66 @@ +From 1a22f30187163ce288b14e55a80539353a38b7be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Tue, 29 Sep 2020 14:16:00 +0200 +Subject: [PATCH 1/2] gui-wizard-gtk: Fix segfault + +Since show_error_as_msgbox() is specified as the custom logging handler +(via setting libreport_g_custom_logger), it will get called if an error +occurs in libreport_save_user_settings(). However, at that point, +g_wnd_assistant has already been destroyed, which leads to an invalid +read in show_error_as_msgbox(). + +This change unsets the custom logging handler after the GUI is destroyed +and adds an assertion in show_error_as_msgbox() checking that +g_wnd_assistant is not a null pointer. + +Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1883337 +--- + src/gui-wizard-gtk/main.c | 6 ++++-- + src/gui-wizard-gtk/wizard.c | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/gui-wizard-gtk/main.c b/src/gui-wizard-gtk/main.c +index e111948c..f094c5fb 100644 +--- a/src/gui-wizard-gtk/main.c ++++ b/src/gui-wizard-gtk/main.c +@@ -125,6 +125,7 @@ int main(int argc, char **argv) + /* List of events specified on the command line. */ + GList *user_event_list = NULL; + const char *prgname = "abrt"; ++ int ret = 0; + abrt_init(argv); + + /* I18n */ +@@ -217,13 +218,14 @@ int main(int argc, char **argv) + g_signal_connect(app, "startup", G_CALLBACK(startup_wizard), NULL); + + /* Enter main loop */ +- g_application_run(G_APPLICATION(app), argc, argv); ++ ret = g_application_run(G_APPLICATION(app), argc, argv); + g_object_unref(app); ++ libreport_g_custom_logger = NULL; + + if (opts & OPT_d) + delete_dump_dir_possibly_using_abrtd(g_dump_dir_name); + + libreport_save_user_settings(); + +- return 0; ++ return ret; + } +diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c +index 775b709f..c4a0b4c0 100644 +--- a/src/gui-wizard-gtk/wizard.c ++++ b/src/gui-wizard-gtk/wizard.c +@@ -360,6 +360,8 @@ struct dump_dir *wizard_open_directory_for_writing(const char *dump_dir_name) + + void show_error_as_msgbox(const char *msg) + { ++ g_return_if_fail(g_wnd_assistant != NULL); ++ + GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(g_wnd_assistant), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, +-- +2.26.2 + diff --git a/0006-event_config-Null-autofree-pointers-before-returning.patch b/0006-event_config-Null-autofree-pointers-before-returning.patch new file mode 100644 index 0000000..ed3a26f --- /dev/null +++ b/0006-event_config-Null-autofree-pointers-before-returning.patch @@ -0,0 +1,40 @@ +From 41b6477bdeaa82c647db2f1c2ba1132c77b365ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Tue, 29 Sep 2020 14:43:15 +0200 +Subject: [PATCH 2/2] event_config: Null autofree pointers before returning + +The pointers to strings in the function check_problem_rating_usability() +need to be nullified before the function returns as they are declared +for auto-cleanup. + +This change fixes a double-free condition in which the returned strings +were attempted to be freed again in the caller, +is_backtrace_rating_usable(). + +Bug was introduced in 05e9c9273. + +Resolves rhbz#1883410 +--- + src/lib/event_config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/lib/event_config.c b/src/lib/event_config.c +index c8053b7c..01e91efe 100644 +--- a/src/lib/event_config.c ++++ b/src/lib/event_config.c +@@ -541,10 +541,10 @@ bool check_problem_rating_usability(const event_config_t *cfg, + + finish: + if (description) +- *description = tmp_desc; ++ *description = g_steal_pointer(&tmp_desc); + + if (detail) +- *detail = tmp_detail; ++ *detail = g_steal_pointer(&tmp_detail); + + return result; + } +-- +2.26.2 + diff --git a/libreport.spec b/libreport.spec index 9c91412..f53a41f 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,10 +15,13 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.14.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-event_config-Null-autofree-pointers-before-returning.patch + BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel BuildRequires: curl-devel @@ -658,6 +661,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Tue Sep 29 2020 Matěj Grabovský - 2.14.0-4 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883410 + * Thu Aug 13 2020 Michal Fabik 2.14.0-1 - forbidden_words: Add potentially sensitive env vars - lib: Add version script for libreport From aa3de1104fe1bf1927d97f900177885616a95766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Tue, 29 Sep 2020 16:15:42 +0200 Subject: [PATCH 12/16] Add patch for rhbz#1883337 --- ...x-segfault.patch => 0001-gui-wizard-gtk-Fix-segfault.patch | 0 ...event_config-Null-autofree-pointers-before-returning.patch | 0 libreport.spec | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) rename 0005-gui-wizard-gtk-Fix-segfault.patch => 0001-gui-wizard-gtk-Fix-segfault.patch (100%) rename 0006-event_config-Null-autofree-pointers-before-returning.patch => 0002-event_config-Null-autofree-pointers-before-returning.patch (100%) diff --git a/0005-gui-wizard-gtk-Fix-segfault.patch b/0001-gui-wizard-gtk-Fix-segfault.patch similarity index 100% rename from 0005-gui-wizard-gtk-Fix-segfault.patch rename to 0001-gui-wizard-gtk-Fix-segfault.patch diff --git a/0006-event_config-Null-autofree-pointers-before-returning.patch b/0002-event_config-Null-autofree-pointers-before-returning.patch similarity index 100% rename from 0006-event_config-Null-autofree-pointers-before-returning.patch rename to 0002-event_config-Null-autofree-pointers-before-returning.patch diff --git a/libreport.spec b/libreport.spec index f53a41f..623b34e 100644 --- a/libreport.spec +++ b/libreport.spec @@ -20,7 +20,8 @@ License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-event_config-Null-autofree-pointers-before-returning.patch +Patch0: 0001-gui-wizard-gtk-Fix-segfault.patch +Patch1: 0002-event_config-Null-autofree-pointers-before-returning.patch BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel @@ -663,6 +664,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Tue Sep 29 2020 Matěj Grabovský - 2.14.0-4 - Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883410 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883337 * Thu Aug 13 2020 Michal Fabik 2.14.0-1 - forbidden_words: Add potentially sensitive env vars From 6b10e9d7b3d37a8083f2d90605087c6b33be6552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Tue, 29 Sep 2020 17:31:03 +0200 Subject: [PATCH 13/16] Revert to state after release of 2.12.0-3.fc32 --- .gitignore | 3 - 0001-gui-wizard-gtk-Fix-segfault.patch | 66 ------- ...i-wizard-gtk-Wrap-event-log-messages.patch | 32 ++++ ...l-autofree-pointers-before-returning.patch | 40 ----- libreport.spec | 161 +++++++++++------- sources | 2 +- 6 files changed, 137 insertions(+), 167 deletions(-) delete mode 100644 0001-gui-wizard-gtk-Fix-segfault.patch create mode 100644 0001-gui-wizard-gtk-Wrap-event-log-messages.patch delete mode 100644 0002-event_config-Null-autofree-pointers-before-returning.patch diff --git a/.gitignore b/.gitignore index 23c2ea8..634b63b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,3 @@ /libreport-2.11.2.tar.gz /libreport-2.11.3.tar.gz /libreport-2.12.0.tar.gz -/libreport-2.13.0.tar.gz -/libreport-2.13.1.tar.gz -/libreport-2.14.0.tar.gz diff --git a/0001-gui-wizard-gtk-Fix-segfault.patch b/0001-gui-wizard-gtk-Fix-segfault.patch deleted file mode 100644 index 29d65ae..0000000 --- a/0001-gui-wizard-gtk-Fix-segfault.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 1a22f30187163ce288b14e55a80539353a38b7be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Tue, 29 Sep 2020 14:16:00 +0200 -Subject: [PATCH 1/2] gui-wizard-gtk: Fix segfault - -Since show_error_as_msgbox() is specified as the custom logging handler -(via setting libreport_g_custom_logger), it will get called if an error -occurs in libreport_save_user_settings(). However, at that point, -g_wnd_assistant has already been destroyed, which leads to an invalid -read in show_error_as_msgbox(). - -This change unsets the custom logging handler after the GUI is destroyed -and adds an assertion in show_error_as_msgbox() checking that -g_wnd_assistant is not a null pointer. - -Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1883337 ---- - src/gui-wizard-gtk/main.c | 6 ++++-- - src/gui-wizard-gtk/wizard.c | 2 ++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/gui-wizard-gtk/main.c b/src/gui-wizard-gtk/main.c -index e111948c..f094c5fb 100644 ---- a/src/gui-wizard-gtk/main.c -+++ b/src/gui-wizard-gtk/main.c -@@ -125,6 +125,7 @@ int main(int argc, char **argv) - /* List of events specified on the command line. */ - GList *user_event_list = NULL; - const char *prgname = "abrt"; -+ int ret = 0; - abrt_init(argv); - - /* I18n */ -@@ -217,13 +218,14 @@ int main(int argc, char **argv) - g_signal_connect(app, "startup", G_CALLBACK(startup_wizard), NULL); - - /* Enter main loop */ -- g_application_run(G_APPLICATION(app), argc, argv); -+ ret = g_application_run(G_APPLICATION(app), argc, argv); - g_object_unref(app); -+ libreport_g_custom_logger = NULL; - - if (opts & OPT_d) - delete_dump_dir_possibly_using_abrtd(g_dump_dir_name); - - libreport_save_user_settings(); - -- return 0; -+ return ret; - } -diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c -index 775b709f..c4a0b4c0 100644 ---- a/src/gui-wizard-gtk/wizard.c -+++ b/src/gui-wizard-gtk/wizard.c -@@ -360,6 +360,8 @@ struct dump_dir *wizard_open_directory_for_writing(const char *dump_dir_name) - - void show_error_as_msgbox(const char *msg) - { -+ g_return_if_fail(g_wnd_assistant != NULL); -+ - GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(g_wnd_assistant), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, --- -2.26.2 - diff --git a/0001-gui-wizard-gtk-Wrap-event-log-messages.patch b/0001-gui-wizard-gtk-Wrap-event-log-messages.patch new file mode 100644 index 0000000..eda89e9 --- /dev/null +++ b/0001-gui-wizard-gtk-Wrap-event-log-messages.patch @@ -0,0 +1,32 @@ +From 1f14c9fa96937e589354589665eb8c64d6d16d80 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Fri, 20 Mar 2020 18:04:19 +0100 +Subject: [PATCH] gui-wizard-gtk: Wrap event log messages + +Currently, large logs received by abrt-retrace-client may cause +X/Wayland protocol errors due to an overly large buffer being allocated +for GtkTextView. Enabling word wrapping and eliminating horizontal +scrolling seems to prevent that from happening. + +Cf. https://gitlab.gnome.org/GNOME/gtk/issues/1143 + +https://bugzilla.redhat.com/show_bug.cgi?id=1815544 +--- + src/gui-wizard-gtk/wizard.glade | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade +index e86fc90b..f7782ba2 100644 +--- a/src/gui-wizard-gtk/wizard.glade ++++ b/src/gui-wizard-gtk/wizard.glade +@@ -705,6 +705,7 @@ + True + True + False ++ word + + + +-- +2.25.1 + diff --git a/0002-event_config-Null-autofree-pointers-before-returning.patch b/0002-event_config-Null-autofree-pointers-before-returning.patch deleted file mode 100644 index ed3a26f..0000000 --- a/0002-event_config-Null-autofree-pointers-before-returning.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 41b6477bdeaa82c647db2f1c2ba1132c77b365ed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Tue, 29 Sep 2020 14:43:15 +0200 -Subject: [PATCH 2/2] event_config: Null autofree pointers before returning - -The pointers to strings in the function check_problem_rating_usability() -need to be nullified before the function returns as they are declared -for auto-cleanup. - -This change fixes a double-free condition in which the returned strings -were attempted to be freed again in the caller, -is_backtrace_rating_usable(). - -Bug was introduced in 05e9c9273. - -Resolves rhbz#1883410 ---- - src/lib/event_config.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/event_config.c b/src/lib/event_config.c -index c8053b7c..01e91efe 100644 ---- a/src/lib/event_config.c -+++ b/src/lib/event_config.c -@@ -541,10 +541,10 @@ bool check_problem_rating_usability(const event_config_t *cfg, - - finish: - if (description) -- *description = tmp_desc; -+ *description = g_steal_pointer(&tmp_desc); - - if (detail) -- *detail = tmp_detail; -+ *detail = g_steal_pointer(&tmp_detail); - - return result; - } --- -2.26.2 - diff --git a/libreport.spec b/libreport.spec index 623b34e..c630e35 100644 --- a/libreport.spec +++ b/libreport.spec @@ -14,14 +14,12 @@ Summary: Generic library for reporting various problems Name: libreport -Version: 2.14.0 -Release: 4%{?dist} +Version: 2.12.0 +Release: 3%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz - -Patch0: 0001-gui-wizard-gtk-Fix-segfault.patch -Patch1: 0002-event_config-Null-autofree-pointers-before-returning.patch +Patch0001: 0001-gui-wizard-gtk-Wrap-event-log-messages.patch BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel @@ -55,22 +53,20 @@ BuildRequires: doxygen BuildRequires: systemd-devel BuildRequires: augeas-devel BuildRequires: augeas -BuildRequires: libarchive-devel +BuildRequires: xz +BuildRequires: lz4 Requires: libreport-filesystem = %{version}-%{release} -Requires: satyr%{?_isa} >= 0.24 -Requires: glib2%{?_isa} >= %{glib_ver} -Requires: libarchive%{?_isa} -Requires: nettle%{?_isa} +Requires: satyr >= 0.24 +Requires: glib2 >= %{glib_ver} +Requires: xz +Requires: lz4 +Requires: nettle # Required for the temporary modularity hack, see below %if 0%{?_module_build} BuildRequires: sed %endif -Obsoletes: %{name}-compat < 2.13.2 -Obsoletes: %{name}-plugin-rhtsupport < 2.13.2 -Obsoletes: %{name}-rhel < 2.13.2 - %description Libraries providing API for reporting different problems in applications to different bug targets like Bugzilla, ftp, trac, etc... @@ -229,6 +225,25 @@ Requires: python3-subscription-manager-rhsm %description plugin-ureport Uploads micro-report to abrt server +%package plugin-rhtsupport +Summary: %{name}'s RHTSupport plugin +Requires: %{name} = %{version}-%{release} +Requires: libreport-web = %{version}-%{release} + +%description plugin-rhtsupport +Plugin to report bugs into RH support system. + +%if %{with bugzilla} +%package compat +Summary: %{name}'s compat layer for obsoleted 'report' package +Requires: libreport = %{version}-%{release} +Requires: %{name}-plugin-bugzilla = %{version}-%{release} +Requires: %{name}-plugin-rhtsupport = %{version}-%{release} + +%description compat +Provides 'report' command-line tool. +%endif + %package plugin-reportuploader Summary: %{name}'s reportuploader plugin Requires: %{name} = %{version}-%{release} @@ -249,6 +264,16 @@ install this package and you're done. %endif %if 0%{?rhel} +%package rhel +Summary: Default configuration for reporting bugs via Red Hat infrastructure +Requires: %{name} = %{version}-%{release} +Requires: %{name}-plugin-ureport + +%description rhel +Default configuration for reporting bugs via Red Hat infrastructure +used to easily configure the reporting process for Red Hat systems. Just +install this package and you're done. + %package rhel-bugzilla Summary: Default configuration for reporting bugs to Red Hat Bugzilla Requires: %{name} = %{version}-%{release} @@ -276,7 +301,9 @@ package and you're done. Summary: Default configuration for reporting anaconda bugs Requires: %{name} = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release} -%if ! 0%{?rhel} +%if 0%{?rhel} +Requires: libreport-plugin-rhtsupport = %{version}-%{release} +%else Requires: libreport-plugin-bugzilla = %{version}-%{release} %endif @@ -291,17 +318,20 @@ data over ftp/scp... %build autoconf -%configure \ +CFLAGS="%{optflags} -Werror" %configure \ %if %{without bugzilla} --without-bugzilla \ +%endif +%if 0%{?rhel} + --enable-import-rhtsupport-cert \ %endif --enable-doxygen-docs \ --disable-silent-rules -%make_build +make %{?_smp_mflags} %install -%make_install \ +make install DESTDIR=%{buildroot} \ %if %{with python3} PYTHON=%{__python3} \ %endif # with python3 @@ -346,7 +376,16 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml # Remove unwanted RHEL specific workflow configuration files %if 0%{!?rhel:1} +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELCCpp.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELKerneloops.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELPython.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELvmcore.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELxorg.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELLibreport.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJava.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJavaScript.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_uReport.xml +rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHEL.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHELBugzilla.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaCCpp.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaKerneloops.xml @@ -364,8 +403,11 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataxorg.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataLibreport.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJava.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJavaScript.xml +rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf +rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf +rm -f %{buildroot}%{_mandir}/man5/report_rhel.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5 %endif @@ -407,6 +449,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/%{name}/ignored_words.conf %{_datadir}/%{name}/conf.d/libreport.conf %{_libdir}/libreport.so.* +%{_libdir}/libabrt_dbus.so.* %{_mandir}/man5/libreport.conf.5* %{_mandir}/man5/report_event.conf.5* %{_mandir}/man5/forbidden_words.conf.5* @@ -448,10 +491,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/libreport/reporters.h %{_includedir}/libreport/global_configuration.h # Private api headers: +%{_includedir}/libreport/internal_abrt_dbus.h %{_includedir}/libreport/internal_libreport.h %{_includedir}/libreport/xml_parser.h %{_includedir}/libreport/helpers %{_libdir}/libreport.so +%{_libdir}/libabrt_dbus.so %{_libdir}/pkgconfig/libreport.pc %dir %{_includedir}/libreport @@ -594,6 +639,26 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/centos_report_event.conf %{_mandir}/man5/centos_report_event.conf.5.gz +%files plugin-rhtsupport +%config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf +%{_datadir}/%{name}/conf.d/plugins/rhtsupport.conf +%{_datadir}/%{name}/events/report_RHTSupport.xml +%{_datadir}/%{name}/events/report_RHTSupport_AddData.xml +%if 0%{?rhel} +%attr(600,root,root)%{_sysconfdir}/%{name}/cert-api.access.redhat.com.pem +%endif +%config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf +%{_mandir}/man1/reporter-rhtsupport.1.gz +%{_mandir}/man5/rhtsupport.conf.5.* +%{_mandir}/man5/rhtsupport_event.conf.5.* +%{_bindir}/reporter-rhtsupport + +%if %{with bugzilla} +%files compat +%{_bindir}/report +%{_mandir}/man1/report.1.gz +%endif + %files plugin-reportuploader %{_mandir}/man*/reporter-upload.* %{_mandir}/man5/uploader_event.conf.5.* @@ -626,6 +691,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %if 0%{?rhel} +%files rhel +%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml +%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml +%{_datadir}/%{name}/workflows/workflow_RHELPython.xml +%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml +%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml +%{_datadir}/%{name}/workflows/workflow_RHELLibreport.xml +%{_datadir}/%{name}/workflows/workflow_RHELJava.xml +%{_datadir}/%{name}/workflows/workflow_RHELJavaScript.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDataCCpp.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDataJava.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDataKerneloops.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDataLibreport.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDataPython.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDatavmcore.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDataxorg.xml +%{_datadir}/%{name}/workflows/workflow_RHELAddDataJavaScript.xml +%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf +%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf +%{_mandir}/man5/report_rhel.conf.5.* + %files rhel-bugzilla %{_datadir}/%{name}/workflows/workflow_RHELBugzillaCCpp.xml %{_datadir}/%{name}/workflows/workflow_RHELBugzillaKerneloops.xml @@ -662,45 +748,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Tue Sep 29 2020 Matěj Grabovský - 2.14.0-4 -- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883410 -- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883337 - -* Thu Aug 13 2020 Michal Fabik 2.14.0-1 -- forbidden_words: Add potentially sensitive env vars -- lib: Add version script for libreport -- lib: compress: Use libarchive -- Replace various utility functions with stock GLib ones -- gtk,lib: Update symbol list -- dd: Update dd_get_owner to handle error return values -- dirsize: Don't pick .lock'd dirs for deletion -- setgid instead of setuid the abrt-action-install-debuginfo-to-abrt-cache -- Various coding style improvements -- Various memory management fixes -- lib: Check for errors when opening files -- gtk-helpers: Check return value -- doc: Exclude more files with --without-bugzilla -- lib: Don’t use external executables for decompression -- lib: Decommission libreport_list_free_with_free -- Drop Red Hat Customer Portal reporter -- ureport: Drop Strata integration -- lib: Remove creates-items tag parsing in event definitions - -* Mon May 11 2020 Michal Fabik 2.13.1-2 -- Fix broken abrt-vmcore.service due to bad namespacing - -* Mon May 11 2020 Michal Fabik 2.13.1-1 -- Fix broken abrt-vmcore.service due to bad namespacing - -* Fri Apr 24 2020 Michal Fabik 2.13.0-2 -- Support new "time" and "time_for_children" kernel namespaces -- Remove preprocessor namespacing in favor of function name prefixes -- client-python: Accomodate for multiple debug directories -- gui-wizard-gtk: Wrap event log messages -- lib: Drop D-Bus code -- plugins: reporter-rhtsupport: Drop unused debugging code -- Update translations - * Fri Mar 20 2020 Ernestas Kulik - 2.12.0-3 - Add patch for https://bugzilla.redhat.com/show_bug.cgi?id=1815544 diff --git a/sources b/sources index 5f54412..7a7c9a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libreport-2.14.0.tar.gz) = 3f299ec78a4b325b67649d43d9ea643c72e0e23942936ba44d666034422de79b48678cf9601806368623346c08b375db0328d75765e996826a0c5caf14562016 +SHA512 (libreport-2.12.0.tar.gz) = e79163db3807c695aba636474441502c5d4f8c38bb6582d133179c324bc66451b89c2d9c7b60d5686bd85db64e6d6193815b07f0a364c23d98f8d1594a5e658f From 980ff1185ce41c4fbc10e1481b7c431a52a3a6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Tue, 29 Sep 2020 16:15:42 +0200 Subject: [PATCH 14/16] Port upstream patches * Patch for #1883337 * Support for new kernel namespaces --- 0002-gui-wizard-gtk-Fix-segfault.patch | 66 +++++++++++++++++++++ 0003-Support-new-kernel-namespace.patch | 78 +++++++++++++++++++++++++ libreport.spec | 11 +++- 3 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 0002-gui-wizard-gtk-Fix-segfault.patch create mode 100644 0003-Support-new-kernel-namespace.patch diff --git a/0002-gui-wizard-gtk-Fix-segfault.patch b/0002-gui-wizard-gtk-Fix-segfault.patch new file mode 100644 index 0000000..f825a65 --- /dev/null +++ b/0002-gui-wizard-gtk-Fix-segfault.patch @@ -0,0 +1,66 @@ +From a076321406265220fb63d3c9455f00ea05d21359 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Tue, 29 Sep 2020 14:16:00 +0200 +Subject: [PATCH] gui-wizard-gtk: Fix segfault + +Since show_error_as_msgbox() is specified as the custom logging handler +(via setting libreport_g_custom_logger), it will get called if an error +occurs in libreport_save_user_settings(). However, at that point, +g_wnd_assistant has already been destroyed, which leads to an invalid +read in show_error_as_msgbox(). + +This change unsets the custom logging handler after the GUI is destroyed +and adds an assertion in show_error_as_msgbox() checking that +g_wnd_assistant is not a null pointer. + +Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1883337 +--- + src/gui-wizard-gtk/main.c | 6 ++++-- + src/gui-wizard-gtk/wizard.c | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/gui-wizard-gtk/main.c b/src/gui-wizard-gtk/main.c +index 2c08d62b..180dbc4e 100644 +--- a/src/gui-wizard-gtk/main.c ++++ b/src/gui-wizard-gtk/main.c +@@ -125,6 +125,7 @@ int main(int argc, char **argv) + /* List of events specified on the command line. */ + GList *user_event_list = NULL; + const char *prgname = "abrt"; ++ int ret = 0; + abrt_init(argv); + + /* I18n */ +@@ -218,13 +219,14 @@ int main(int argc, char **argv) + g_signal_connect(app, "startup", G_CALLBACK(startup_wizard), NULL); + + /* Enter main loop */ +- g_application_run(G_APPLICATION(app), argc, argv); ++ ret = g_application_run(G_APPLICATION(app), argc, argv); + g_object_unref(app); ++ libreport_g_custom_logger = NULL; + + if (opts & OPT_d) + delete_dump_dir_possibly_using_abrtd(g_dump_dir_name); + + save_user_settings(); + +- return 0; ++ return ret; + } +diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c +index 77dd7f3b..f1b8a191 100644 +--- a/src/gui-wizard-gtk/wizard.c ++++ b/src/gui-wizard-gtk/wizard.c +@@ -362,6 +362,8 @@ struct dump_dir *wizard_open_directory_for_writing(const char *dump_dir_name) + + void show_error_as_msgbox(const char *msg) + { ++ g_return_if_fail(g_wnd_assistant != NULL); ++ + GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(g_wnd_assistant), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, +-- +2.26.2 + diff --git a/0003-Support-new-kernel-namespace.patch b/0003-Support-new-kernel-namespace.patch new file mode 100644 index 0000000..39f09fc --- /dev/null +++ b/0003-Support-new-kernel-namespace.patch @@ -0,0 +1,78 @@ +From 323714cbbca1ffed64fa653e95534e386f3ee127 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Wed, 1 Apr 2020 12:12:34 +0200 +Subject: [PATCH] Support new kernel namespace + +Linux 5.6 introduces a new time namespace: +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=769071ac9f20b6a447410c7eaa55d1a5233ef40c +--- + src/include/internal_libreport.h | 14 +++++++++++++- + tests/proc_helpers.at | 13 ++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h +index 5e55170e..06fb3f0d 100644 +--- a/src/include/internal_libreport.h ++++ b/src/include/internal_libreport.h +@@ -729,7 +729,19 @@ int get_env_variable(pid_t pid, const char *name, char **value); + #define PROC_NS_ID_USER 4 + #define PROC_NS_ID_UTS 5 + #define PROC_NS_ID_CGROUP 6 +-static const char * libreport_proc_namespaces[] = { "ipc", "mnt", "net", "pid", "uts", "user", "cgroup", "pid_for_children" }; ++#define PROC_NS_ID_TIME 8 ++static const char * libreport_proc_namespaces[] = { ++ "ipc", ++ "mnt", ++ "net", ++ "pid", ++ "uts", ++ "user", ++ "cgroup", ++ "pid_for_children", ++ "time", ++ "time_for_children", ++}; + + struct ns_ids { + ino_t nsi_ids[ARRAY_SIZE(libreport_proc_namespaces)]; +diff --git a/tests/proc_helpers.at b/tests/proc_helpers.at +index 4b99d447..53e17436 100644 +--- a/tests/proc_helpers.at ++++ b/tests/proc_helpers.at +@@ -950,6 +950,8 @@ void check_file_contents(const char *filename) + + char const *pid_for_children = "default"; + char const *cgroup = "default"; ++ const char *time = "default"; ++ const char *time_for_children = "default"; + + if (stat("/proc/self/ns/cgroup", &st) < 0 && errno == ENOENT) + cgroup = "unknown"; +@@ -957,6 +959,12 @@ void check_file_contents(const char *filename) + if (stat("/proc/self/ns/pid_for_children", &st) < 0 && errno == ENOENT) + pid_for_children = "unknown"; + ++ if (stat("/proc/self/ns/time", &st) < 0 && ENOENT == errno) ++ time = "unknown"; ++ ++ if (stat("/proc/self/ns/time_for_children", &st) < 0 && ENOENT == errno) ++ time_for_children = "unknown"; ++ + expected = xasprintf("ipc : default\n" + "mnt : default\n" + "net : default\n" +@@ -964,7 +972,10 @@ void check_file_contents(const char *filename) + "uts : default\n" + "user : default\n" + "cgroup : %s\n" +- "pid_for_children : %s\n", cgroup, pid_for_children); ++ "pid_for_children : %s\n" ++ "time : %s\n" ++ "time_for_children : %s\n", ++ cgroup, pid_for_children, time, time_for_children); + + char *file = xmalloc_xopen_read_close(filename, NULL); + TS_ASSERT_STRING_EQ(file, expected, "Namespaces"); +-- +2.26.2 + diff --git a/libreport.spec b/libreport.spec index c630e35..0367b73 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,11 +15,14 @@ Summary: Generic library for reporting various problems Name: libreport 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 -Patch0001: 0001-gui-wizard-gtk-Wrap-event-log-messages.patch + +Patch0: 0001-gui-wizard-gtk-Wrap-event-log-messages.patch +Patch1: 0002-gui-wizard-gtk-Fix-segfault.patch +Patch2: 0003-Support-new-kernel-namespace.patch BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel @@ -748,6 +751,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Tue Sep 29 2020 Matěj Grabovský - 2.13.0-4 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883337 +- Add support for new kernel namespaces + * Fri Mar 20 2020 Ernestas Kulik - 2.12.0-3 - Add patch for https://bugzilla.redhat.com/show_bug.cgi?id=1815544 From f561b1c946938367a9017c181aa512fddae38325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 7 Oct 2020 13:11:39 +0200 Subject: [PATCH 15/16] Revert to state after release of 2.13.1-4.fc32 --- .gitignore | 2 + ...i-wizard-gtk-Wrap-event-log-messages.patch | 32 -------- 0002-gui-wizard-gtk-Fix-segfault.patch | 66 ---------------- 0003-Support-new-kernel-namespace.patch | 78 ------------------- libreport.spec | 33 ++++---- sources | 2 +- 6 files changed, 21 insertions(+), 192 deletions(-) delete mode 100644 0001-gui-wizard-gtk-Wrap-event-log-messages.patch delete mode 100644 0002-gui-wizard-gtk-Fix-segfault.patch delete mode 100644 0003-Support-new-kernel-namespace.patch diff --git a/.gitignore b/.gitignore index 634b63b..ebda8c9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /libreport-2.11.2.tar.gz /libreport-2.11.3.tar.gz /libreport-2.12.0.tar.gz +/libreport-2.13.0.tar.gz +/libreport-2.13.1.tar.gz diff --git a/0001-gui-wizard-gtk-Wrap-event-log-messages.patch b/0001-gui-wizard-gtk-Wrap-event-log-messages.patch deleted file mode 100644 index eda89e9..0000000 --- a/0001-gui-wizard-gtk-Wrap-event-log-messages.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1f14c9fa96937e589354589665eb8c64d6d16d80 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Fri, 20 Mar 2020 18:04:19 +0100 -Subject: [PATCH] gui-wizard-gtk: Wrap event log messages - -Currently, large logs received by abrt-retrace-client may cause -X/Wayland protocol errors due to an overly large buffer being allocated -for GtkTextView. Enabling word wrapping and eliminating horizontal -scrolling seems to prevent that from happening. - -Cf. https://gitlab.gnome.org/GNOME/gtk/issues/1143 - -https://bugzilla.redhat.com/show_bug.cgi?id=1815544 ---- - src/gui-wizard-gtk/wizard.glade | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade -index e86fc90b..f7782ba2 100644 ---- a/src/gui-wizard-gtk/wizard.glade -+++ b/src/gui-wizard-gtk/wizard.glade -@@ -705,6 +705,7 @@ - True - True - False -+ word - - - --- -2.25.1 - diff --git a/0002-gui-wizard-gtk-Fix-segfault.patch b/0002-gui-wizard-gtk-Fix-segfault.patch deleted file mode 100644 index f825a65..0000000 --- a/0002-gui-wizard-gtk-Fix-segfault.patch +++ /dev/null @@ -1,66 +0,0 @@ -From a076321406265220fb63d3c9455f00ea05d21359 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= -Date: Tue, 29 Sep 2020 14:16:00 +0200 -Subject: [PATCH] gui-wizard-gtk: Fix segfault - -Since show_error_as_msgbox() is specified as the custom logging handler -(via setting libreport_g_custom_logger), it will get called if an error -occurs in libreport_save_user_settings(). However, at that point, -g_wnd_assistant has already been destroyed, which leads to an invalid -read in show_error_as_msgbox(). - -This change unsets the custom logging handler after the GUI is destroyed -and adds an assertion in show_error_as_msgbox() checking that -g_wnd_assistant is not a null pointer. - -Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1883337 ---- - src/gui-wizard-gtk/main.c | 6 ++++-- - src/gui-wizard-gtk/wizard.c | 2 ++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/gui-wizard-gtk/main.c b/src/gui-wizard-gtk/main.c -index 2c08d62b..180dbc4e 100644 ---- a/src/gui-wizard-gtk/main.c -+++ b/src/gui-wizard-gtk/main.c -@@ -125,6 +125,7 @@ int main(int argc, char **argv) - /* List of events specified on the command line. */ - GList *user_event_list = NULL; - const char *prgname = "abrt"; -+ int ret = 0; - abrt_init(argv); - - /* I18n */ -@@ -218,13 +219,14 @@ int main(int argc, char **argv) - g_signal_connect(app, "startup", G_CALLBACK(startup_wizard), NULL); - - /* Enter main loop */ -- g_application_run(G_APPLICATION(app), argc, argv); -+ ret = g_application_run(G_APPLICATION(app), argc, argv); - g_object_unref(app); -+ libreport_g_custom_logger = NULL; - - if (opts & OPT_d) - delete_dump_dir_possibly_using_abrtd(g_dump_dir_name); - - save_user_settings(); - -- return 0; -+ return ret; - } -diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c -index 77dd7f3b..f1b8a191 100644 ---- a/src/gui-wizard-gtk/wizard.c -+++ b/src/gui-wizard-gtk/wizard.c -@@ -362,6 +362,8 @@ struct dump_dir *wizard_open_directory_for_writing(const char *dump_dir_name) - - void show_error_as_msgbox(const char *msg) - { -+ g_return_if_fail(g_wnd_assistant != NULL); -+ - GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(g_wnd_assistant), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, --- -2.26.2 - diff --git a/0003-Support-new-kernel-namespace.patch b/0003-Support-new-kernel-namespace.patch deleted file mode 100644 index 39f09fc..0000000 --- a/0003-Support-new-kernel-namespace.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 323714cbbca1ffed64fa653e95534e386f3ee127 Mon Sep 17 00:00:00 2001 -From: Ernestas Kulik -Date: Wed, 1 Apr 2020 12:12:34 +0200 -Subject: [PATCH] Support new kernel namespace - -Linux 5.6 introduces a new time namespace: -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=769071ac9f20b6a447410c7eaa55d1a5233ef40c ---- - src/include/internal_libreport.h | 14 +++++++++++++- - tests/proc_helpers.at | 13 ++++++++++++- - 2 files changed, 25 insertions(+), 2 deletions(-) - -diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h -index 5e55170e..06fb3f0d 100644 ---- a/src/include/internal_libreport.h -+++ b/src/include/internal_libreport.h -@@ -729,7 +729,19 @@ int get_env_variable(pid_t pid, const char *name, char **value); - #define PROC_NS_ID_USER 4 - #define PROC_NS_ID_UTS 5 - #define PROC_NS_ID_CGROUP 6 --static const char * libreport_proc_namespaces[] = { "ipc", "mnt", "net", "pid", "uts", "user", "cgroup", "pid_for_children" }; -+#define PROC_NS_ID_TIME 8 -+static const char * libreport_proc_namespaces[] = { -+ "ipc", -+ "mnt", -+ "net", -+ "pid", -+ "uts", -+ "user", -+ "cgroup", -+ "pid_for_children", -+ "time", -+ "time_for_children", -+}; - - struct ns_ids { - ino_t nsi_ids[ARRAY_SIZE(libreport_proc_namespaces)]; -diff --git a/tests/proc_helpers.at b/tests/proc_helpers.at -index 4b99d447..53e17436 100644 ---- a/tests/proc_helpers.at -+++ b/tests/proc_helpers.at -@@ -950,6 +950,8 @@ void check_file_contents(const char *filename) - - char const *pid_for_children = "default"; - char const *cgroup = "default"; -+ const char *time = "default"; -+ const char *time_for_children = "default"; - - if (stat("/proc/self/ns/cgroup", &st) < 0 && errno == ENOENT) - cgroup = "unknown"; -@@ -957,6 +959,12 @@ void check_file_contents(const char *filename) - if (stat("/proc/self/ns/pid_for_children", &st) < 0 && errno == ENOENT) - pid_for_children = "unknown"; - -+ if (stat("/proc/self/ns/time", &st) < 0 && ENOENT == errno) -+ time = "unknown"; -+ -+ if (stat("/proc/self/ns/time_for_children", &st) < 0 && ENOENT == errno) -+ time_for_children = "unknown"; -+ - expected = xasprintf("ipc : default\n" - "mnt : default\n" - "net : default\n" -@@ -964,7 +972,10 @@ void check_file_contents(const char *filename) - "uts : default\n" - "user : default\n" - "cgroup : %s\n" -- "pid_for_children : %s\n", cgroup, pid_for_children); -+ "pid_for_children : %s\n" -+ "time : %s\n" -+ "time_for_children : %s\n", -+ cgroup, pid_for_children, time, time_for_children); - - char *file = xmalloc_xopen_read_close(filename, NULL); - TS_ASSERT_STRING_EQ(file, expected, "Namespaces"); --- -2.26.2 - diff --git a/libreport.spec b/libreport.spec index 0367b73..adb9dba 100644 --- a/libreport.spec +++ b/libreport.spec @@ -14,16 +14,11 @@ Summary: Generic library for reporting various problems Name: libreport -Version: 2.12.0 +Version: 2.13.1 Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz - -Patch0: 0001-gui-wizard-gtk-Wrap-event-log-messages.patch -Patch1: 0002-gui-wizard-gtk-Fix-segfault.patch -Patch2: 0003-Support-new-kernel-namespace.patch - BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel BuildRequires: curl-devel @@ -321,7 +316,7 @@ data over ftp/scp... %build autoconf -CFLAGS="%{optflags} -Werror" %configure \ +%configure \ %if %{without bugzilla} --without-bugzilla \ %endif @@ -331,10 +326,10 @@ CFLAGS="%{optflags} -Werror" %configure \ --enable-doxygen-docs \ --disable-silent-rules -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} \ +%make_install \ %if %{with python3} PYTHON=%{__python3} \ %endif # with python3 @@ -452,7 +447,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/%{name}/ignored_words.conf %{_datadir}/%{name}/conf.d/libreport.conf %{_libdir}/libreport.so.* -%{_libdir}/libabrt_dbus.so.* %{_mandir}/man5/libreport.conf.5* %{_mandir}/man5/report_event.conf.5* %{_mandir}/man5/forbidden_words.conf.5* @@ -494,12 +488,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/libreport/reporters.h %{_includedir}/libreport/global_configuration.h # Private api headers: -%{_includedir}/libreport/internal_abrt_dbus.h %{_includedir}/libreport/internal_libreport.h %{_includedir}/libreport/xml_parser.h %{_includedir}/libreport/helpers %{_libdir}/libreport.so -%{_libdir}/libabrt_dbus.so %{_libdir}/pkgconfig/libreport.pc %dir %{_includedir}/libreport @@ -751,9 +743,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Tue Sep 29 2020 Matěj Grabovský - 2.13.0-4 -- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883337 -- Add support for new kernel namespaces +* Mon May 11 2020 Michal Fabik 2.13.1-2 +- Fix broken abrt-vmcore.service due to bad namespacing + +* Mon May 11 2020 Michal Fabik 2.13.1-1 +- Fix broken abrt-vmcore.service due to bad namespacing + +* Fri Apr 24 2020 Michal Fabik 2.13.0-2 +- Support new "time" and "time_for_children" kernel namespaces +- Remove preprocessor namespacing in favor of function name prefixes +- client-python: Accomodate for multiple debug directories +- gui-wizard-gtk: Wrap event log messages +- lib: Drop D-Bus code +- plugins: reporter-rhtsupport: Drop unused debugging code +- Update translations * Fri Mar 20 2020 Ernestas Kulik - 2.12.0-3 - Add patch for https://bugzilla.redhat.com/show_bug.cgi?id=1815544 diff --git a/sources b/sources index 7a7c9a0..36fbd1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libreport-2.12.0.tar.gz) = e79163db3807c695aba636474441502c5d4f8c38bb6582d133179c324bc66451b89c2d9c7b60d5686bd85db64e6d6193815b07f0a364c23d98f8d1594a5e658f +SHA512 (libreport-2.13.1.tar.gz) = fc3db46ee6885053387b86e682f9ed1908d050149a5d820b40444b7db413af89afdcd6abef780179c5ca968ea036f3ae245884414b94d426547e58a89b8bbb65 From ec800730ae16aa40242e0c51633abea904fca080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Tue, 29 Sep 2020 16:15:42 +0200 Subject: [PATCH 16/16] Add patch for #1883337 --- 0001-gui-wizard-gtk-Fix-segfault.patch | 66 ++++++++++++++++++++++++++ libreport.spec | 8 +++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 0001-gui-wizard-gtk-Fix-segfault.patch diff --git a/0001-gui-wizard-gtk-Fix-segfault.patch b/0001-gui-wizard-gtk-Fix-segfault.patch new file mode 100644 index 0000000..fdf2901 --- /dev/null +++ b/0001-gui-wizard-gtk-Fix-segfault.patch @@ -0,0 +1,66 @@ +From 1a22f30187163ce288b14e55a80539353a38b7be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= +Date: Tue, 29 Sep 2020 14:16:00 +0200 +Subject: [PATCH] gui-wizard-gtk: Fix segfault + +Since show_error_as_msgbox() is specified as the custom logging handler +(via setting libreport_g_custom_logger), it will get called if an error +occurs in libreport_save_user_settings(). However, at that point, +g_wnd_assistant has already been destroyed, which leads to an invalid +read in show_error_as_msgbox(). + +This change unsets the custom logging handler after the GUI is destroyed +and adds an assertion in show_error_as_msgbox() checking that +g_wnd_assistant is not a null pointer. + +Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1883337 +--- + src/gui-wizard-gtk/main.c | 6 ++++-- + src/gui-wizard-gtk/wizard.c | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/gui-wizard-gtk/main.c b/src/gui-wizard-gtk/main.c +index e111948c..f094c5fb 100644 +--- a/src/gui-wizard-gtk/main.c ++++ b/src/gui-wizard-gtk/main.c +@@ -125,6 +125,7 @@ int main(int argc, char **argv) + /* List of events specified on the command line. */ + GList *user_event_list = NULL; + const char *prgname = "abrt"; ++ int ret = 0; + abrt_init(argv); + + /* I18n */ +@@ -217,13 +218,14 @@ int main(int argc, char **argv) + g_signal_connect(app, "startup", G_CALLBACK(startup_wizard), NULL); + + /* Enter main loop */ +- g_application_run(G_APPLICATION(app), argc, argv); ++ ret = g_application_run(G_APPLICATION(app), argc, argv); + g_object_unref(app); ++ libreport_g_custom_logger = NULL; + + if (opts & OPT_d) + delete_dump_dir_possibly_using_abrtd(g_dump_dir_name); + + libreport_save_user_settings(); + +- return 0; ++ return ret; + } +diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c +index 775b709f..c4a0b4c0 100644 +--- a/src/gui-wizard-gtk/wizard.c ++++ b/src/gui-wizard-gtk/wizard.c +@@ -360,6 +360,8 @@ struct dump_dir *wizard_open_directory_for_writing(const char *dump_dir_name) + + void show_error_as_msgbox(const char *msg) + { ++ g_return_if_fail(g_wnd_assistant != NULL); ++ + GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(g_wnd_assistant), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, +-- +2.26.2 + diff --git a/libreport.spec b/libreport.spec index adb9dba..b55d9f1 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,10 +15,13 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.13.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-gui-wizard-gtk-Fix-segfault.patch + BuildRequires: %{dbus_devel} BuildRequires: gtk3-devel BuildRequires: curl-devel @@ -743,6 +746,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Oct 07 2020 Matěj Grabovský - 2.13.1-5 +- Add fix for https://bugzilla.redhat.com/show_bug.cgi?id=1883337 + * Mon May 11 2020 Michal Fabik 2.13.1-2 - Fix broken abrt-vmcore.service due to bad namespacing