From b391d2dbd0bce74705e45239dc9e318b2d379bf6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 09:46:10 +0200 Subject: Merging debian version 2.1.7-1. Signed-off-by: Daniel Baumann --- debian/changelog | 11 ++++++++ debian/libcib27.symbols | 6 ++++- debian/libcrmcluster29.symbols | 2 ++ debian/libcrmcommon34.symbols | 21 ++++++++++++++-- debian/liblrmd28.symbols | 1 + debian/libpacemaker1.symbols | 29 ++++++---------------- debian/libpe-rules26.symbols | 2 +- debian/libpe-status28.symbols | 21 +++++++++++----- debian/pacemaker-cts.install | 1 - .../Always-format-time_t-values-as-long-long.patch | 2 +- ...ays-run-Inkscape-under-the-C.UTF-8-locale.patch | 4 +-- debian/patches/Fix-typos-resouce-resource.patch | 26 +++++-------------- ...e-the-asciidoc-documentation-reproducible.patch | 4 +-- .../Remove-references-to-the-build-directory.patch | 2 +- .../alerts-make-the-scripts-executable.patch | 10 +++----- .../cts-do-not-capture-the-build-directory.patch | 4 +-- ...thon-clean-up-the-__pycache__-directories.patch | 12 ++++----- 17 files changed, 86 insertions(+), 72 deletions(-) diff --git a/debian/changelog b/debian/changelog index abaafe3..9e5acf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +pacemaker (2.1.7-1) unstable; urgency=medium + + * [09de5bf] New upstream release (2.1.7) (Closes: #1067626) + * [ad97704] Refresh our patches + * [e71f255] Update symbols files (all removed symbols were internal) + * [13bce35] The cts Python directory is not installed anymore. + Upstream migrated all of its contents into the _cts module of the + pacemaker Python package (see commit 1fdea434). + + -- Ferenc Wágner Sun, 31 Mar 2024 22:36:16 +0200 + pacemaker (2.1.6-5~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-updates, remaining changes: diff --git a/debian/libcib27.symbols b/debian/libcib27.symbols index 899b862..7ba69a6 100644 --- a/debian/libcib27.symbols +++ b/debian/libcib27.symbols @@ -2,14 +2,18 @@ libcib.so.27 libcib27 #MINVER# * Build-Depends-Package: pacemaker-dev cib__clean_up_connection@Base 2.1.4 cib__config_changed_v1@Base 2.1.6 + cib__create_op@Base 2.1.7 cib__delete_node_attr@Base 2.1.4 + cib__element_in_patchset@Base 2.1.7 + cib__extend_transaction@Base 2.1.7 cib__get_node_attrs@Base 2.1.5 + cib__get_notify_patchset@Base 2.1.7 + cib__get_operation@Base 2.1.7 cib__lookup_id@Base 2.1.2 cib__set_output@Base 2.1.1 cib__signon_query@Base 2.1.2 cib__update_node_attr@Base 2.1.4 cib_apply_patch_event@Base 1.1.12 - cib_create_op@Base 1.1.12 cib_delete@Base 1.1.12 cib_diff_version_details@Base 1.1.12 cib_dump_pending_callbacks@Base 1.1.12 diff --git a/debian/libcrmcluster29.symbols b/debian/libcrmcluster29.symbols index 6574ea0..69babe0 100644 --- a/debian/libcrmcluster29.symbols +++ b/debian/libcrmcluster29.symbols @@ -46,6 +46,8 @@ libcrmcluster.so.29 libcrmcluster29 #MINVER# pcmk__corosync_add_nodes@Base 2.1.1 pcmk__corosync_cluster_name@Base 2.1.1 pcmk__corosync_quorum_connect@Base 2.1.1 + pcmk__get_peer@Base 2.1.7 + pcmk__get_peer_full@Base 2.1.7 pcmk__reap_unseen_nodes@Base 2.1.1 pcmk__refresh_node_caches_from_cib@Base 2.1.1 pcmk__search_cluster_node_cache@Base 2.1.1 diff --git a/debian/libcrmcommon34.symbols b/debian/libcrmcommon34.symbols index b00f283..f076acd 100644 --- a/debian/libcrmcommon34.symbols +++ b/debian/libcrmcommon34.symbols @@ -223,7 +223,6 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__add_mainloop_ipc@Base 2.0.5~rc2 pcmk__add_scores@Base 2.1.4 pcmk__add_separated_word@Base 2.0.5~rc2 - pcmk__alert_in_patchset@Base 2.0.4 pcmk__alert_keys@Base 2.0.4 pcmk__alert_new@Base 2.0.4 pcmk__attrd_api_clear_failures@Base 2.1.5 @@ -236,10 +235,12 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__auto_watchdog_timeout@Base 2.0.4 pcmk__build_arg_context@Base 2.0.3 pcmk__build_path@Base 2.0.4 + pcmk__bzlib2rc@Base 2.1.7 pcmk__call_message@Base 2.0.2 pcmk__char_in_any_str@Base 2.0.5~rc2 pcmk__check_acl@Base 2.1.4 pcmk__chown_series_sequence@Base 2.0.4 + pcmk__cib_abs_xpath_for@Base 2.1.7 pcmk__cli_help@Base 2.0.4 pcmk__cli_init_logging@Base 2.1.1 pcmk__client_cleanup@Base 2.0.4 @@ -251,11 +252,16 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__cluster_option@Base 2.0.4 pcmk__cmdline_preproc@Base 2.0.3 pcmk__compress@Base 2.0.4 + pcmk__config_error_context@Base 2.1.7 + pcmk__config_error_handler@Base 2.1.7 + pcmk__config_warning_context@Base 2.1.7 + pcmk__config_warning_handler@Base 2.1.7 + pcmk__connect_generic_ipc@Base 2.1.7 + pcmk__connect_ipc@Base 2.1.7 pcmk__connect_remote@Base 2.0.4 pcmk__controld_api_reply2str@Base 2.1.6 pcmk__copy_result@Base 2.1.4 pcmk__copy_timet@Base 2.1.6 - pcmk__crm_ipc_is_authentic_process@Base 2.1.1 pcmk__daemon_can_write@Base 1.1.19 pcmk__daemonize@Base 2.0.5~rc2 pcmk__drop_all_clients@Base 2.0.4 @@ -286,6 +292,7 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__free_common_logger@Base 2.1.6 pcmk__full_path@Base 2.1.2 pcmk__g_strcat@Base 2.1.5 + pcmk__gaierror2rc@Base 2.1.7 pcmk__get_sbd_sync_resource_startup@Base 2.0.5~rc2 pcmk__get_sbd_timeout@Base 2.0.4 pcmk__get_tmpdir@Base 2.0.4 @@ -297,6 +304,7 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__init_tls_dh@Base 2.0.1~rc2 pcmk__ipc_client_count@Base 2.0.4 pcmk__ipc_create_ack_as@Base 2.1.4 + pcmk__ipc_fd@Base 2.1.7 pcmk__ipc_is_authentic_process_active@Base 2.0.1-3~ pcmk__ipc_prepare_iov@Base 2.0.4 pcmk__ipc_send_ack_as@Base 2.0.4 @@ -308,6 +316,8 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__lock_pidfile@Base 2.0.4 pcmk__log_output_entries@Base 2.0.4 pcmk__log_output_new@Base 2.1.5 + pcmk__log_xml_changes_as@Base 2.1.7 + pcmk__log_xml_patchset_as@Base 2.1.7 pcmk__mainloop_timer_get_period@Base 2.1.1 pcmk__message_name@Base 2.0.5~rc2 pcmk__mk_html_output@Base 2.0.3 @@ -333,6 +343,7 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__output_free@Base 2.0.2 pcmk__output_get_log_level@Base 2.1.6 pcmk__output_new@Base 2.0.2 + pcmk__output_set_log_filter@Base 2.1.7 pcmk__output_set_log_level@Base 2.1.1 pcmk__output_xml_add_node_copy@Base 2.1.6 pcmk__output_xml_create_parent@Base 2.0.3 @@ -386,6 +397,8 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__serve_pacemakerd_ipc@Base 2.1.1 pcmk__serve_schedulerd_ipc@Base 2.1.4 pcmk__set_client_queue_max@Base 2.0.4 + pcmk__set_config_error_handler@Base 2.1.7 + pcmk__set_config_warning_handler@Base 2.1.7 pcmk__set_env_option@Base 2.0.4 pcmk__set_nonblocking@Base 2.0.4 pcmk__set_result@Base 2.1.2 @@ -433,7 +446,9 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__valid_script@Base 2.0.4 pcmk__validate_cluster_options@Base 2.0.4 pcmk__validate_health_strategy@Base 2.1.4 + pcmk__validate_xml@Base 2.1.7 pcmk__verify_digest@Base 2.0.4 + pcmk__warnings@Base 2.1.7 pcmk__write_series_sequence@Base 2.0.4 pcmk__write_sync@Base 2.0.4 pcmk__xe_add_last_written@Base 2.0.5~rc2 @@ -446,6 +461,7 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk__xe_set_bool_attr@Base 2.1.4 pcmk__xe_set_props@Base 2.1.1 pcmk__xe_set_propv@Base 2.1.1 + pcmk__xml2fd@Base 2.1.7 pcmk__xml_artefact_path@Base 2.0.3 pcmk__xml_artefact_root@Base 2.0.3 pcmk__xml_output_entries@Base 2.0.3 @@ -487,6 +503,7 @@ libcrmcommon.so.34 libcrmcommon34 #MINVER# pcmk_ipc_purge_node@Base 2.0.5~rc2 pcmk_is_probe@Base 2.1.4 pcmk_legacy2rc@Base 2.0.4 + pcmk_log_xml_as@Base 2.1.7 pcmk_log_xml_impl@Base 2.1.6 pcmk_new_ipc_api@Base 2.0.5~rc2 pcmk_numeric_strcasecmp@Base 2.0.5~rc2 diff --git a/debian/liblrmd28.symbols b/debian/liblrmd28.symbols index 7bae4e0..ceafd8b 100644 --- a/debian/liblrmd28.symbols +++ b/debian/liblrmd28.symbols @@ -3,6 +3,7 @@ liblrmd.so.28 liblrmd28 #MINVER# lrmd__init_remote_key@Base 2.1.1 lrmd__metadata_async@Base 2.1.5 lrmd__new@Base 2.1.2 + lrmd__node_start_state@Base 2.1.7 lrmd__register_messages@Base 2.1.1 lrmd__remote_send_xml@Base 2.1.1 lrmd__reset_result@Base 2.1.2 diff --git a/debian/libpacemaker1.symbols b/debian/libpacemaker1.symbols index 88adb98..555fded 100644 --- a/debian/libpacemaker1.symbols +++ b/debian/libpacemaker1.symbols @@ -1,28 +1,9 @@ libpacemaker.so.1 libpacemaker1 #MINVER# * Build-Depends-Package: pacemaker-dev - clone_action_flags@Base 1.1.14~rc4 - clone_append_meta@Base 1.1.14~rc4 - clone_create_actions@Base 1.1.14~rc4 - clone_create_probe@Base 1.1.14~rc4 - clone_expand@Base 1.1.14~rc4 - clone_internal_constraints@Base 1.1.14~rc4 - clone_rsc_location@Base 1.1.14~rc4 - copies_per_node@Base 1.1.17 pcmk__abort_dangling_migration@Base 2.1.5 pcmk__acl_annotate_permissions@Base 2.1.4 pcmk__acl_evaled_render@Base 2.1.4 - pcmk__bundle_action_flags@Base 2.0.2 - pcmk__bundle_add_utilization@Base 2.1.4 - pcmk__bundle_allocate@Base 2.0.4 - pcmk__bundle_create_actions@Base 2.0.2 - pcmk__bundle_create_probe@Base 2.0.2 - pcmk__bundle_expand@Base 2.0.2 - pcmk__bundle_internal_constraints@Base 2.0.2 - pcmk__bundle_rsc_location@Base 2.0.2 - pcmk__bundle_shutdown_lock@Base 2.1.4 pcmk__check_rules@Base 2.1.5 - pcmk__clone_add_utilization@Base 2.1.4 - pcmk__clone_shutdown_lock@Base 2.1.4 pcmk__cluster_status_text@Base 2.1.1 pcmk__controller_status@Base 2.1.1 pcmk__copy_node_list@Base 2.0.4 @@ -44,8 +25,12 @@ libpacemaker.so.1 libpacemaker1 #MINVER# pcmk__get_fencing_history@Base 2.1.4 pcmk__graph_status2text@Base 2.1.2 pcmk__inject_scheduler_input@Base 2.1.4 + pcmk__list_agents@Base 2.1.7 + pcmk__list_alternatives@Base 2.1.7 pcmk__list_nodes@Base 2.1.1 + pcmk__list_providers@Base 2.1.7 pcmk__list_result_codes@Base 2.1.5 + pcmk__list_standards@Base 2.1.7 pcmk__log_graph@Base 2.1.2 pcmk__log_graph_action@Base 2.1.2 pcmk__log_transition_summary@Base 2.0.2 @@ -66,17 +51,19 @@ libpacemaker.so.1 libpacemaker1 #MINVER# pcmk__simulate_node_config@Base 2.1.4 pcmk__simulate_transition@Base 2.1.4 pcmk__status@Base 2.1.4 - pcmk__this_with_colocations@Base 2.1.6 pcmk__unpack_constraints@Base 2.1.2 pcmk__unpack_graph@Base 2.1.2 pcmk__update_graph@Base 2.1.2 - pcmk__with_this_colocations@Base 2.1.6 pcmk_check_rules@Base 2.1.5 pcmk_controller_status@Base 2.1.1 pcmk_designated_controller@Base 2.1.1 pcmk_free_injections@Base 2.1.2 + pcmk_list_agents@Base 2.1.7 + pcmk_list_alternatives@Base 2.1.7 pcmk_list_nodes@Base 2.1.1 + pcmk_list_providers@Base 2.1.7 pcmk_list_result_codes@Base 2.1.5 + pcmk_list_standards@Base 2.1.7 pcmk_pacemakerd_status@Base 2.1.1 pcmk_query_node_info@Base 2.1.6 pcmk_resource_digests@Base 2.1.1 diff --git a/debian/libpe-rules26.symbols b/debian/libpe-rules26.symbols index 2a31c7f..11d65fe 100644 --- a/debian/libpe-rules26.symbols +++ b/debian/libpe-rules26.symbols @@ -8,6 +8,7 @@ libpe_rules.so.26 libpe-rules26 #MINVER# pe__eval_op_expr@Base 2.0.5~rc2 pe__eval_role_expr@Base 2.0.5~rc2 pe__eval_rsc_expr@Base 2.0.5~rc2 + pe__node_attribute_calculated@Base 2.1.7 pe_cron_range_satisfied@Base 2.0.2 pe_eval_expr@Base 2.0.5~rc2 pe_eval_nvpairs@Base 2.0.5~rc2 @@ -17,7 +18,6 @@ libpe_rules.so.26 libpe-rules26 #MINVER# pe_expand_re_matches@Base 1.1.16~rc1 pe_free_alert_list@Base 1.1.18~rc3 pe_metadata@Base 1.0.10 - pe_node_attribute_calculated@Base 1.1.18~rc3 pe_node_attribute_raw@Base 1.1.18~rc3 pe_pref@Base 1.0.10 pe_test_expression@Base 2.0.3 diff --git a/debian/libpe-status28.symbols b/debian/libpe-status28.symbols index 6a1b193..20fa545 100644 --- a/debian/libpe-status28.symbols +++ b/debian/libpe-status28.symbols @@ -23,7 +23,6 @@ libpe_status.so.28 libpe-status28 #MINVER# find_expression_type@Base 1.1.14~rc4 find_first_action@Base 1.1.14~rc4 find_operations@Base 1.1.14~rc4 - find_rsc_op_entry@Base 1.1.14~rc4 get_complex_task@Base 1.1.14~rc4 get_effective_time@Base 1.1.14~rc4 get_meta_attributes@Base 1.1.14~rc4 @@ -46,10 +45,15 @@ libpe_status.so.28 libpe-status28 #MINVER# native_print@Base 1.1.14~rc4 native_resource_state@Base 1.1.14~rc4 native_unpack@Base 1.1.14~rc4 - node_list_exclude@Base 1.1.14~rc4 order_actions@Base 1.1.14~rc4 + pcmk__action_requires@Base 2.1.7 + pcmk__find_action_config@Base 2.1.7 pcmk__native_output_string@Base 2.1.1 + pcmk__parse_on_fail@Base 2.1.7 + pcmk__role_after_failure@Base 2.1.7 pcmk__rsc_filtered_by_node@Base 2.0.5~rc2 + pcmk__unpack_action_meta@Base 2.1.7 + pcmk__unpack_action_rsc_params@Base 2.1.7 pe__action2reason@Base 2.1.2 pe__add_action_expected_result@Base 2.1.5 pe__add_bundle_remote_name@Base 2.0.2 @@ -61,11 +65,11 @@ libpe_status.so.28 libpe-status28 #MINVER# pe__bundle_html@Base 2.0.3 pe__bundle_is_filtered@Base 2.0.5~rc2 pe__bundle_max@Base 2.1.6 - pe__bundle_max_per_node@Base 2.1.6 pe__bundle_needs_remote_name@Base 2.0.2 pe__bundle_resource_state@Base 2.0.2 pe__bundle_text@Base 2.0.3 pe__bundle_xml@Base 2.0.3 + pe__bundled_resource@Base 2.1.7 pe__calculate_digests@Base 2.1.1 pe__clear_failcount@Base 2.0.1~rc2 pe__clear_resource_flags_on_all@Base 2.1.1 @@ -73,6 +77,7 @@ libpe_status.so.28 libpe-status28 #MINVER# pe__clear_resource_history@Base 2.0.4 pe__clone_child_id@Base 2.1.4 pe__clone_default@Base 2.1.1 + pe__clone_flag_is_set@Base 2.1.7 pe__clone_is_filtered@Base 2.0.5~rc2 pe__clone_is_ordered@Base 2.1.5 pe__clone_max@Base 2.1.6 @@ -100,11 +105,15 @@ libpe_status.so.28 libpe-status28 #MINVER# pe__filter_rsc_list@Base 2.0.5~rc2 pe__find_active_requires@Base 1.1.19 pe__find_bundle_replica@Base 2.0.2 + pe__first_container@Base 2.1.7 + pe__foreach_bundle_replica@Base 2.1.7 + pe__foreach_const_bundle_replica@Base 2.1.7 pe__foreach_param_check@Base 2.0.1~rc2 pe__free_bundle@Base 2.0.2 pe__free_clone_notification_data@Base 2.1.6 pe__free_digests@Base 2.1.1 pe__free_param_checks@Base 2.0.1~rc2 + pe__get_rsc_in_container@Base 2.1.7 pe__group_default@Base 2.1.1 pe__group_flag_is_set@Base 2.1.5 pe__group_is_filtered@Base 2.0.5~rc2 @@ -119,8 +128,10 @@ libpe_status.so.28 libpe-status28 #MINVER# pe__name_and_nvpairs_xml@Base 2.0.3 pe__native_is_filtered@Base 2.0.5~rc2 pe__new_rsc_pseudo_action@Base 2.1.5 + pe__node_attribute_calculated@Base 2.1.7 pe__node_display_name@Base 2.0.4 pe__node_health@Base 2.1.4 + pe__node_is_bundle_instance@Base 2.1.7 pe__node_list2table@Base 2.0.4 pe__order_notifs_after_fencing@Base 2.1.5 pe__print_bundle@Base 2.0.2 @@ -141,7 +152,7 @@ libpe_status.so.28 libpe-status28 #MINVER# pe__set_clone_flag@Base 2.1.5 pe__set_next_role@Base 2.1.1 pe__set_resource_flags_recursive@Base 2.0.5~rc2 - pe__show_node_weights_as@Base 2.0.4 + pe__show_node_scores_as@Base 2.1.7 pe__shutdown_requested@Base 2.0.3 pe__sum_node_health_scores@Base 2.1.4 pe__target_rc_from_xml@Base 2.0.3 @@ -177,7 +188,6 @@ libpe_status.so.28 libpe-status28 #MINVER# pe_get_failcount@Base 1.1.18~rc4 pe_metadata@Base 1.1.14~rc4 pe_new_working_set@Base 2.0.1~rc2 - pe_node_attribute_calculated@Base 1.1.18~rc3 pe_node_attribute_raw@Base 1.1.18~rc3 pe_pref@Base 1.1.14~rc4 pe_reset_working_set@Base 2.0.1~rc2 @@ -189,7 +199,6 @@ libpe_status.so.28 libpe-status28 #MINVER# pe_test_rule_full@Base 1.1.17~rc1 pe_test_rule_re@Base 1.1.16~rc1 pe_unpack_nvpairs@Base 2.0.3 - pe_wo@Base 1.1.18~rc3 print_rscs_brief@Base 1.1.14~rc4 resource_class_functions@Base 1.1.14~rc4 resource_location@Base 1.1.14~rc4 diff --git a/debian/pacemaker-cts.install b/debian/pacemaker-cts.install index 081e9f9..5e85e8d 100644 --- a/debian/pacemaker-cts.install +++ b/debian/pacemaker-cts.install @@ -1,4 +1,3 @@ -usr/lib/python*/site-packages/cts usr/lib/python*/site-packages/pacemaker/_cts usr/lib/pacemaker/cts-log-watcher usr/lib/pacemaker/cts-support diff --git a/debian/patches/Always-format-time_t-values-as-long-long.patch b/debian/patches/Always-format-time_t-values-as-long-long.patch index 444991b..afcad60 100644 --- a/debian/patches/Always-format-time_t-values-as-long-long.patch +++ b/debian/patches/Always-format-time_t-values-as-long-long.patch @@ -21,7 +21,7 @@ Signed-off-by: Ferenc Wágner 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemons/fenced/fenced_remote.c b/daemons/fenced/fenced_remote.c -index dc67947..ef2237a 100644 +index 843b3d4..9616e8e 100644 --- a/daemons/fenced/fenced_remote.c +++ b/daemons/fenced/fenced_remote.c @@ -1042,8 +1042,8 @@ merge_duplicates(remote_fencing_op_t *op) diff --git a/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch b/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch index ac8898b..076daac 100644 --- a/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch +++ b/debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch @@ -7,10 +7,10 @@ Subject: Always run Inkscape under the C.UTF-8 locale 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am -index c4ade5c..6ecb9ab 100644 +index e48e19a..54e2896 100644 --- a/doc/sphinx/Makefile.am +++ b/doc/sphinx/Makefile.am -@@ -98,7 +98,7 @@ DEPS_Pacemaker_Remote = $(PNGS_Pacemaker_Remote) +@@ -104,7 +104,7 @@ DEPS_Pacemaker_Remote = $(PNGS_Pacemaker_Remote) if BUILD_SPHINX_DOCS diff --git a/debian/patches/Fix-typos-resouce-resource.patch b/debian/patches/Fix-typos-resouce-resource.patch index d0e85a5..7f3ed87 100644 --- a/debian/patches/Fix-typos-resouce-resource.patch +++ b/debian/patches/Fix-typos-resouce-resource.patch @@ -4,9 +4,8 @@ Subject: Fix typos: resouce -> resource --- cts/cts-exec.in | 2 +- - cts/lab/CTStests.py | 2 +- lib/pacemaker/pcmk_sched_primitive.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cts/cts-exec.in b/cts/cts-exec.in index a89eb0e..be19d07 100644 @@ -21,24 +20,11 @@ index a89eb0e..be19d07 100644 common_cmds = self._common_cmds # do not use service and systemd at the same time, it is the same resource. -diff --git a/cts/lab/CTStests.py b/cts/lab/CTStests.py -index 61766ce..00fe2d9 100644 ---- a/cts/lab/CTStests.py -+++ b/cts/lab/CTStests.py -@@ -743,7 +743,7 @@ class StandbyTest(CTSTest): - # set the node to standby mode - # check resources, none resource should be running on the node - # set the node to active mode -- # check resouces, resources should have been migrated back (SHOULD THEY?) -+ # check resources, resources should have been migrated back (SHOULD THEY?) - - def __call__(self, node): - diff --git a/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c -index aefbf9a..d612b22 100644 +index 96acf1c..91adbff 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c -@@ -1250,7 +1250,7 @@ start_resource(pe_resource_t *rsc, pe_node_t *node, bool optional) +@@ -1326,7 +1326,7 @@ start_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) * reasons later. */ pe_rsc_trace(rsc, @@ -46,8 +32,8 @@ index aefbf9a..d612b22 100644 + "Start of multiply active resource %s " "on expected node %s will be a pseudo-action", rsc->id, pe__node_name(node)); - pe__set_action_flags(start, pe_action_pseudo); -@@ -1297,7 +1297,7 @@ promote_resource(pe_resource_t *rsc, pe_node_t *node, bool optional) + pe__set_action_flags(start, pcmk_action_pseudo); +@@ -1373,7 +1373,7 @@ promote_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) * other reasons later. */ pe_rsc_trace(rsc, @@ -55,4 +41,4 @@ index aefbf9a..d612b22 100644 + "Promotion of multiply active resource %s " "on expected node %s will be a pseudo-action", rsc->id, pe__node_name(node)); - pe__set_action_flags(promote, pe_action_pseudo); + pe__set_action_flags(promote, pcmk_action_pseudo); diff --git a/debian/patches/Make-the-asciidoc-documentation-reproducible.patch b/debian/patches/Make-the-asciidoc-documentation-reproducible.patch index 5434e8b..b0cfc58 100644 --- a/debian/patches/Make-the-asciidoc-documentation-reproducible.patch +++ b/debian/patches/Make-the-asciidoc-documentation-reproducible.patch @@ -7,10 +7,10 @@ Subject: Make the asciidoc documentation reproducible 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am -index 1400145..b6c254c 100644 +index a40ddfe..4b614fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -42,7 +42,7 @@ RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html +@@ -46,7 +46,7 @@ RSYNC_DEST ?= root@www.clusterlabs.org:/var/www/html RSYNC_OPTS = -rlptvzxS --progress if IS_ASCIIDOC diff --git a/debian/patches/Remove-references-to-the-build-directory.patch b/debian/patches/Remove-references-to-the-build-directory.patch index 10315b0..30c6321 100644 --- a/debian/patches/Remove-references-to-the-build-directory.patch +++ b/debian/patches/Remove-references-to-the-build-directory.patch @@ -65,7 +65,7 @@ index 51dd1e6..ccd8730 100644 $(abs_builddir)/$< --output $@ ; \ fi diff --git a/python/pacemaker/buildoptions.py.in b/python/pacemaker/buildoptions.py.in -index 53b492b..34da8de 100644 +index 17fe981..3bb85c1 100644 --- a/python/pacemaker/buildoptions.py.in +++ b/python/pacemaker/buildoptions.py.in @@ -13,12 +13,6 @@ class BuildOptions: diff --git a/debian/patches/alerts-make-the-scripts-executable.patch b/debian/patches/alerts-make-the-scripts-executable.patch index 89f62cf..9bab37d 100644 --- a/debian/patches/alerts-make-the-scripts-executable.patch +++ b/debian/patches/alerts-make-the-scripts-executable.patch @@ -11,14 +11,12 @@ Signed-off-by: Ferenc Wágner 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/alerts/Makefile.am b/agents/alerts/Makefile.am -index fdb294f..b8cc756 100644 +index a3fe891..c9c77f8 100644 --- a/agents/alerts/Makefile.am +++ b/agents/alerts/Makefile.am -@@ -10,6 +10,6 @@ +@@ -10,4 +10,4 @@ include $(top_srcdir)/mk/common.mk samplesdir = $(datadir)/$(PACKAGE)/alerts/ --dist_samples_DATA = alert_file.sh.sample \ -+dist_samples_SCRIPTS = alert_file.sh.sample \ - alert_smtp.sh.sample \ - alert_snmp.sh.sample +-dist_samples_DATA = $(wildcard *.sample) ++dist_samples_SCRIPTS = $(wildcard *.sample) diff --git a/debian/patches/cts-do-not-capture-the-build-directory.patch b/debian/patches/cts-do-not-capture-the-build-directory.patch index b6d641e..f36112a 100644 --- a/debian/patches/cts-do-not-capture-the-build-directory.patch +++ b/debian/patches/cts-do-not-capture-the-build-directory.patch @@ -11,7 +11,7 @@ Subject: cts: do not capture the build directory 5 files changed, 46 deletions(-) diff --git a/cts/cts-attrd.in b/cts/cts-attrd.in -index b7ad538..89e476f 100644 +index b594ac3..f0cba42 100644 --- a/cts/cts-attrd.in +++ b/cts/cts-attrd.in @@ -17,16 +17,6 @@ import subprocess @@ -92,7 +92,7 @@ index c6837c4..c32ae96 100644 from pacemaker.exitstatus import ExitStatus diff --git a/cts/cts-scheduler.in b/cts/cts-scheduler.in -index ee0cb7b..99f90fc 100644 +index 50c32f6..4e186b0 100644 --- a/cts/cts-scheduler.in +++ b/cts/cts-scheduler.in @@ -17,15 +17,6 @@ import subprocess diff --git a/debian/patches/python-clean-up-the-__pycache__-directories.patch b/debian/patches/python-clean-up-the-__pycache__-directories.patch index 144e5b3..c52a049 100644 --- a/debian/patches/python-clean-up-the-__pycache__-directories.patch +++ b/debian/patches/python-clean-up-the-__pycache__-directories.patch @@ -8,10 +8,10 @@ Subject: python: clean up the __pycache__ directories 2 files changed, 6 insertions(+) diff --git a/python/pacemaker/Makefile.am b/python/pacemaker/Makefile.am -index f209bba..f722d48 100644 +index df9cc46..06322d7 100644 --- a/python/pacemaker/Makefile.am +++ b/python/pacemaker/Makefile.am -@@ -15,3 +15,6 @@ pkgpython_PYTHON = __init__.py \ +@@ -15,3 +15,6 @@ pkgpython_PYTHON = __init__.py \ nodist_pkgpython_PYTHON = buildoptions.py SUBDIRS = _cts @@ -19,13 +19,13 @@ index f209bba..f722d48 100644 +clean-local: + rm -rf __pycache__ diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am -index 490b272..6f93823 100644 +index 219812c..e6d303c 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am -@@ -10,3 +10,6 @@ - MAINTAINERCLEANFILES = Makefile.in +@@ -11,3 +11,6 @@ MAINTAINERCLEANFILES = Makefile.in - EXTRA_DIST = $(wildcard test_*) + EXTRA_DIST = $(wildcard test_*) \ + __init__.py + +clean-local: + rm -rf __pycache__ -- cgit v1.2.3