rpms/abrt
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow rpm to be optional at build time and bug fixes

Browse source 
Resolves #1413637, #1413451

Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
This commit is contained in:
Matej Habrnal 2017-01-18 10:53:54 +01:00
commit 345ed6c98e
7 changed files with 666 additions and 1669 deletions
Download patch file Download diff file Expand all files Collapse all files

27
0001-doc-document-selinux-change-needed-for-automatic-del.patch Normal file
View file

@ -0,0 +1,27 @@
From bcb90c417ef0dc0b7f80eb82d98ac92dfee7c4b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 15 Dec 2016 15:29:03 +0100
Subject: [PATCH] doc: document selinux change needed for automatic deletion of
reports
---
src/daemon/abrt.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/daemon/abrt.conf b/src/daemon/abrt.conf
index 34570ea..6d1660e 100644
--- a/src/daemon/abrt.conf
+++ b/src/daemon/abrt.conf
@@ -17,7 +17,8 @@ MaxCrashReportsSize = 5000
#DumpLocation = /var/spool/abrt
# If you want to automatically clean the upload directory you have to tweak the
-# selinux policy.
+# selinux policy:
+# # setsebool -P abrt_anon_write 1
#
DeleteUploaded = no
--
2.9.3

248
0003-remove-Buildroot-and-Groups-tags.patch Normal file
View file

