From b237998e526d864b25ea5cd417cb3f195bdd11b7 Mon Sep 17 00:00:00 2001 From: Jiri Date: Mon, 2 Apr 2012 13:19:06 +0200 Subject: [PATCH] fixed build of abrt-2.0.10 --- 0001-Add-cgroup-information-filename.patch | 39 ++++++++++++++++++++++ libreport.spec | 7 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-Add-cgroup-information-filename.patch diff --git a/0001-Add-cgroup-information-filename.patch b/0001-Add-cgroup-information-filename.patch new file mode 100644 index 0000000..73d6695 --- /dev/null +++ b/0001-Add-cgroup-information-filename.patch @@ -0,0 +1,39 @@ +From ea48d2cf5e703c4c72aa4c15aae72827d3da5d36 Mon Sep 17 00:00:00 2001 +From: Richard Marko +Date: Mon, 26 Mar 2012 14:37:04 +0200 +Subject: [PATCH 1/2] Add cgroup information filename + +Signed-off-by: Richard Marko +Signed-off-by: Nikola Pajkovsky +--- + src/include/internal_libreport.h | 1 + + src/lib/problem_data.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h +index 95b600b..d99d84c 100644 +--- a/src/include/internal_libreport.h ++++ b/src/include/internal_libreport.h +@@ -662,6 +662,7 @@ bool make_dir_recursive(char *dir, mode_t dir_mode); + #define FILENAME_BINARY "binary" + #define FILENAME_CMDLINE "cmdline" + #define FILENAME_COREDUMP "coredump" ++#define FILENAME_CGROUP "cgroup" + #define FILENAME_BACKTRACE "backtrace" + #define FILENAME_MAPS "maps" + #define FILENAME_SMAPS "smaps" +diff --git a/src/lib/problem_data.c b/src/lib/problem_data.c +index 2a7835a..536f7a1 100644 +--- a/src/lib/problem_data.c ++++ b/src/lib/problem_data.c +@@ -187,6 +187,7 @@ static const char *const editable_files[] = { + FILENAME_OPEN_FDS , /* user might want to hide sensitive file names */ + //FILENAME_LIMITS , + FILENAME_CMDLINE , ++ //FILENAME_CGROUP , + //FILENAME_COREDUMP , + FILENAME_BACKTRACE , + FILENAME_MAPS , +-- +1.7.9.3 + diff --git a/libreport.spec b/libreport.spec index ea43716..9955492 100644 --- a/libreport.spec +++ b/libreport.spec @@ -5,11 +5,12 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz +Patch0: 0001-Add-cgroup-information-filename.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -210,6 +211,7 @@ Plugin to report bugs into anonymous FTP site associated with ticketing system. %prep %setup -q +%patch0 -p1 -b .cgroups %build autoconf @@ -374,6 +376,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf %changelog +* Mon Apr 02 2012 Jiri Moskovcak 2.0.10-2 +- added cgroups filename define + * Tue Mar 26 2012 Jiri Moskovcak 2.0.10-1 - updated to latest upstream