From ba27e114c2702a81ff8259f19b1eb236827b30c5 Mon Sep 17 00:00:00 2001 From: Matej Habrnal Date: Thu, 16 Mar 2017 12:50:11 +0100 Subject: [PATCH] New version 2.10.1 Signed-off-by: Matej Habrnal --- .gitignore | 1 + ...inux-change-needed-for-automatic-del.patch | 27 -- 0003-remove-Buildroot-and-Groups-tags.patch | 248 ------------------ ...ll-gdb-to-analyze-saved-binary-image.patch | 37 --- ...low-rpm-to-be-optional-at-build-time.patch | 209 --------------- ...ify-suspicious-string-invalid-opcode.patch | 36 --- ...-calling-of-run_event_on_problem_dir.patch | 32 --- abrt.spec | 71 +++-- sources | 2 +- 9 files changed, 51 insertions(+), 612 deletions(-) delete mode 100644 0001-doc-document-selinux-change-needed-for-automatic-del.patch delete mode 100644 0003-remove-Buildroot-and-Groups-tags.patch delete mode 100644 0009-ccpp-tell-gdb-to-analyze-saved-binary-image.patch delete mode 100644 0011-daemon-Allow-rpm-to-be-optional-at-build-time.patch delete mode 100644 0012-kernel-modify-suspicious-string-invalid-opcode.patch delete mode 100644 0015-a-a-ureport-fix-calling-of-run_event_on_problem_dir.patch diff --git a/.gitignore b/.gitignore index 84307b5..ca88abe 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ abrt-1.1.13.tar.gz /abrt-2.8.2.tar.gz /abrt-2.9.0.tar.gz /abrt-2.10.0.tar.gz +/abrt-2.10.1.tar.gz diff --git a/0001-doc-document-selinux-change-needed-for-automatic-del.patch b/0001-doc-document-selinux-change-needed-for-automatic-del.patch deleted file mode 100644 index 7184bde..0000000 --- a/0001-doc-document-selinux-change-needed-for-automatic-del.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bcb90c417ef0dc0b7f80eb82d98ac92dfee7c4b0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miroslav=20Such=C3=BD?= -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 - diff --git a/0003-remove-Buildroot-and-Groups-tags.patch b/0003-remove-Buildroot-and-Groups-tags.patch deleted file mode 100644 index 4212b7b..0000000 --- a/0003-remove-Buildroot-and-Groups-tags.patch +++ /dev/null @@ -1,248 +0,0 @@ -From 38c340677f103b3784dc62b7934660b13aed0249 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miroslav=20Such=C3=BD?= -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 - diff --git a/0009-ccpp-tell-gdb-to-analyze-saved-binary-image.patch b/0009-ccpp-tell-gdb-to-analyze-saved-binary-image.patch deleted file mode 100644 index ce0d0bb..0000000 --- a/0009-ccpp-tell-gdb-to-analyze-saved-binary-image.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 98e5d89b5238eac954d1947de52c6b3fcf3ae987 Mon Sep 17 00:00:00 2001 -From: Jakub Filak -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 ---- - 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 - diff --git a/0011-daemon-Allow-rpm-to-be-optional-at-build-time.patch b/0011-daemon-Allow-rpm-to-be-optional-at-build-time.patch deleted file mode 100644 index f60972e..0000000 --- a/0011-daemon-Allow-rpm-to-be-optional-at-build-time.patch +++ /dev/null @@ -1,209 +0,0 @@ -From f4aec46ee3c6889d6a020721078cfab44f156708 Mon Sep 17 00:00:00 2001 -From: Wes Lindauer -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 -+#include -+#include -+#include -+#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 --#include --#include --#include -- - #ifdef __cplusplus - extern "C" { - #endif --- -2.9.3 - diff --git a/0012-kernel-modify-suspicious-string-invalid-opcode.patch b/0012-kernel-modify-suspicious-string-invalid-opcode.patch deleted file mode 100644 index d6775d5..0000000 --- a/0012-kernel-modify-suspicious-string-invalid-opcode.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2b12039b94b00144a8db37ee87a6e89f897cdaeb Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -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 ---- - 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 - diff --git a/0015-a-a-ureport-fix-calling-of-run_event_on_problem_dir.patch b/0015-a-a-ureport-fix-calling-of-run_event_on_problem_dir.patch deleted file mode 100644 index 7682c2f..0000000 --- a/0015-a-a-ureport-fix-calling-of-run_event_on_problem_dir.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9b1b0c6c49d19a63a0e781fcc56d3b4ea530f2da Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -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 ---- - 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 - diff --git a/abrt.spec b/abrt.spec index ac01cd4..d097ef6 100644 --- a/abrt.spec +++ b/abrt.spec @@ -54,35 +54,20 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.0-3 +%define libreport_ver 2.9.1 %define satyr_ver 0.22 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.0 -Release: 4%{?dist} +Version: 2.10.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ -Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz +Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz # 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 -Patch0001: 0001-doc-document-selinux-change-needed-for-automatic-del.patch -#Patch0002: 0002-spec-recommend-libreport-plugin-systemd-journal-on-F.patch -Patch0003: 0003-remove-Buildroot-and-Groups-tags.patch -#Patch0004: 0004-spec-remove-changelog-entries-older-than-2-years.patch -#Patch0005: 0005-spec-use-versioned-provides.patch -#Patch0006: 0006-spec-remove-cleaning-buildroot.patch -#Patch0007: 0007-spec-remove-defattr.patch -#Patch0008: 0008-spec-allow-any-compression-of-man-pages.patch -Patch0009: 0009-ccpp-tell-gdb-to-analyze-saved-binary-image.patch -#Patch0010: 0010-testsuite-add-test-for-bugzilla-default-url.patch -Patch0011: 0011-daemon-Allow-rpm-to-be-optional-at-build-time.patch -Patch0012: 0012-kernel-modify-suspicious-string-invalid-opcode.patch -#Patch0013: 0013-testsuite-add-testcase-for-modified-suspicious-strin.patch -#Patch0014: 0014-spec-if-using-systemd-default-to-os-release-ID-for-d.patch -Patch0015: 0015-a-a-ureport-fix-calling-of-run_event_on_problem_dir.patch # don't remove this patch, packages in rawhide are not signed! Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch @@ -296,7 +281,6 @@ BuildRequires: json-c-devel Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} BuildRequires: libreport-web-devel >= %{libreport_ver} -BuildRequires: hawkey-devel Obsoletes: libreport-plugin-bodhi > 0.0.1 Provides: libreport-plugin-bodhi = %{version}-%{release} @@ -327,6 +311,23 @@ Requires: abrt-python3 This package contains python 3 hook and python analyzer plugin for handling uncaught exception in python 3 programs. +%package plugin-sosreport +Summary: %{name}'s plugin for building automatic sosreports +Requires: sos +Requires: %{name} = %{version}-%{release} + +%description plugin-sosreport +This package contains a configuration snippet to enable automatic generation +of sosreports for abrt events. + +%package plugin-machine-id +Summary: %{name}'s plugin to generate machine_id based off dmidecode +Requires: %{name} = %{version}-%{release} + +%description plugin-machine-id +This package contains a configuration snippet to enable automatic generation +of machine_id for abrt events. + %package tui Summary: %{name}'s command line interface Group: User Interface/Desktops @@ -726,7 +727,7 @@ fi service abrtd condrestart >/dev/null 2>&1 || : %posttrans addon-ccpp -service abrt-ccpp condrestart >/dev/null 2>&1 || : +service abrt-journal-core condrestart >/dev/null 2>&1 || : %posttrans addon-kerneloops service abrt-oops condrestart >/dev/null 2>&1 || : @@ -771,7 +772,6 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_sbindir}/abrt-auto-reporting %{_libexecdir}/abrt-handle-event %{_libexecdir}/abrt-action-ureport -%{_libexecdir}/abrt-action-generate-machine-id %{_bindir}/abrt-handle-upload %{_bindir}/abrt-action-notify %{_mandir}/man1/abrt-action-notify.1* @@ -1034,6 +1034,15 @@ killall abrt-dbus >/dev/null 2>&1 || : %{python3_sitearch}/abrt* %{python3_sitearch}/__pycache__/abrt* +%files plugin-sosreport +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/libreport/events.d/sosreport_event.conf + +%files plugin-machine-id +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/libreport/events.d/machine-id_event.conf +%{_libexecdir}/abrt-action-generate-machine-id + %files cli %files tui @@ -1113,6 +1122,24 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Mar 16 2017 Matej Habrnal 2.10.1-1 +- bodhi: Remove dependency on hawkey +- spec: Remove dependency on hawkey +- build: do not upload tarball to fedorahosted.org +- spec: do not use fedorahosted.org as source +- plugins: introduce Machine ID and SOS report +- build: fix generating list of dependences in autogen.sh +- spec: start abrt-journal-core instead of abrt-ccpp +- build: fix scratch-build target +- a-a-ureport: fix calling of run_event_on_problem_dir +- spec: if using systemd, default to os-release ID for desktopvendor +- kernel: modify suspicious string "invalid opcode:" +- daemon: Allow rpm to be optional at build time +- spec: allow any compression of man pages +- spec: recommend libreport-plugin-systemd-journal on Fedoras +- doc: document selinux change needed for automatic deletion of reports +- ccpp: tell gdb to analyze saved binary image + * Fri Feb 10 2017 Fedora Release Engineering - 2.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 1c20159..436b2fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.0.tar.gz) = f8d98fb39fc0ed6f45973dc653f91869590c93e0a26e92ff6b2a8d17a4b64cf451a13fc00d8ec29fbf6689428b14e7bcf576c73aa29af3601a054d137fdf5e91 +SHA512 (abrt-2.10.1.tar.gz) = d62247463e6c4aa18da4916669d4a6bb131975ede4126731118b5c6bd7dba6286117271888e1d330bc9819d5befa6364466d604c98bf511e117e3b0b6a930600