@ -0,0 +1,248 @@
From 38c340677f103b3784dc62b7934660b13aed0249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 15 Dec 2016 17:02:38 +0100
Subject: [PATCH] remove Buildroot and Groups tags
not used any more, see
https://fedoraproject.org/wiki/EPEL:Packaging
---
abrt.spec.in | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/abrt.spec.in b/abrt.spec.in
index 4f041d5..b198a85 100644
--- a/abrt.spec.in
+++ b/abrt.spec.in
@@ -62,7 +62,6 @@ Name: abrt
Version: @PACKAGE_VERSION@
Release: 1%{?dist}
License: GPLv2+
-Group: Applications/System
URL: https://abrt.readthedocs.org/
Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
BuildRequires: %{dbus_devel}
@@ -106,7 +105,6 @@ Requires: dbus-1-glib
%if %{with systemd}
Requires: %{systemd_units}
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-python3 = %{version}-%{release}
Requires(pre): %{shadow_utils}
@@ -128,14 +126,12 @@ It uses plugin system to extend its functionality.
%package libs
Summary: Libraries for %{name}
-Group: System Environment/Libraries
%description libs
Libraries for %{name}.
%package devel
Summary: Development libraries for %{name}
-Group: Development/Libraries
Requires: abrt-libs = %{version}-%{release}
%description devel
@@ -143,14 +139,12 @@ Development libraries and headers for %{name}.
%package gui-libs
Summary: Libraries for %{name}-gui
-Group: System Environment/Libraries
%description gui-libs
Libraries for %{name}-gui.
%package gui-devel
Summary: Development libraries for %{name}-gui
-Group: Development/Libraries
Requires: abrt-gui-libs = %{version}-%{release}
%description gui-devel
@@ -158,7 +152,6 @@ Development libraries and headers for %{name}-gui.
%package gui
Summary: %{name}'s gui
-Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires: %{name}-dbus = %{version}-%{release}
Requires: gnome-abrt
@@ -177,7 +170,6 @@ GTK+ wizard for convenient bug reporting.
%package addon-coredump-helper
Summary: %{name}'s /proc/sys/kernel/core_pattern helper
-Group: System Environment/Libraries
Requires: abrt-libs = %{version}-%{release}
%description addon-coredump-helper
@@ -185,7 +177,6 @@ This package contains hook for C/C++ crashed programs.
%package addon-ccpp
Summary: %{name}'s C/C++ addon
-Group: System Environment/Libraries
Requires: cpio
BuildRequires: gdb-headless
BuildRequires: libcap-devel
@@ -205,7 +196,6 @@ This package contains %{name}'s C/C++ analyzer plugin.
%package addon-upload-watch
Summary: %{name}'s upload addon
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: abrt-libs = %{version}-%{release}
@@ -214,7 +204,6 @@ This package contains hook for uploaded problems.
%package retrace-client
Summary: %{name}'s retrace client
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: xz
Requires: tar
@@ -225,7 +214,6 @@ which is able to analyze C/C++ crashes remotely.
%package addon-kerneloops
Summary: %{name}'s kerneloops addon
-Group: System Environment/Libraries
BuildRequires: systemd-devel
Requires: curl
Requires: %{name} = %{version}-%{release}
@@ -240,7 +228,6 @@ system log.
%package addon-xorg
Summary: %{name}'s Xorg addon
-Group: System Environment/Libraries
Requires: curl
Requires: %{name} = %{version}-%{release}
Requires: abrt-libs = %{version}-%{release}
@@ -252,7 +239,6 @@ log.
%if %{?have_kexec_tools} == 1
%package addon-vmcore
Summary: %{name}'s vmcore addon
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: abrt-addon-kerneloops
Requires: kexec-tools
@@ -267,7 +253,6 @@ vmcore files.
%package addon-pstoreoops
Summary: %{name}'s pstore oops addon
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: abrt-libs = %{version}-%{release}
Requires: abrt-addon-kerneloops
@@ -280,7 +265,6 @@ This package contains plugin for collecting kernel oopses from pstore storage.
%package plugin-bodhi
Summary: %{name}'s bodhi plugin
BuildRequires: %{libjson_devel}
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
BuildRequires: libreport-web-devel >= %{libreport_ver}
BuildRequires: hawkey-devel
@@ -293,7 +277,6 @@ Search for a new updates in bodhi server.
%package addon-python
Summary: %{name}'s addon for catching and analyzing Python exceptions
-Group: System Environment/Libraries
Requires: python
Requires: %{name} = %{version}-%{release}
Requires: systemd-python
@@ -305,7 +288,6 @@ uncaught exception in python programs.
%package addon-python3
Summary: %{name}'s addon for catching and analyzing Python 3 exceptions
-Group: System Environment/Libraries
Requires: python3
Requires: %{name} = %{version}-%{release}
Requires: python3-systemd
@@ -317,7 +299,6 @@ uncaught exception in python 3 programs.
%package tui
Summary: %{name}'s command line interface
-Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires: libreport-cli >= %{libreport_ver}
Requires: abrt-libs = %{version}-%{release}
@@ -329,7 +310,6 @@ in command line environment.
%package cli-ng
Summary: %{name}'s improved command line interface
-Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires: libreport-cli >= %{libreport_ver}
Requires: abrt-libs = %{version}-%{release}
@@ -345,7 +325,6 @@ New generation command line interface for ABRT
%package cli
Summary: Virtual package to make easy default installation on non-graphical environments
-Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: abrt-tui
Requires: abrt-addon-kerneloops
@@ -380,7 +359,6 @@ environment.
%package desktop
Summary: Virtual package to make easy default installation on desktop environments
-Group: User Interface/Desktops
# This package gets installed when anything requests bug-buddy -
# happens when users upgrade Fn to Fn+1;
# or if user just wants "typical desktop installation".
@@ -427,7 +405,6 @@ environment.
%if %{with atomic}
%package atomic
Summary: Package to make easy default installation on Atomic hosts.
-Group: Applications/System
Requires: %{name}-addon-coredump-helper = %{version}-%{release}
Conflicts: %{name}-addon-ccpp
@@ -438,7 +415,6 @@ hosts.
%package dbus
Summary: ABRT DBus service
-Group: Applications/System
Requires: %{name} = %{version}-%{release}
BuildRequires: polkit-devel
Requires: abrt-libs = %{version}-%{release}
@@ -450,7 +426,6 @@ uses PolicyKit to authorize to access the problem data.
%package python
Summary: ABRT Python API
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-dbus = %{version}-%{release}
@@ -466,7 +441,6 @@ problems handled by ABRT in Python.
%package python-doc
Summary: ABRT Python API Documentation
-Group: Documentation
BuildArch: noarch
BuildRequires: python2-devel
Requires: %{name} = %{version}-%{release}
@@ -477,7 +451,6 @@ Examples and documentation for ABRT Python API.
%package python3
Summary: ABRT Python 3 API
-Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-dbus = %{version}-%{release}
@@ -493,7 +466,6 @@ problems handled by ABRT in Python 3.
%package python3-doc
Summary: ABRT Python API Documentation
-Group: Documentation
BuildArch: noarch
BuildRequires: python3-devel
Requires: %{name} = %{version}-%{release}
@@ -504,7 +476,6 @@ Examples and documentation for ABRT Python 3 API.
%package console-notification
Summary: ABRT console notification script
-Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: %{name}-cli = %{version}-%{release}
--
2.9.3

