From c7d2242d985e727d35ef18c1d5a94d767d9ee9f1 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Jan 30 2020 16:10:50 +0000 Subject: patch: Fix build failure with gcc -fno-common Resolves: rhbz#1795820 Signed-off-by: Martin Kutlak --- diff --git a/0002-Fix-build-failure-with-gcc-fno-common.patch b/0002-Fix-build-failure-with-gcc-fno-common.patch new file mode 100644 index 0000000..f85b10f --- /dev/null +++ b/0002-Fix-build-failure-with-gcc-fno-common.patch @@ -0,0 +1,165 @@ +From f58c435e4e4f5030af44d2cde8042bcf10d24615 Mon Sep 17 00:00:00 2001 +From: Michal Fabik +Date: Tue, 28 Jan 2020 13:45:14 +0100 +Subject: [PATCH] Fix build failure with gcc -fno-common + +Signed-off-by: Michal Fabik +--- + src/configuration-gui/abrt-config-widget.c | 2 +- + src/dbus/abrt_problems2_service.c | 4 ++-- + src/dbus/abrt_problems2_service.h | 8 ++++---- + src/dbus/abrt_problems2_session.c | 2 +- + src/dbus/abrt_problems2_task.c | 2 +- + src/plugins/oops-utils.c | 2 ++ + src/plugins/oops-utils.h | 2 +- + src/plugins/xorg-utils.c | 2 ++ + src/plugins/xorg-utils.h | 2 +- + 9 files changed, 15 insertions(+), 11 deletions(-) + +diff --git a/src/configuration-gui/abrt-config-widget.c b/src/configuration-gui/abrt-config-widget.c +index aa3b5c01b..518ecd1d0 100644 +--- a/src/configuration-gui/abrt-config-widget.c ++++ b/src/configuration-gui/abrt-config-widget.c +@@ -109,7 +109,7 @@ G_DEFINE_TYPE_WITH_PRIVATE(AbrtConfigWidget, abrt_config_widget, GTK_TYPE_BOX) + enum { + SN_CHANGED, + SN_LAST_SIGNAL +-} SignalNumber; ++}; + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + +diff --git a/src/dbus/abrt_problems2_service.c b/src/dbus/abrt_problems2_service.c +index a0d2a3ce6..a1e7ae322 100644 +--- a/src/dbus/abrt_problems2_service.c ++++ b/src/dbus/abrt_problems2_service.c +@@ -1589,7 +1589,7 @@ AbrtP2Object *abrt_p2_service_get_entry_object(AbrtP2Service *service, + + AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service, + const char *problem_id, +- int flags, ++ AbrtP2ServiceEntryLookupFlags flags, + GError **error) + { + char *entry_path = entry_object_dir_name_to_path(problem_id); +@@ -2062,7 +2062,7 @@ GVariant *abrt_p2_service_callers_session(AbrtP2Service *service, + + GVariant *abrt_p2_service_get_problems(AbrtP2Service *service, + uid_t caller_uid, +- gint32 flags, ++ AbrtP2ServiceGetProblemsFlags flags, + GVariant *options, + GError **error) + { +diff --git a/src/dbus/abrt_problems2_service.h b/src/dbus/abrt_problems2_service.h +index f82cf503a..22b97a6e8 100644 +--- a/src/dbus/abrt_problems2_service.h ++++ b/src/dbus/abrt_problems2_service.h +@@ -86,14 +86,14 @@ GVariant *abrt_p2_service_entry_problem_data(AbrtP2Service *service, + GError **error); + + +-enum { ++typedef enum { + ABRT_P2_SERVICE_ENTRY_LOOKUP_NOFLAGS = 0x0, ///< return with error if not found + ABRT_P2_SERVICE_ENTRY_LOOKUP_OPTIONAL = 0x1, ///< return NULL if not found +-} AbrtP2ServiceEntryLookupFlag; ++} AbrtP2ServiceEntryLookupFlags; + + AbrtP2Object *abrt_p2_service_get_entry_for_problem(AbrtP2Service *service, + const char *problem_id, +- int flags, ++ AbrtP2ServiceEntryLookupFlags flags, + GError **error); + + struct _AbrtP2Entry; +@@ -145,7 +145,7 @@ typedef enum + + GVariant *abrt_p2_service_get_problems(AbrtP2Service *service, + uid_t caller_uid, +- gint32 flags, ++ AbrtP2ServiceGetProblemsFlags flags, + GVariant *options, + GError **error); + +diff --git a/src/dbus/abrt_problems2_session.c b/src/dbus/abrt_problems2_session.c +index 96db4ccc5..85ee78887 100644 +--- a/src/dbus/abrt_problems2_session.c ++++ b/src/dbus/abrt_problems2_session.c +@@ -97,7 +97,7 @@ struct check_auth_cb_params + enum { + SN_AUTHORIZATION_CHANGED, + SN_LAST_SIGNAL +-} SignalNumber; ++}; + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + +diff --git a/src/dbus/abrt_problems2_task.c b/src/dbus/abrt_problems2_task.c +index cba6b469a..e6ae171c7 100644 +--- a/src/dbus/abrt_problems2_task.c ++++ b/src/dbus/abrt_problems2_task.c +@@ -21,7 +21,7 @@ + enum { + SN_STATUS_CHANGED, + SN_LAST_SIGNAL +-} SignalNumber; ++}; + + static guint s_signals[SN_LAST_SIGNAL] = { 0 }; + +diff --git a/src/plugins/oops-utils.c b/src/plugins/oops-utils.c +index caa1d8d5d..a77b4424f 100644 +--- a/src/plugins/oops-utils.c ++++ b/src/plugins/oops-utils.c +@@ -22,6 +22,8 @@ + #include "oops-utils.h" + #include "libabrt.h" + ++int g_abrt_oops_sleep_woke_up_on_signal; ++ + int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags) + { + unsigned errors = 0; +diff --git a/src/plugins/oops-utils.h b/src/plugins/oops-utils.h +index 5181f91c7..bdd61cac2 100644 +--- a/src/plugins/oops-utils.h ++++ b/src/plugins/oops-utils.h +@@ -33,7 +33,7 @@ enum { + ABRT_OOPS_PRINT_STDOUT = 1 << 2, + }; + +-int g_abrt_oops_sleep_woke_up_on_signal; ++extern int g_abrt_oops_sleep_woke_up_on_signal; + + int abrt_oops_process_list(GList *oops_list, const char *dump_location, const char *analyzer, int flags); + unsigned abrt_oops_create_dump_dirs(GList *oops_list, const char *dump_location, const char *analyzer, int flags); +diff --git a/src/plugins/xorg-utils.c b/src/plugins/xorg-utils.c +index a8dfc512a..4ecf8cb63 100644 +--- a/src/plugins/xorg-utils.c ++++ b/src/plugins/xorg-utils.c +@@ -23,6 +23,8 @@ + + #define DEFAULT_XORG_CRASH_REASON "Display server crashed" + ++int g_abrt_xorg_sleep_woke_up_on_signal; ++ + int abrt_xorg_signaled_sleep(int seconds) + { + sigset_t set; +diff --git a/src/plugins/xorg-utils.h b/src/plugins/xorg-utils.h +index c53bc460d..d9f44681a 100644 +--- a/src/plugins/xorg-utils.h ++++ b/src/plugins/xorg-utils.h +@@ -35,7 +35,7 @@ enum { + ABRT_XORG_PRINT_STDOUT = 1 << 2, + }; + +-int g_abrt_xorg_sleep_woke_up_on_signal; ++extern int g_abrt_xorg_sleep_woke_up_on_signal; + int abrt_xorg_signaled_sleep(int seconds); + + /* +-- +2.24.1 + diff --git a/0003-bodhi-Initialize-karma-values-with-default.patch b/0003-bodhi-Initialize-karma-values-with-default.patch new file mode 100644 index 0000000..f3df79b --- /dev/null +++ b/0003-bodhi-Initialize-karma-values-with-default.patch @@ -0,0 +1,32 @@ +From c6562f15f2b72348aa447e3acbb91de5cf221695 Mon Sep 17 00:00:00 2001 +From: Martin Kutlak +Date: Thu, 30 Jan 2020 16:19:51 +0100 +Subject: [PATCH] bodhi: Initialize karma values with default + +During a rebuilt on s390x this error came up: +bodhi.c:340:12: + error: + 'unstable_karma' may be used uninitialized in this function + +Signed-off-by: Martin Kutlak +--- + src/plugins/bodhi.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c +index 14d65ad37..9b5177be9 100644 +--- a/src/plugins/bodhi.c ++++ b/src/plugins/bodhi.c +@@ -334,7 +334,8 @@ static GHashTable *bodhi_parse_json(json_object *json, const char *release) + if (!builds_item) /* broken json */ + continue; + +- int karma, unstable_karma; ++ int karma = 0; ++ int unstable_karma = 0; + bodhi_read_value(updates_item, "karma", &karma, BODHI_READ_INT); + bodhi_read_value(updates_item, "unstable_karma", &unstable_karma, BODHI_READ_INT); + if (karma <= unstable_karma) +-- +2.24.1 + diff --git a/abrt.spec b/abrt.spec index a3dc524..16cad2b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -49,12 +49,14 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.13.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch +Patch1: 0002-Fix-build-failure-with-gcc-fno-common.patch +Patch2: 0003-bodhi-Initialize-karma-values-with-default.patch BuildRequires: git-core BuildRequires: %{dbus_devel} @@ -1017,6 +1019,11 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Jan 30 2020 Martin Kutlak - 2.13.0-4 +- Add patch to fix build failure with gcc -fno-common +- Initialize bodhi karma values with defaults +- Resolves: #1795820 + * Tue Jan 28 2020 Fedora Release Engineering - 2.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild