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