37
0009-ccpp-tell-gdb-to-analyze-saved-binary-image.patch Normal file
View file

@ -0,0 +1,37 @@
From 98e5d89b5238eac954d1947de52c6b3fcf3ae987 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Tue, 29 Nov 2016 11:24:49 +0100
Subject: [PATCH] ccpp: tell gdb to analyze saved binary image
This is particularly useful when dealing with crashes in containers and
changed root environments. GDB reads the debug information from the
source elf and if the source elf is not available GDB generates useless
backtraces.
Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
src/lib/hooklib.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c
index cb5c4cb..ccb1936 100644
--- a/src/lib/hooklib.c
+++ b/src/lib/hooklib.c
@@ -246,7 +246,13 @@ char *get_backtrace(const char *dump_dir_name, unsigned timeout_sec, const char
struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
if (!dd)
return NULL;
- char *executable = dd_load_text(dd, FILENAME_EXECUTABLE);
+
+ char *executable = NULL;
+ if (dd_exist(dd, FILENAME_BINARY))
+ executable = concat_path_file(dd->dd_dirname, FILENAME_BINARY);
+ else
+ executable = dd_load_text(dd, FILENAME_EXECUTABLE);
+
dd_close(dd);
/* Let user know what's going on */
--
2.9.3

209
0011-daemon-Allow-rpm-to-be-optional-at-build-time.patch Normal file
View file

@ -0,0 +1,209 @@
From f4aec46ee3c6889d6a020721078cfab44f156708 Mon Sep 17 00:00:00 2001
From: Wes Lindauer <wesley.lindauer@gmail.com>
Date: Wed, 14 Dec 2016 15:02:56 -0500
Subject: [PATCH] daemon: Allow rpm to be optional at build time
---
configure.ac | 11 ++++++++++-
src/daemon/Makefile.am | 1 +
src/daemon/rpm.c | 31 +++++++++++++++++++++++++++++++
src/daemon/rpm.h | 5 -----
4 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index f6597eb..4b05040 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.43])
PKG_CHECK_MODULES([DBUS], [dbus-1])
PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
-PKG_CHECK_MODULES([RPM], [rpm])
PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.7.0])
PKG_CHECK_MODULES([NSS], [nss])
PKG_CHECK_MODULES([LIBREPORT], [libreport])
@@ -425,6 +424,16 @@ ABRT_PARSE_WITH([selinux]))
AM_CONDITIONAL(HAVE_SELINUX, false)
[fi]
+AC_ARG_WITH(rpm,
+AS_HELP_STRING([--with-rpm],[build rpm support (default is YES)]),
+ABRT_PARSE_WITH([rpm]))
+
+[if test -z "$NO_RPM"]
+[then]
+ PKG_CHECK_MODULES([RPM], [rpm])
+ AC_DEFINE(HAVE_LIBRPM, [], [Have rpm support.])
+[fi]
+
# Initialize the test suite.
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile tests/atlocal])
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 563923a..9a41d5f 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -95,6 +95,7 @@ abrt_action_save_package_data_CPPFLAGS = \
-I$(srcdir)/../lib \
-DCONF_DIR=\"$(CONF_DIR)\" \
$(GLIB_CFLAGS) \
+ $(RPM_CFLAGS) \
$(LIBREPORT_CFLAGS) \
-D_GNU_SOURCE
abrt_action_save_package_data_LDADD = \
diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c
index e99b960..36b36a9 100644
--- a/src/daemon/rpm.c
+++ b/src/daemon/rpm.c
@@ -19,6 +19,13 @@
#include "libabrt.h"
#include "rpm.h"
+#ifdef HAVE_LIBRPM
+#include <rpm/rpmts.h>
+#include <rpm/rpmcli.h>
+#include <rpm/rpmdb.h>
+#include <rpm/rpmpgp.h>
+#endif
+
/**
* A set, which contains finger prints.
*/
@@ -51,8 +58,10 @@ char* get_package_name_from_NVR_or_NULL(const char* packageNVR)
void rpm_init()
{
+#ifdef HAVE_LIBRPM
if (rpmReadConfigFiles(NULL, NULL) != 0)
error_msg("Can't read RPM rc files");
+#endif
list_free_with_free(list_fingerprints); /* paranoia */
/* Huh? Why do we start the list with an element with NULL string? */
@@ -61,6 +70,7 @@ void rpm_init()
void rpm_destroy()
{
+#ifdef HAVE_LIBRPM
/* Mirroring the order of deinit calls in rpm-4.11.1/lib/poptALL.c::rpmcliFini() */
rpmFreeCrypto();
rpmFreeMacros(NULL);
@@ -71,6 +81,7 @@ void rpm_destroy()
* "BDB2053 Freeing read locks for locker 0x1e0: 28718/139661746636736"
*/
rpmdbCheckTerminate(1);
+#endif
list_free_with_free(list_fingerprints);
list_fingerprints = NULL;
@@ -78,6 +89,7 @@ void rpm_destroy()
void rpm_load_gpgkey(const char* filename)
{
+#ifdef HAVE_LIBRPM
uint8_t *pkt = NULL;
size_t pklen;
if (pgpReadPkts(filename, &pkt, &pklen) != PGPARMOR_PUBKEY)
@@ -95,6 +107,9 @@ void rpm_load_gpgkey(const char* filename)
list_fingerprints = g_list_append(list_fingerprints, fingerprint);
}
free(pkt);
+#else
+ return;
+#endif
}
int rpm_chk_fingerprint(const char* pkg)
@@ -114,6 +129,7 @@ int rpm_fingerprint_is_imported(const char* fingerprint)
char *rpm_get_fingerprint(const char *pkg)
{
+#ifdef HAVE_LIBRPM
char *fingerprint = NULL;
char *pgpsig = NULL;
const char *errmsg = NULL;
@@ -141,6 +157,9 @@ error:
rpmdbFreeIterator(iter);
rpmtsFree(ts);
return fingerprint;
+#else
+ return NULL;
+#endif
}
/*
@@ -183,6 +202,7 @@ error:
}
*/
+#ifdef HAVE_LIBRPM
static int rpm_query_file(rpmts *ts, rpmdbMatchIterator *iter, Header *header,
const char *filename, const char *rootdir_or_NULL)
{
@@ -216,9 +236,11 @@ static int rpm_query_file(rpmts *ts, rpmdbMatchIterator *iter, Header *header,
return 0;
}
+#endif
char* rpm_get_component(const char *filename, const char *rootdir_or_NULL)
{
+#ifdef HAVE_LIBRPM
char *ret = NULL;
char *srpm = NULL;
rpmts ts;
@@ -246,8 +268,12 @@ char* rpm_get_component(const char *filename, const char *rootdir_or_NULL)
rpmdbFreeIterator(iter);
rpmtsFree(ts);
return ret;
+#else
+ return NULL;
+#endif
}
+#ifdef HAVE_LIBRPM
#define pkg_add_id(name) \
static inline int pkg_add_##name(Header header, struct pkg_envra *p) \
{ \
@@ -267,10 +293,12 @@ pkg_add_id(version);
pkg_add_id(release);
pkg_add_id(arch);
pkg_add_id(vendor);
+#endif
// caller is responsible to free returned value
struct pkg_envra *rpm_get_package_nvr(const char *filename, const char *rootdir_or_NULL)
{
+#ifdef HAVE_LIBRPM
rpmts ts;
rpmdbMatchIterator iter;
Header header;
@@ -330,6 +358,9 @@ struct pkg_envra *rpm_get_package_nvr(const char *filename, const char *rootdir_
rpmdbFreeIterator(iter);
rpmtsFree(ts);
return NULL;
+#else
+ return NULL;
+#endif
}
void free_pkg_envra(struct pkg_envra *p)
diff --git a/src/daemon/rpm.h b/src/daemon/rpm.h
index 89aa088..1fd56e8 100644
--- a/src/daemon/rpm.h
+++ b/src/daemon/rpm.h
@@ -22,11 +22,6 @@
#ifndef RPM_H_
#define RPM_H_
-#include <rpm/rpmts.h>
-#include <rpm/rpmcli.h>
-#include <rpm/rpmdb.h>
-#include <rpm/rpmpgp.h>
-
#ifdef __cplusplus
extern "C" {
#endif
--
2.9.3

36
0012-kernel-modify-suspicious-string-invalid-opcode.patch Normal file
View file

@ -0,0 +1,36 @@
From 2b12039b94b00144a8db37ee87a6e89f897cdaeb Mon Sep 17 00:00:00 2001
From: Matej Habrnal <mhabrnal@redhat.com>
Date: Mon, 16 Jan 2017 16:46:22 +0100
Subject: [PATCH] kernel: modify suspicious string "invalid opcode:"
"invalid opcode:" can be without colon.
systemd-journal output example:
traps: chrome[2979] trap invalid opcode ip:55911b28dba3 sp:7ffea558a3e0
error:0
in chrome[55911728a000+6a0b000]
Related to #1413451
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
---
src/lib/kernel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/kernel.c b/src/lib/kernel.c
index d662319..6f05619 100644
--- a/src/lib/kernel.c
+++ b/src/lib/kernel.c
@@ -139,7 +139,7 @@ static const char *const s_koops_suspicious_strings[] = {
"coprocessor segment overrun:",
"invalid TSS:",
"segment not present:",
- "invalid opcode:",
+ "invalid opcode",
"alignment check:",
"stack segment:",
"fpu exception:",
--
2.9.3

32
0015-a-a-ureport-fix-calling-of-run_event_on_problem_dir.patch Normal file
View file

@ -0,0 +1,32 @@
From 9b1b0c6c49d19a63a0e781fcc56d3b4ea530f2da Mon Sep 17 00:00:00 2001
From: Matej Habrnal <mhabrnal@redhat.com>
Date: Wed, 18 Jan 2017 09:49:10 +0100
Subject: [PATCH] a-a-ureport: fix calling of run_event_on_problem_dir
We just need to call 'run_event_on_problem_dir' and not
'report.run_event_on_problem_dir' as the function is imported as a solo
identifier from the report module.
Resolved #1413637
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
---
src/plugins/abrt-action-ureport | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/abrt-action-ureport b/src/plugins/abrt-action-ureport
index a73e7f1..37595f1 100755
--- a/src/plugins/abrt-action-ureport
+++ b/src/plugins/abrt-action-ureport
@@ -78,7 +78,7 @@ def get_bugzilla_reports(reported_to):
return bugs
def run_event(event_name, dump_dir_name):
- state, ret = report.run_event_on_problem_dir(dump_dir_name, event_name)
+ state, ret = run_event_on_problem_dir(dump_dir_name, event_name)
if ret == 0 and state.children_count == 0:
log1("Didn't find definition of event '%s'", event_name)
--
2.9.3

1746
abrt.spec
View file

File diff suppressed because it is too large Load diff