From 66206f57e082694d742447df2e0a6d6615214761 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 16 2018 19:52:05 +0000 Subject: Manual CentOS Debranding --- diff --git a/SOURCES/1000-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch b/SOURCES/1000-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch new file mode 100644 index 0000000..9754457 --- /dev/null +++ b/SOURCES/1000-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch @@ -0,0 +1,29 @@ +From 316c1cbce56318198dfe4598baf0ae91fec32a56 Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Thu, 22 Jan 2015 02:23:21 +0100 +Subject: [PATCH 1000/1006] event: don't run the 'reporter-bugzilla -h' on RHEL + and CentOS + +Running the 'reporter-bugzilla -h' makes sense only on Fedora because of bodhi. + +Signed-off-by: Matej Habrnal +--- + src/plugins/ccpp_event.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf +index f4f3828..174f491 100644 +--- a/src/plugins/ccpp_event.conf ++++ b/src/plugins/ccpp_event.conf +@@ -71,7 +71,7 @@ EVENT=analyze_LocalGDB analyzer=CCpp + # Run GDB plugin to see if crash looks exploitable + abrt-action-analyze-vulnerability + # Run GDB to genereate backtrace +- abrt-action-analyze-ccpp-local --without-bodhi ++ abrt-action-analyze-ccpp-local --without-bz + + + # Bugzilla requires nonempty duphash +-- +1.8.3.1 + diff --git a/SOURCES/1002-plugin-set-URL-to-retrace-server.patch b/SOURCES/1002-plugin-set-URL-to-retrace-server.patch new file mode 100644 index 0000000..b3bbc4d --- /dev/null +++ b/SOURCES/1002-plugin-set-URL-to-retrace-server.patch @@ -0,0 +1,42 @@ +From 08a7c9c82f51f95f69de42b8eaa38eb75e71a93a Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Fri, 30 Jan 2015 17:52:25 +0100 +Subject: [PATCH 1002/1006] plugin: set URL to retrace server + +Changed default retrace server URL from localhost to retrace.fedoraproject.org. + +Signed-off-by: Matej Habrnal +--- + src/plugins/analyze_CCpp.xml.in | 2 +- + src/plugins/analyze_RetraceServer.xml.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/analyze_CCpp.xml.in b/src/plugins/analyze_CCpp.xml.in +index 6f02692..a7ce4dd 100644 +--- a/src/plugins/analyze_CCpp.xml.in ++++ b/src/plugins/analyze_CCpp.xml.in +@@ -26,7 +26,7 @@ + + +diff --git a/src/plugins/analyze_RetraceServer.xml.in b/src/plugins/analyze_RetraceServer.xml.in +index cf1d25a..e437cac 100644 +--- a/src/plugins/analyze_RetraceServer.xml.in ++++ b/src/plugins/analyze_RetraceServer.xml.in +@@ -12,7 +12,7 @@ + + +-- +1.8.3.1 + diff --git a/SOURCES/1004-turn-sosreport-off.patch b/SOURCES/1004-turn-sosreport-off.patch new file mode 100644 index 0000000..1dbccca --- /dev/null +++ b/SOURCES/1004-turn-sosreport-off.patch @@ -0,0 +1,25 @@ +From 940249524766fd5e439d093edffb720bebbef199 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Thu, 20 Nov 2014 11:24:39 +0100 +Subject: [PATCH 1004/1006] turn sosreport off + +--- + src/daemon/abrt_event.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf +index 76d544c..d90bf03 100644 +--- a/src/daemon/abrt_event.conf ++++ b/src/daemon/abrt_event.conf +@@ -67,7 +67,7 @@ EVENT=post-create runlevel= + # Example: if you want to save sosreport immediately at the moment of a crash: + # (alternatively, you can add similar command to EVENT=analyze_foo's, + # if you would rather perform this collection later): +-EVENT=post-create ++#EVENT=post-create + nice sosreport --tmp-dir "$DUMP_DIR" --batch \ + --only=anaconda --only=boot --only=devicemapper \ + --only=filesys --only=hardware --only=kernel --only=libraries \ +-- +1.8.3.1 + diff --git a/SOURCES/1005-cli-list-revert-patch-7966e5737e8d3af43b1ecdd6a82323.patch b/SOURCES/1005-cli-list-revert-patch-7966e5737e8d3af43b1ecdd6a82323.patch new file mode 100644 index 0000000..fde9167 --- /dev/null +++ b/SOURCES/1005-cli-list-revert-patch-7966e5737e8d3af43b1ecdd6a82323.patch @@ -0,0 +1,115 @@ +From 035f7e2280686b563709e663d2cd3c42647ef25c Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Mon, 30 Nov 2015 17:13:43 +0100 +Subject: [PATCH 1005/1006] cli list: revert patch + '7966e5737e8d3af43b1ecdd6a823234b8d25931d' + +This patch cannot be in CentOS7 because is related only to RHEL. + +Removing the patch here because previous patches depends on this patch and +cannot be applied without conflict. + +Signed-off-by: Matej Habrnal +--- + configure.ac | 2 -- + src/cli/Makefile.am | 3 +-- + src/cli/list.c | 49 ------------------------------------------------- + 3 files changed, 1 insertion(+), 53 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 02d7e0e..9481b7f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -139,7 +139,6 @@ PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' + DEFAULT_PLUGINS_CONF_DIR='${datadir}/${PACKAGE_NAME}/conf.d/plugins' + EVENTS_DIR='${datadir}/libreport/events' + EVENTS_CONF_DIR='${sysconfdir}/libreport/events.d' +-WORKFLOWS_DIR='${datadir}/libreport/workflows' + ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' + DEFAULT_DUMP_DIR_MODE=$($PKG_CONFIG --variable=dd_mode libreport) + LIBREPORT_PLUGINS_CONF_DIR=$($PKG_CONFIG --variable=plugins_conf_dir libreport) +@@ -252,7 +251,6 @@ AC_SUBST(VAR_RUN) + AC_SUBST(PLUGINS_CONF_DIR) + AC_SUBST(DEFAULT_PLUGINS_CONF_DIR) + AC_SUBST(EVENTS_CONF_DIR) +-AC_SUBST(WORKFLOWS_DIR) + AC_SUBST(EVENTS_DIR) + AC_SUBST(DEFAULT_DUMP_LOCATION) + AC_SUBST(DEFAULT_DUMP_DIR_MODE) +diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am +index a7c76ef..92dc20a 100644 +--- a/src/cli/Makefile.am ++++ b/src/cli/Makefile.am +@@ -17,8 +17,7 @@ abrt_cli_CFLAGS = \ + -I$(srcdir)/../include \ + -I$(srcdir)/../lib \ + $(LIBREPORT_CFLAGS) \ +- $(POLKIT_AGENT_CFLAGS) \ +- -DWORKFLOWS_DIR=\"${WORKFLOWS_DIR}\" ++ $(POLKIT_AGENT_CFLAGS) + + if SUGGEST_AUTOREPORTING + abrt_cli_CFLAGS += -DSUGGEST_AUTOREPORTING=1 +diff --git a/src/cli/list.c b/src/cli/list.c +index e688d2f..d069695 100644 +--- a/src/cli/list.c ++++ b/src/cli/list.c +@@ -77,55 +77,6 @@ static void print_crash(problem_data_t *problem_data, int detailed, int text_siz + /*names_to_skip:*/ NULL, + /*max_text_size:*/ text_size, + MAKEDESC_SHOW_ONLY_LIST | MAKEDESC_SHOW_URLS); +- +- /* +- * If the problem is reportable and has not yet been reported into RHTS +- * and there is at least one applicable Workflow which contains +- * 'report_RHTSupport' event, then append a short message informing +- * user that he can create a new case in Red Hat Customer Portal. +- */ +- const char *const not_reportable = problem_data_get_content_or_NULL(problem_data, FILENAME_NOT_REPORTABLE); +- const char *const reported_to = not_reportable ? NULL : problem_data_get_content_or_NULL(problem_data, FILENAME_REPORTED_TO); +- report_result_t *const report = !reported_to ? NULL : find_in_reported_to_data(reported_to, "RHTSupport"); +- +- if (!not_reportable && !report) +- { +- /* The lines below should be replaced by something simpler, I'd +- * like to see: +- * GHashTable *possible_worfklows = load_applicable_workflows_for_dump(); +- * +- * However, this feature (rhbz#1055565) is intended for RHEL only +- * and I'm not sure whether it's worth to file another bug against +- * libreport and try to improve libreport public API. +- */ +- const char *const dump_dir_name = problem_data_get_content_or_NULL(problem_data, CD_DUMPDIR); +- GList *const wf_names = list_possible_events_problem_data_glist(problem_data, dump_dir_name, "workflow"); +- GHashTable *const possible_workflows = load_workflow_config_data_from_list(wf_names, WORKFLOWS_DIR); +- g_list_free_full(wf_names, free); +- +- int event_found = 0; +- +- GHashTableIter iter; +- gpointer key = NULL; +- gpointer value = NULL; +- +- g_hash_table_iter_init(&iter, possible_workflows); +- while (!event_found && g_hash_table_iter_next(&iter, &key, &value)) +- { +- GList *const event_names = wf_get_event_names((workflow_t *)value); +- event_found = !!g_list_find_custom(event_names, "report_RHTSupport", (GCompareFunc)g_strcmp0); +- g_list_free_full(event_names, free); +- } +- +- g_hash_table_destroy(possible_workflows); +- +- if (event_found) +- { +- char *tmp = xasprintf(_("%sRun 'abrt-cli report %s' for creating a case in Red Hat Customer Portal\n"), desc, dump_dir_name); +- free(desc); +- desc = tmp; +- } +- } + } + fputs(desc, stdout); + free(desc); +-- +1.8.3.1 + diff --git a/SPECS/abrt.spec b/SPECS/abrt.spec index 429bf6d..2b0cdf7 100644 --- a/SPECS/abrt.spec +++ b/SPECS/abrt.spec @@ -27,7 +27,7 @@ %define desktopvendor fedora %endif -%define libreport_ver 2.1.11-36 +%define libreport_ver 2.1.11-42 %define satyr_ver 0.13-10 Summary: Automatic bug detection and reporting tool @@ -54,6 +54,7 @@ Patch12: 0012-configui-show-Close-button-in-the-dialog.patch Patch13: 0013-applet-do-not-say-the-report-is-anonymous-when-urepo.patch #Patch14: 0014-spec-abrt-cli-requires-a-pkg-providing-workflows.patch #Patch15: 0015-testsuite-encourage-users-to-create-a-case-in-RHTS.patch +Patch16: 0016-cli-list-show-a-hint-about-creating-a-case-in-RHTS.patch Patch17: 0017-harvest-vmcore-properly-handle-inaccessible-dir-erro.patch Patch18: 0018-don-t-break-the-event-run-by-failures-of-abrt-action.patch Patch19: 0019-Fix-handling-of-Machine-Check-Exceptions.patch @@ -116,6 +117,7 @@ Patch75: 0075-Translation-updates.patch Patch76: 0076-Revert-gdb-disable-loading-of-auto-loaded-files.patch Patch77: 0077-gdb-make-gdb-aware-of-the-abrt-s-debuginfo-dir.patch #Patch78: 0078-spec-update-the-required-gdb-version.patch +Patch79: 0079-cli-mark-the-suggestion-text-for-translation.patch Patch80: 0080-auto-reporting-add-options-to-specify-auth-type.patch #Patch81: 0081-testsuite-abrt-auto-reporting-uReport-authentication.patch Patch82: 0082-translations-pull-the-newest-PO-files.patch @@ -382,9 +384,14 @@ Patch308: 0308-plugins-a-a-g-machine-id-use-dmidecode-command.patch Patch310: 0310-a-a-s-p-data-fix-segfault-if-GPGKeysDir-isn-t-config.patch # git format-patch 2.1.11-51.el7 -N --start-number 311 --topo-order Patch311: 0311-plugin-general-from-sos-has-been-split-into-two-new-.patch -Patch312: event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch -Patch313: plugin-set-URL-to-retrace-server.patch -Patch314: turn-sosreport-off.patch + +Patch1000: 1000-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch +#Patch1001: 1001-spec-added-dependency-to-libreport-centos.patch +Patch1002: 1002-plugin-set-URL-to-retrace-server.patch +#Patch1003: 1003-spec-add-dependenci-on-abrt-retrace-client.patch +Patch1004: 1004-turn-sosreport-off.patch +Patch1005: 1005-cli-list-revert-patch-7966e5737e8d3af43b1ecdd6a82323.patch +#Patch1006: 1006-spec-disable-authenticated-autoreporting.patch # git is need for '%%autosetup -S git' which automatically applies all the # patches above. Please, be aware that the patches must be generated @@ -743,8 +750,7 @@ CFLAGS="%{optflags} -Werror -Wno-error=deprecated-declarations" %configure --ena --enable-native-unwinder \ %endif --enable-dump-time-unwind \ - --enable-suggest-autoreporting \ - --enable-authenticated-autoreporting + --enable-suggest-autoreporting make %{?_smp_mflags} %install