diff --git a/SOURCES/0028-dirsize-Skip-dirs-in-which-sosreport-is-being-genera.patch b/SOURCES/0028-dirsize-Skip-dirs-in-which-sosreport-is-being-genera.patch new file mode 100644 index 0000000..1b6378b --- /dev/null +++ b/SOURCES/0028-dirsize-Skip-dirs-in-which-sosreport-is-being-genera.patch @@ -0,0 +1,41 @@ +From 0b37412bc975d6e043c34dbff379029fd94a1758 Mon Sep 17 00:00:00 2001 +From: Martin Kutlak +Date: Wed, 14 Aug 2019 14:46:08 +0000 +Subject: [PATCH] dirsize: Skip dirs in which sosreport is being generated + +With these changes ABRT will skip directories in which sosreport is running +and won't delete them when MaxCrashReportSize limit is exceeded. + +I had a concern about the size of the logs that sosreport collects but +there is a limit set by sosreport for how big the individual logs can +be and the default value is 25MiB. + +Fixes: rhbz#1671232 + +Signed-off-by: Martin Kutlak + + +(cherry picked from commit eef59d2358cf63338f38727c5d08be70619e4e55) +--- + src/lib/dirsize.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lib/dirsize.c b/src/lib/dirsize.c +index 6d96e71..7ee9752 100644 +--- a/src/lib/dirsize.c ++++ b/src/lib/dirsize.c +@@ -91,6 +91,11 @@ double get_dirsize_find_largest_dir( + if (dot_or_dotdot(ep->d_name)) + continue; + char *dname = concat_path_file(pPath, ep->d_name); ++ if (lstat(concat_path_file(dname, "sosreport.log"), &statbuf) == 0) ++ { ++ log_debug("Skipping %s': sosreport is being generated.", dname); ++ goto next; ++ } + if (lstat(dname, &statbuf) != 0) + { + goto next; +-- +2.26.0 + diff --git a/SPECS/libreport.spec b/SPECS/libreport.spec index b646137..593b84a 100644 --- a/SPECS/libreport.spec +++ b/SPECS/libreport.spec @@ -29,7 +29,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.9.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -63,7 +63,9 @@ Patch0024: 0024-lib-fix-a-SEGV-in-list_possible_events.patch Patch0025: 0025-report-client-Find-debuginfos-in-own-method.patch Patch0026: 0026-reportclient-Find-and-download-required-debuginfo-pa.patch Patch0027: 0027-reportclient-Search-for-required-packages-recursivel.patch -#git format-patch -N --start-number=28 c0d0e59d +# git format-patch --no-numbered --start-number=28 --topo-order 2.9.5-10.el8 +Patch0028: 0028-dirsize-Skip-dirs-in-which-sosreport-is-being-genera.patch +# git format-patch --no-numbered --start-number=28 --topo-order 2.9.5-11.el8 # autogen.sh is need to regenerate all the Makefile files Patch9000: 9000-Add-autogen.sh.patch @@ -850,13 +852,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Apr 16 2020 Ernestas Kulik - 2.9.5-11 +- Add patch for #1822092 + * Tue Jan 21 2020 Martin Kutlak - 2.9.5-10 - reportclient: Search for required packages recursively - reportclient: Find and download required debuginfo packages - report-client: Find debuginfos in own method - Resolves: rhbz#1783897 -* Fri Jul 29 2019 Martin Kutlak - 2.9.5-9 +* Mon Jul 29 2019 Martin Kutlak - 2.9.5-9 - lib: fix a SEGV in list_possible_events() - Resolves: rhbz#1733515