From e3520fa484c63010bbc3ef0a490d01d1e28b770f Mon Sep 17 00:00:00 2001 From: Matej Habrnal Date: Mon, 28 Aug 2017 13:06:51 +0200 Subject: [PATCH 1/6] New version 2.10.4 Signed-off-by: Matej Habrnal --- .gitignore | 1 + ...uick-hack-to-fix-build-with-rpm-4.14.patch | 54 --------- abrt.spec | 114 ++++++++++++------ sources | 2 +- 4 files changed, 78 insertions(+), 93 deletions(-) delete mode 100644 0001-Quick-hack-to-fix-build-with-rpm-4.14.patch diff --git a/.gitignore b/.gitignore index ea3779c..5cab542 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.1.tar.gz /abrt-2.10.2.tar.gz /abrt-2.10.3.tar.gz +/abrt-2.10.4.tar.gz diff --git a/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch b/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch deleted file mode 100644 index ea52a98..0000000 --- a/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c01551e6e9fd293a3f40e481afe8c28e786fe632 Mon Sep 17 00:00:00 2001 -From: Panu Matilainen -Date: Fri, 11 Aug 2017 13:24:26 +0300 -Subject: [PATCH] Quick hack to fix build with rpm >= 4.14 - -1) rpm >= 4.14 no longer has rpmCheckTerminate() call, it cleans up - automatically on exit(). Note that "needing" rpmCheckTerminate() - means the code is buggy: it does not properly track and free - rpmdb iterators and/or rpmts handles. -2) pgpPubkeyFingerprint() now returns the actual fingerprint, the - key ID which it previously returned is now retrieved by - pgpPubkeyKeyID() - -If compatibility to older versions is needed, these will need -configure checks, left as an excercise for someone more familiar -with the abrt codebase. ---- - src/daemon/rpm.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c -index 36b36a91..011e44ca 100644 ---- a/src/daemon/rpm.c -+++ b/src/daemon/rpm.c -@@ -76,11 +76,14 @@ void rpm_destroy() - rpmFreeMacros(NULL); - rpmFreeRpmrc(); - -+/* rpm >= 4.14 handles this automatically on exit */ -+#if 0 - /* RPM doc says "clean up any open iterators and databases". - * Observed to eliminate these Berkeley DB warnings: - * "BDB2053 Freeing read locks for locker 0x1e0: 28718/139661746636736" - */ - rpmdbCheckTerminate(1); -+#endif - #endif - - list_free_with_free(list_fingerprints); -@@ -100,7 +103,11 @@ void rpm_load_gpgkey(const char* filename) - } - - uint8_t keyID[8]; -+#if 0 - if (pgpPubkeyFingerprint(pkt, pklen, keyID) == 0) -+#else -+ if (pgpPubkeyKeyID(pkt, pklen, keyID) == 0) -+#endif - { - char *fingerprint = pgpHexStr(keyID, sizeof(keyID)); - if (fingerprint != NULL) --- -2.14.0 - diff --git a/abrt.spec b/abrt.spec index 4002713..3d0ebe1 100644 --- a/abrt.spec +++ b/abrt.spec @@ -54,13 +54,13 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.1 +%define libreport_ver 2.9.2 %define satyr_ver 0.22 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.3 -Release: 6%{?dist} +Version: 2.10.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -72,9 +72,6 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta # don't remove this patch, packages in rawhide are not signed! Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch -# Hacks for RPM 4.14 support -Patch1: 0001-Quick-hack-to-fix-build-with-rpm-4.14.patch - # '%%autosetup -S git' -> git BuildRequires: git @@ -85,7 +82,7 @@ BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel #why? BuildRequires: file-devel -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: python3-devel BuildRequires: gettext BuildRequires: libxml2-devel @@ -116,7 +113,7 @@ Requires: systemd-units %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-python3 = %{version}-%{release} +Requires: python3-%{name} = %{version}-%{release} Requires(pre): shadow-utils Requires: python3-augeas Requires: python3-dbus @@ -259,7 +256,7 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: abrt-addon-kerneloops Requires: kexec-tools -Requires: abrt-python3 +Requires: python3-abrt Requires: python3-augeas %description addon-vmcore @@ -290,27 +287,33 @@ Provides: libreport-plugin-bodhi = %{version}-%{release} %description plugin-bodhi Search for a new updates in bodhi server. -%package addon-python +%package -n python2-abrt-addon Summary: %{name}'s addon for catching and analyzing Python exceptions Group: System Environment/Libraries -Requires: python Requires: %{name} = %{version}-%{release} Requires: systemd-python -Requires: abrt-python +Requires: python2-abrt +# Remove before F30 +Provides: abrt-addon-python = %{version}-%{release} +Provides: abrt-addon-python%{?_isa} = %{version}-%{release} +Obsoletes: abrt-addon-python < %{version}-%{release} -%description addon-python +%description -n python2-abrt-addon This package contains python hook and python analyzer plugin for handling uncaught exception in python programs. -%package addon-python3 +%package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions Group: System Environment/Libraries -Requires: python3 Requires: %{name} = %{version}-%{release} Requires: python3-systemd -Requires: abrt-python3 +Requires: python3-abrt +# Remove before F30 +Provides: abrt-addon-python3 = %{version}-%{release} +Provides: abrt-addon-python3%{?_isa} = %{version}-%{release} +Obsoletes: abrt-addon-python3 < %{version}-%{release} -%description addon-python3 +%description -n python3-abrt-addon This package contains python 3 hook and python analyzer plugin for handling uncaught exception in python 3 programs. @@ -350,7 +353,7 @@ Requires: %{name} = %{version}-%{release} Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release} Requires: abrt-dbus -Requires: abrt-python +Requires: python2-abrt Requires: abrt-addon-ccpp Requires: python-argh Requires: python2-argcomplete @@ -371,7 +374,7 @@ Requires: abrt-addon-pstoreoops Requires: abrt-addon-vmcore %endif Requires: abrt-addon-ccpp -Requires: abrt-addon-python3 +Requires: python3-abrt-addon Requires: abrt-addon-xorg %if 0%{?rhel} Requires: libreport-rhel >= %{libreport_ver} @@ -405,7 +408,7 @@ Requires: abrt-addon-pstoreoops Requires: abrt-addon-vmcore %endif Requires: abrt-addon-ccpp -Requires: abrt-addon-python3 +Requires: python3-abrt-addon Requires: abrt-addon-xorg # Default config of addon-ccpp requires gdb BuildRequires: gdb-headless @@ -455,7 +458,7 @@ ABRT DBus service which provides org.freedesktop.problems API on dbus and uses PolicyKit to authorize to access the problem data. -%package python +%package -n python2-abrt Summary: ABRT Python API Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} @@ -463,26 +466,35 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: dbus-python Requires: libreport-python +Requires: python-gobject +%{?python_provide:%python_provide python2-abrt} +# Remove before F30 +Provides: %{name}-python = %{version}-%{release} +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} BuildRequires: python-nose BuildRequires: python-sphinx BuildRequires: libreport-python -%description python +%description -n python2-abrt High-level API for querying, creating and manipulating problems handled by ABRT in Python. -%package python-doc +%package -n python2-abrt-doc Summary: ABRT Python API Documentation Group: Documentation BuildArch: noarch BuildRequires: python2-devel Requires: %{name} = %{version}-%{release} -Requires: %{name}-python = %{version}-%{release} +Requires: python2-abrt = %{version}-%{release} +# Remove before F30 +Provides: %{name}-python-doc = %{version}-%{release} +Obsoletes: %{name}-python-doc < %{version}-%{release} -%description python-doc +%description -n python2-abrt-doc Examples and documentation for ABRT Python API. -%package python3 +%package -n python3-abrt Summary: ABRT Python 3 API Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} @@ -490,23 +502,32 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-dbus Requires: libreport-python3 +Requires: python3-gobject +%{?python_provide:%python_provide python3-abrt} +# Remove before F30 +Provides: %{name}-python3 = %{version}-%{release} +Provides: %{name}-python3%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python3 < %{version}-%{release} BuildRequires: python3-nose BuildRequires: python3-sphinx BuildRequires: libreport-python3 -%description python3 +%description -n python3-abrt High-level API for querying, creating and manipulating problems handled by ABRT in Python 3. -%package python3-doc +%package -n python3-abrt-doc Summary: ABRT Python API Documentation Group: Documentation BuildArch: noarch BuildRequires: python3-devel Requires: %{name} = %{version}-%{release} -Requires: %{name}-python3 = %{version}-%{release} +Requires: python3-%{name} = %{version}-%{release} +# Remove before F30 +Provides: %{name}-python3-doc = %{version}-%{release} +Obsoletes: %{name}-python3-doc < %{version}-%{release} -%description python3-doc +%description -n python3-abrt-doc Examples and documentation for ABRT Python 3 API. %package console-notification @@ -613,10 +634,10 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %systemd_post abrt-xorg.service %journal_catalog_update -%post addon-python +%post -n python2-abrt-addon %journal_catalog_update -%post addon-python3 +%post -n python3-abrt-addon %journal_catalog_update %if %{?have_kexec_tools} == 1 @@ -1037,7 +1058,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-harvest-pstoreoops.1* %{_mandir}/man1/abrt-merge-pstoreoops.1* -%files addon-python +%files -n python2-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf %{_datadir}/%{name}/conf.d/plugins/python.conf %{_mandir}/man5/abrt-python.conf.5* @@ -1049,7 +1070,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{python_sitearch}/abrt*.py* %{python_sitearch}/abrt.pth -%files addon-python3 +%files -n python3-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf %{_datadir}/%{name}/conf.d/plugins/python3.conf %{_mandir}/man5/abrt-python3.conf.5* @@ -1130,24 +1151,41 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.css %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf -%files python +%files -n python2-abrt %{python_sitearch}/problem/ %{_mandir}/man5/abrt-python.5* -%files python-doc +%files -n python2-abrt-doc %{python_sitelib}/problem_examples -%files python3 +%files -n python3-abrt %{python3_sitearch}/problem/ %{_mandir}/man5/abrt-python3.5* -%files python3-doc +%files -n python3-abrt-doc %{python3_sitelib}/problem_examples %files console-notification %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Aug 28 2017 Matej Habrnal 2.10.4-1 +- Translation updates +- logging: rename log() to log_warning() +- Quick hack to fix build with rpm >= 4.14 +- cli,dbus: Allow polkit to be optional at build time +- spec: add dependency for python{3}-gobject +- a-d-journal-core: fix bad condition in creating reason msg +- a-d-journal-core: use pid of crashed process in dumpdir name +- changelog: update CHANGELOG.md + +* Wed Aug 16 2017 Zbigniew Jędrzejewski-Szmek - 2.10.3-7 +- Python 2 binary package renamed to python2-abrt + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 +- Python 3 binary package renamed to python3-abrt +- Add-on packages renamed to python[23]-abrt-addon +- Documentation packages renamed to python[23]-abrt-doc + * Fri Aug 11 2017 Igor Gnatenko - 2.10.3-6 - Rebuilt after RPM update (№ 3) diff --git a/sources b/sources index 8ac10eb..3c2b8b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.3.tar.gz) = dac86703c60f1b56b8cfa7b2e400f5165a0ee9bd457667dec71981f9475b35552c80d5c5864de22414d83f4ce8ea29300d299f36e7fe4eb77a80112d6a1852ab +SHA512 (abrt-2.10.4.tar.gz) = f87fa0592867ef9c8543f066ffd9a0595941c14b4b0420746ebd7ca9e1335d45f0323d2e299778171031f0537e0e8da3dcfd33e3e6adae1cd76e33af7b131504 From be6c94e4f1a9c50982abbc953d3e3bfb4877cd9e Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Wed, 30 Aug 2017 15:01:07 +0200 Subject: [PATCH 2/6] Fix log renaming to log_warning Signed-off-by: Martin Kutlak --- ...ng-rename-omitted-log-to-log_warning.patch | 70 +++++++++++++++++++ abrt.spec | 6 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 0001-logging-rename-omitted-log-to-log_warning.patch diff --git a/0001-logging-rename-omitted-log-to-log_warning.patch b/0001-logging-rename-omitted-log-to-log_warning.patch new file mode 100644 index 0000000..0a447e5 --- /dev/null +++ b/0001-logging-rename-omitted-log-to-log_warning.patch @@ -0,0 +1,70 @@ +From c9915e40c85d91d7434557419a5f9fde160e1e07 Mon Sep 17 00:00:00 2001 +From: Martin Kutlak +Date: Wed, 30 Aug 2017 11:16:15 +0200 +Subject: [PATCH] logging: rename omitted log() to log_warning() + +Some of the log() functions were omitted in commit f33b8731efedd7382e4f11d83e618a06d92a23ab. + +Signed-off-by: Martin Kutlak +--- + src/daemon/abrt-handle-upload.in | 2 +- + src/plugins/abrt-action-find-bodhi-update | 2 +- + src/plugins/abrt-action-install-debuginfo.in | 2 +- + src/plugins/abrt-action-ureport | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/daemon/abrt-handle-upload.in b/src/daemon/abrt-handle-upload.in +index f31d3a1..469c2ae 100755 +--- a/src/daemon/abrt-handle-upload.in ++++ b/src/daemon/abrt-handle-upload.in +@@ -12,7 +12,7 @@ import shutil + import datetime + import grp + +-from reportclient import set_verbosity, error_msg_and_die, error_msg, log ++from reportclient import set_verbosity, error_msg_and_die, error_msg, log_warning + + GETTEXT_PROGNAME = "abrt" + import locale +diff --git a/src/plugins/abrt-action-find-bodhi-update b/src/plugins/abrt-action-find-bodhi-update +index 3bb96fc..0cae6cc 100755 +--- a/src/plugins/abrt-action-find-bodhi-update ++++ b/src/plugins/abrt-action-find-bodhi-update +@@ -40,7 +40,7 @@ import sys + from argparse import ArgumentParser + from subprocess import Popen, PIPE + +-from reportclient import (_, log, log1, set_verbosity, verbose, RETURN_OK, ++from reportclient import (_, log_warning, log1, set_verbosity, verbose, RETURN_OK, + RETURN_FAILURE, error_msg) + import report + +diff --git a/src/plugins/abrt-action-install-debuginfo.in b/src/plugins/abrt-action-install-debuginfo.in +index f2abf43..6269c22 100644 +--- a/src/plugins/abrt-action-install-debuginfo.in ++++ b/src/plugins/abrt-action-install-debuginfo.in +@@ -11,7 +11,7 @@ import errno + import getopt + import reportclient + from subprocess import Popen, PIPE +-from reportclient import verbose, log, log1, log2, set_verbosity, error_msg_and_die, error_msg ++from reportclient import verbose, log_warning, log1, log2, set_verbosity, error_msg_and_die, error_msg + import time + from reportclient.debuginfo import DebugInfoDownload, filter_installed_debuginfos, build_ids_to_path, clean_up + import problem +diff --git a/src/plugins/abrt-action-ureport b/src/plugins/abrt-action-ureport +index a7484c8..089eeb0 100755 +--- a/src/plugins/abrt-action-ureport ++++ b/src/plugins/abrt-action-ureport +@@ -11,7 +11,7 @@ import getopt + import augeas + + from report import dd_opendir, DD_FAIL_QUIETLY_ENOENT, run_event_on_problem_dir +-from reportclient import set_verbosity, error_msg_and_die, error_msg, log1, log ++from reportclient import set_verbosity, error_msg_and_die, error_msg, log1, log_warning + + GETTEXT_PROGNAME = "abrt" + import locale +-- +2.9.5 + diff --git a/abrt.spec b/abrt.spec index 3d0ebe1..3ff8a66 100644 --- a/abrt.spec +++ b/abrt.spec @@ -60,7 +60,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.10.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -71,6 +71,7 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta # don't remove this patch, packages in rawhide are not signed! Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch +Patch1: 0001-logging-rename-omitted-log-to-log_warning.patch # '%%autosetup -S git' -> git BuildRequires: git @@ -1169,6 +1170,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Aug 30 2017 Martin Kutlak 2.10.4-2 +- logging: rename omitted log() to log_warning() + * Mon Aug 28 2017 Matej Habrnal 2.10.4-1 - Translation updates - logging: rename log() to log_warning() From e0d4436c017c372f9c2d83d804ac8fca1f78e97b Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Wed, 27 Sep 2017 10:31:22 +0200 Subject: [PATCH 3/6] Drop GPG check patch for unsigned packages Resolves#1449718 Signed-off-by: Martin Kutlak --- abrt.spec | 7 +++--- disable-OpenGPGCheck-in-Fedora-Rawhide.patch | 26 -------------------- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 disable-OpenGPGCheck-in-Fedora-Rawhide.patch diff --git a/abrt.spec b/abrt.spec index 3ff8a66..4ffaf03 100644 --- a/abrt.spec +++ b/abrt.spec @@ -60,7 +60,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.10.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -69,8 +69,6 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta # git format-patch %%{Version} --topo-order -N -M; # i=1; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done -# don't remove this patch, packages in rawhide are not signed! -Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch Patch1: 0001-logging-rename-omitted-log-to-log_warning.patch # '%%autosetup -S git' -> git @@ -1170,6 +1168,9 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Sep 27 2017 Martin Kutlak 2.10.4-3 +- Drop GPG check patch for unsigned packages + * Wed Aug 30 2017 Martin Kutlak 2.10.4-2 - logging: rename omitted log() to log_warning() diff --git a/disable-OpenGPGCheck-in-Fedora-Rawhide.patch b/disable-OpenGPGCheck-in-Fedora-Rawhide.patch deleted file mode 100644 index f88c86d..0000000 --- a/disable-OpenGPGCheck-in-Fedora-Rawhide.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1ef034096efe367af85f568bc982af969124003b Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Mon, 10 Feb 2014 09:39:07 +0100 -Subject: [PATCH] disable OpenGPGCheck in Fedora Rawhide - -Packages in Fedora Rawhide are not signed. ---- - src/daemon/abrt-action-save-package-data.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/abrt-action-save-package-data.conf b/src/daemon/abrt-action-save-package-data.conf -index 3d35bb6..e3f724a 100644 ---- a/src/daemon/abrt-action-save-package-data.conf -+++ b/src/daemon/abrt-action-save-package-data.conf -@@ -3,7 +3,7 @@ - # Product Signing (GPG) Keys: - # https://access.redhat.com/security/team/key - # --OpenGPGCheck = yes -+OpenGPGCheck = no - - # Blacklisted packages - # --- -1.8.3.1 - From fa1f789e674a42da794d40192850319cbcf9c809 Mon Sep 17 00:00:00 2001 From: Julius Milan Date: Fri, 3 Nov 2017 08:55:06 +0100 Subject: [PATCH 4/6] New version 2.10.5 Signed-off-by: Julius Milan --- .gitignore | 1 + ...ng-rename-omitted-log-to-log_warning.patch | 70 ------------------- abrt.spec | 27 ++++--- sources | 2 +- 4 files changed, 21 insertions(+), 79 deletions(-) delete mode 100644 0001-logging-rename-omitted-log-to-log_warning.patch diff --git a/.gitignore b/.gitignore index 5cab542..1d4a538 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.2.tar.gz /abrt-2.10.3.tar.gz /abrt-2.10.4.tar.gz +/abrt-2.10.5.tar.gz diff --git a/0001-logging-rename-omitted-log-to-log_warning.patch b/0001-logging-rename-omitted-log-to-log_warning.patch deleted file mode 100644 index 0a447e5..0000000 --- a/0001-logging-rename-omitted-log-to-log_warning.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c9915e40c85d91d7434557419a5f9fde160e1e07 Mon Sep 17 00:00:00 2001 -From: Martin Kutlak -Date: Wed, 30 Aug 2017 11:16:15 +0200 -Subject: [PATCH] logging: rename omitted log() to log_warning() - -Some of the log() functions were omitted in commit f33b8731efedd7382e4f11d83e618a06d92a23ab. - -Signed-off-by: Martin Kutlak ---- - src/daemon/abrt-handle-upload.in | 2 +- - src/plugins/abrt-action-find-bodhi-update | 2 +- - src/plugins/abrt-action-install-debuginfo.in | 2 +- - src/plugins/abrt-action-ureport | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/daemon/abrt-handle-upload.in b/src/daemon/abrt-handle-upload.in -index f31d3a1..469c2ae 100755 ---- a/src/daemon/abrt-handle-upload.in -+++ b/src/daemon/abrt-handle-upload.in -@@ -12,7 +12,7 @@ import shutil - import datetime - import grp - --from reportclient import set_verbosity, error_msg_and_die, error_msg, log -+from reportclient import set_verbosity, error_msg_and_die, error_msg, log_warning - - GETTEXT_PROGNAME = "abrt" - import locale -diff --git a/src/plugins/abrt-action-find-bodhi-update b/src/plugins/abrt-action-find-bodhi-update -index 3bb96fc..0cae6cc 100755 ---- a/src/plugins/abrt-action-find-bodhi-update -+++ b/src/plugins/abrt-action-find-bodhi-update -@@ -40,7 +40,7 @@ import sys - from argparse import ArgumentParser - from subprocess import Popen, PIPE - --from reportclient import (_, log, log1, set_verbosity, verbose, RETURN_OK, -+from reportclient import (_, log_warning, log1, set_verbosity, verbose, RETURN_OK, - RETURN_FAILURE, error_msg) - import report - -diff --git a/src/plugins/abrt-action-install-debuginfo.in b/src/plugins/abrt-action-install-debuginfo.in -index f2abf43..6269c22 100644 ---- a/src/plugins/abrt-action-install-debuginfo.in -+++ b/src/plugins/abrt-action-install-debuginfo.in -@@ -11,7 +11,7 @@ import errno - import getopt - import reportclient - from subprocess import Popen, PIPE --from reportclient import verbose, log, log1, log2, set_verbosity, error_msg_and_die, error_msg -+from reportclient import verbose, log_warning, log1, log2, set_verbosity, error_msg_and_die, error_msg - import time - from reportclient.debuginfo import DebugInfoDownload, filter_installed_debuginfos, build_ids_to_path, clean_up - import problem -diff --git a/src/plugins/abrt-action-ureport b/src/plugins/abrt-action-ureport -index a7484c8..089eeb0 100755 ---- a/src/plugins/abrt-action-ureport -+++ b/src/plugins/abrt-action-ureport -@@ -11,7 +11,7 @@ import getopt - import augeas - - from report import dd_opendir, DD_FAIL_QUIETLY_ENOENT, run_event_on_problem_dir --from reportclient import set_verbosity, error_msg_and_die, error_msg, log1, log -+from reportclient import set_verbosity, error_msg_and_die, error_msg, log1, log_warning - - GETTEXT_PROGNAME = "abrt" - import locale --- -2.9.5 - diff --git a/abrt.spec b/abrt.spec index 4ffaf03..fab1d0a 100644 --- a/abrt.spec +++ b/abrt.spec @@ -54,13 +54,13 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.2 -%define satyr_ver 0.22 +%define libreport_ver 2.9.3 +%define satyr_ver 0.24 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.4 -Release: 3%{?dist} +Version: 2.10.5 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -69,8 +69,6 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta # git format-patch %%{Version} --topo-order -N -M; # i=1; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done -Patch1: 0001-logging-rename-omitted-log-to-log_warning.patch - # '%%autosetup -S git' -> git BuildRequires: git @@ -465,7 +463,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: dbus-python Requires: libreport-python -Requires: python-gobject +Requires: python2-gobject-base %{?python_provide:%python_provide python2-abrt} # Remove before F30 Provides: %{name}-python = %{version}-%{release} @@ -501,12 +499,12 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-dbus Requires: libreport-python3 -Requires: python3-gobject %{?python_provide:%python_provide python3-abrt} # Remove before F30 Provides: %{name}-python3 = %{version}-%{release} Provides: %{name}-python3%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python3 < %{version}-%{release} +Requires: python3-gobject-base BuildRequires: python3-nose BuildRequires: python3-sphinx BuildRequires: libreport-python3 @@ -1168,6 +1166,19 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Nov 02 2017 Julius Milan 2.10.5-1 +- Translation updates +- a-action-ureport: add option 'ProcessUnpackaged' +- spec: change dependency on python{2,3}-gobject +- applet: Additional changes to allow optional polkit +- doc: remove obsolete doxygen tags +- dbus: Additional changes to allow optional polkit +- cli-ng: Explicitly state python version in shebangs +- spec: rename python binary packages +- a-d-journal-core: Save mountinfo from journal +- a-d-journal-core: Save container cmdline +- logging: rename omitted log() to log_warning() + * Wed Sep 27 2017 Martin Kutlak 2.10.4-3 - Drop GPG check patch for unsigned packages diff --git a/sources b/sources index 3c2b8b9..fab8148 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.4.tar.gz) = f87fa0592867ef9c8543f066ffd9a0595941c14b4b0420746ebd7ca9e1335d45f0323d2e299778171031f0537e0e8da3dcfd33e3e6adae1cd76e33af7b131504 +SHA512 (abrt-2.10.5.tar.gz) = 6e334b045efa18f8200447eb142f54d4f68b39d5a470c30b7272778a3ab22c1b55c222fae8657d86e6c78dfd3070f3ddb68f25ee6ca5ca0be4c5463239cbf0ef From bcf6f2279b3edd2df21fbe90241d1aad1599affd Mon Sep 17 00:00:00 2001 From: Matej Habrnal Date: Wed, 21 Feb 2018 16:55:05 +0100 Subject: [PATCH 5/6] New version 2.10.6 Signed-off-by: Matej Habrnal --- .gitignore | 1 + ...er-workaround-permission-issue-in-mi.patch | 76 +++++++++++++++++++ abrt.spec | 28 ++++++- sources | 2 +- 4 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 0001-a-container-logger-workaround-permission-issue-in-mi.patch diff --git a/.gitignore b/.gitignore index 1d4a538..3830f87 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.3.tar.gz /abrt-2.10.4.tar.gz /abrt-2.10.5.tar.gz +/abrt-2.10.6.tar.gz diff --git a/0001-a-container-logger-workaround-permission-issue-in-mi.patch b/0001-a-container-logger-workaround-permission-issue-in-mi.patch new file mode 100644 index 0000000..1dcef9e --- /dev/null +++ b/0001-a-container-logger-workaround-permission-issue-in-mi.patch @@ -0,0 +1,76 @@ +From 578317a67c0f30469c28752ea2f40ae87a1a356c Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Wed, 21 Feb 2018 16:14:36 +0100 +Subject: [PATCH] a-container-logger: workaround permission issue in minishift + +This workarounds the following issue: +https://github.com/minishift/minishift/issues/2058 + +Signed-off-by: Matej Habrnal +--- + src/plugins/abrt-container-logger.c | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/abrt-container-logger.c b/src/plugins/abrt-container-logger.c +index 2f9488a3..df40f562 100644 +--- a/src/plugins/abrt-container-logger.c ++++ b/src/plugins/abrt-container-logger.c +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #define INIT_PROC_STDERR_FD_PATH "/proc/1/fd/2" + +@@ -25,7 +26,6 @@ int main(int argc, char *argv[]) + "\n" + "\nThe tool reads from standard input and writes to '"INIT_PROC_STDERR_FD_PATH"'"; + +- /* the tool expects one parameter STR */ + if (argc > 1) + { + fprintf(stderr, "%s\n", program_usage_string); +@@ -35,9 +35,27 @@ int main(int argc, char *argv[]) + FILE *f = fopen(INIT_PROC_STDERR_FD_PATH, "w"); + if (f == NULL) + { +- perror("Failed to open '"INIT_PROC_STDERR_FD_PATH"'"); +- return 2; ++ perror("Failed to open '"INIT_PROC_STDERR_FD_PATH"' as root"); ++ ++ /* Try to open the 'INIT_PROC_STDERR_FD_PATH' as normal user because of ++ https://github.com/minishift/minishift/issues/2058 ++ */ ++ if (seteuid(getuid()) == 0) ++ { ++ f = fopen(INIT_PROC_STDERR_FD_PATH, "w"); ++ if (f == NULL) ++ { ++ perror("Failed to open '"INIT_PROC_STDERR_FD_PATH"' as user"); ++ return 2; ++ } ++ } ++ else ++ { ++ perror("Failed to setuid"); ++ return 3; ++ } + } ++ + setvbuf (f, NULL, _IONBF, 0); + + char buffer[BUFSIZ]; +@@ -52,7 +70,8 @@ int main(int argc, char *argv[]) + if (fwrite(buffer, bytes_read, 1, f) != 1) + { + perror("Failed to write to '"INIT_PROC_STDERR_FD_PATH"'"); +- return 3; ++ fclose(f); ++ return 4; + } + } + fclose(f); +-- +2.14.3 + diff --git a/abrt.spec b/abrt.spec index fab1d0a..32442d4 100644 --- a/abrt.spec +++ b/abrt.spec @@ -59,8 +59,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.5 -Release: 1%{?dist} +Version: 2.10.6 +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -314,6 +314,14 @@ Obsoletes: abrt-addon-python3 < %{version}-%{release} This package contains python 3 hook and python analyzer plugin for handling uncaught exception in python 3 programs. +%package -n python3-abrt-container-addon +Summary: %{name}'s container addon for catching Python 3 exceptions +Conflicts: python3-abrt-addon + +%description -n python3-abrt-container-addon +This package contains python 3 hook and handling uncaught exception in python 3 +programs in container. + %package plugin-sosreport Summary: %{name}'s plugin for building automatic sosreports Requires: sos @@ -1075,8 +1083,15 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_journalcatalogdir}/abrt_python3.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %{_mandir}/man5/python3_event.conf.5* -%{python3_sitearch}/abrt* -%{python3_sitearch}/__pycache__/abrt* +%{python3_sitearch}/abrt3.pth +%{python3_sitearch}/abrt_exception_handler3.py +%{python3_sitearch}/__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.* +%attr(6755, root, root) %{_libexecdir}/abrt-container-logger %files plugin-sosreport %defattr(-,root,root,-) @@ -1166,6 +1181,11 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Feb 19 2018 Matej Habrnal 2.10.6-2 +- Translation updates +- hooks: introduce docker hook for Python3 +- a-h-event: Do not deduplicate different containers + * Thu Nov 02 2017 Julius Milan 2.10.5-1 - Translation updates - a-action-ureport: add option 'ProcessUnpackaged' diff --git a/sources b/sources index fab8148..8467ed0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.5.tar.gz) = 6e334b045efa18f8200447eb142f54d4f68b39d5a470c30b7272778a3ab22c1b55c222fae8657d86e6c78dfd3070f3ddb68f25ee6ca5ca0be4c5463239cbf0ef +SHA512 (abrt-2.10.6.tar.gz) = 4c47aec3ace8033be954cc75f500d7394a77a3dd2511cabbe1706615907d4d6a4f89da1aec6d4ebc9519e47058ae139fbac40eab47048572a34ea52da528f700 From c4735a58d52013601921c14a404d4697e2c9ced4 Mon Sep 17 00:00:00 2001 From: Matej Habrnal Date: Mon, 26 Feb 2018 15:27:37 +0100 Subject: [PATCH 6/6] New version 2.10.7 Signed-off-by: Matej Habrnal --- .gitignore | 1 + ...er-workaround-permission-issue-in-mi.patch | 76 ------------------- abrt.spec | 23 +++++- sources | 2 +- 4 files changed, 22 insertions(+), 80 deletions(-) delete mode 100644 0001-a-container-logger-workaround-permission-issue-in-mi.patch diff --git a/.gitignore b/.gitignore index 3830f87..89a39ce 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.4.tar.gz /abrt-2.10.5.tar.gz /abrt-2.10.6.tar.gz +/abrt-2.10.7.tar.gz diff --git a/0001-a-container-logger-workaround-permission-issue-in-mi.patch b/0001-a-container-logger-workaround-permission-issue-in-mi.patch deleted file mode 100644 index 1dcef9e..0000000 --- a/0001-a-container-logger-workaround-permission-issue-in-mi.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 578317a67c0f30469c28752ea2f40ae87a1a356c Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -Date: Wed, 21 Feb 2018 16:14:36 +0100 -Subject: [PATCH] a-container-logger: workaround permission issue in minishift - -This workarounds the following issue: -https://github.com/minishift/minishift/issues/2058 - -Signed-off-by: Matej Habrnal ---- - src/plugins/abrt-container-logger.c | 27 +++++++++++++++++++++++---- - 1 file changed, 23 insertions(+), 4 deletions(-) - -diff --git a/src/plugins/abrt-container-logger.c b/src/plugins/abrt-container-logger.c -index 2f9488a3..df40f562 100644 ---- a/src/plugins/abrt-container-logger.c -+++ b/src/plugins/abrt-container-logger.c -@@ -15,6 +15,7 @@ - - #include - #include -+#include - - #define INIT_PROC_STDERR_FD_PATH "/proc/1/fd/2" - -@@ -25,7 +26,6 @@ int main(int argc, char *argv[]) - "\n" - "\nThe tool reads from standard input and writes to '"INIT_PROC_STDERR_FD_PATH"'"; - -- /* the tool expects one parameter STR */ - if (argc > 1) - { - fprintf(stderr, "%s\n", program_usage_string); -@@ -35,9 +35,27 @@ int main(int argc, char *argv[]) - FILE *f = fopen(INIT_PROC_STDERR_FD_PATH, "w"); - if (f == NULL) - { -- perror("Failed to open '"INIT_PROC_STDERR_FD_PATH"'"); -- return 2; -+ perror("Failed to open '"INIT_PROC_STDERR_FD_PATH"' as root"); -+ -+ /* Try to open the 'INIT_PROC_STDERR_FD_PATH' as normal user because of -+ https://github.com/minishift/minishift/issues/2058 -+ */ -+ if (seteuid(getuid()) == 0) -+ { -+ f = fopen(INIT_PROC_STDERR_FD_PATH, "w"); -+ if (f == NULL) -+ { -+ perror("Failed to open '"INIT_PROC_STDERR_FD_PATH"' as user"); -+ return 2; -+ } -+ } -+ else -+ { -+ perror("Failed to setuid"); -+ return 3; -+ } - } -+ - setvbuf (f, NULL, _IONBF, 0); - - char buffer[BUFSIZ]; -@@ -52,7 +70,8 @@ int main(int argc, char *argv[]) - if (fwrite(buffer, bytes_read, 1, f) != 1) - { - perror("Failed to write to '"INIT_PROC_STDERR_FD_PATH"'"); -- return 3; -+ fclose(f); -+ return 4; - } - } - fclose(f); --- -2.14.3 - diff --git a/abrt.spec b/abrt.spec index 32442d4..d3df71f 100644 --- a/abrt.spec +++ b/abrt.spec @@ -59,8 +59,8 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.6 -Release: 2%{?dist} +Version: 2.10.7 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -299,6 +299,14 @@ Obsoletes: abrt-addon-python < %{version}-%{release} This package contains python hook and python analyzer plugin for handling uncaught exception in python programs. +%package -n python2-abrt-container-addon +Summary: %{name}'s container addon for catching Python 2 exceptions +Conflicts: python2-abrt-addon + +%description -n python2-abrt-container-addon +This package contains python 2 hook and handling uncaught exception in python 2 +programs in container. + %package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions Group: System Environment/Libraries @@ -1072,8 +1080,13 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_journalcatalogdir}/abrt_python.catalog %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python_format.conf %{_mandir}/man5/python_event.conf.5* -%{python_sitearch}/abrt*.py* %{python_sitearch}/abrt.pth +%{python_sitearch}/abrt_exception_handler.* + +%files -n python2-abrt-container-addon +%{python_sitearch}/abrt_container.pth +%{python_sitearch}/abrt_exception_handler_container.* +%attr(6755, root, root) %{_libexecdir}/abrt-container-logger-python2 %files -n python3-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf @@ -1181,6 +1194,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Feb 26 2018 Matej Habrnal 2.10.7-1 +- Translation updates +- hooks: introduce docker hook for Python2 + * Mon Feb 19 2018 Matej Habrnal 2.10.6-2 - Translation updates - hooks: introduce docker hook for Python3 diff --git a/sources b/sources index 8467ed0..6988f43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.6.tar.gz) = 4c47aec3ace8033be954cc75f500d7394a77a3dd2511cabbe1706615907d4d6a4f89da1aec6d4ebc9519e47058ae139fbac40eab47048572a34ea52da528f700 +SHA512 (abrt-2.10.7.tar.gz) = 3db4ee8554906137c8ecbdf9c64e310fbfb2673a4c5df6211750616ba65156c3c133fc04c4b93c277f80e3cee0078de3773884273d4a80b5b64de9d599e3c780