diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 13:39:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 13:39:29 +0000 |
commit | 0da01ba6cb09bc85833b7a9146953ab54b6420bd (patch) | |
tree | 05d5ba5f31fd2c02eb0366775590ac4c76a2c9a4 | |
parent | Merging upstream version 2.1.8~rc1. (diff) | |
download | pacemaker-debian.tar.xz pacemaker-debian.zip |
Adding debian version 2.1.8~rc1-1.debian/2.1.8_rc1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r-- | debian/changelog | 28 | ||||
-rw-r--r-- | debian/control | 5 | ||||
-rw-r--r-- | debian/copyright | 8 | ||||
-rw-r--r-- | debian/libcrmcluster29t64.symbols | 31 | ||||
-rw-r--r-- | debian/libcrmcommon34t64.symbols | 97 | ||||
-rw-r--r-- | debian/libpacemaker1t64.symbols | 26 | ||||
-rw-r--r-- | debian/libpe-rules26t64.symbols | 13 | ||||
-rw-r--r-- | debian/libpe-status28t64.symbols | 19 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/pacemaker-cli-utils.install | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/pacemaker-remote.install | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | debian/pacemaker.install | 7 | ||||
-rw-r--r-- | debian/patches/Always-format-time_t-values-as-long-long.patch | 37 | ||||
-rw-r--r-- | debian/patches/Always-run-Inkscape-under-the-C.UTF-8-locale.patch | 2 | ||||
-rw-r--r-- | debian/patches/Fix-typos-resouce-resource.patch | 30 | ||||
-rw-r--r-- | debian/patches/Remove-references-to-the-build-directory.patch | 20 | ||||
-rw-r--r-- | debian/patches/cts-do-not-capture-the-build-directory.patch | 4 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 2 | ||||
-rw-r--r-- | debian/source/lintian-overrides | 3 |
19 files changed, 207 insertions, 134 deletions
diff --git a/debian/changelog b/debian/changelog index bcf83ba..faefad8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +pacemaker (2.1.8~rc1-1) unstable; urgency=medium + + * [ab5ed61] New upstream pre-release (2.1.8~rc1) + * [c477642] Drop upstreamed patch, refresh the rest + * [26aa14e] Update Standards-Version to 4.7.0 (no changes required) + * [00be940] Switch Build-Depends to systemd-dev. + We only needed the systemd build dependency to get the paths defined + in systemd.pc. Now these are available in an architecture-independent + package, which means we can stop relying on dh-exec as well. + (Closes: #1060623) + * [dc737d8] Ship the new pacemaker-based.7 man page + * [f193828] Update symbols files. + Before 2.1.8 both libpe-rules and libpe-status allocated the + was_processing_error and was_processing_warning symbols (global + variables). In 2.1.8 these symbols were moved into libcrmcommon, + which is a common dependency of libpe-rules and libpe-status. Since + library dependencies are automatically loaded, this does not + constitute an ABI break. + * [42461ae] Update copyright years + * [bbf8d26] Specify the System V init directory. + Autodetection in configure.ac is based on presence, but modern build + containers can miss /etc/init.d. + * [0d1a7f1] Explicitly enable systemd support. + Autodetection in configure.ac depends on live DBus or systemctl, but + modern build containers can miss those. + + -- Ferenc Wágner <wferi@debian.org> Fri, 31 May 2024 19:22:07 +0200 + pacemaker (2.1.7-1) unstable; urgency=medium * [09de5bf] New upstream release (2.1.7) (Closes: #1067626) diff --git a/debian/control b/debian/control index e7c0ba2..177bfc2 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Build-Depends: cluster-glue-dev, debhelper-compat (= 13), - dh-exec, dh-sequence-python3, # resource agent man pages are generated via: docbook-xsl, @@ -35,7 +34,7 @@ Build-Depends: pkgconf, # 'pacemaker' is a pure Python package: python3-all, - systemd [linux-any], + systemd-dev, uuid-dev, # detecting docbook-xsl needs: xsltproc, @@ -47,7 +46,7 @@ Build-Depends-Indep: inkscape, python3-sphinx, Rules-Requires-Root: no -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://www.clusterlabs.org/ Vcs-Git: https://salsa.debian.org/ha-team/pacemaker.git Vcs-Browser: https://salsa.debian.org/ha-team/pacemaker diff --git a/debian/copyright b/debian/copyright index 944f34b..398e201 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: pacemaker Source: https://github.com/ClusterLabs/pacemaker/releases Files: * -Copyright: 1998-2023 the Pacemaker project contributors +Copyright: 1998-2024 the Pacemaker project contributors License: GPL-2+ Files: etc/init.d/pacemaker.in daemons/execd/pacemaker_remote.in @@ -12,15 +12,15 @@ Copyright: 1998-2018 Andrew Beekhof <andrew[at]beekhof[dot]net> License: RevisedBSD Files: include/* lib/* po/*.po -Copyright: 1998-2023 the Pacemaker project contributors +Copyright: 1998-2024 the Pacemaker project contributors License: LGPL-2+ Files: doc/* -Copyright: 2009-2023 the Pacemaker project contributors +Copyright: 2009-2024 the Pacemaker project contributors License: CC-BY-SA-4 Files: debian/* -Copyright: 1999-2023 Debian-HA-Maintainers <debian-ha-maintainers@lists.alioth.debian.org> +Copyright: 1999-2024 Debian-HA-Maintainers <debian-ha-maintainers@lists.alioth.debian.org> License: GPL-2+ License: RevisedBSD diff --git a/debian/libcrmcluster29t64.symbols b/debian/libcrmcluster29t64.symbols index dc13e6c..5b2947a 100644 --- a/debian/libcrmcluster29t64.symbols +++ b/debian/libcrmcluster29t64.symbols @@ -43,21 +43,44 @@ libcrmcluster.so.29 libcrmcluster29t64 #MINVER# get_node_name@Base 1.1.10 is_corosync_cluster@Base 1.1.10 name_for_cluster_type@Base 1.1.10 + pcmk__cluster_destroy_node_caches@Base 2.1.8~rc1 + pcmk__cluster_forget_cluster_node@Base 2.1.8~rc1 + pcmk__cluster_forget_remote_node@Base 2.1.8~rc1 + pcmk__cluster_init_node_caches@Base 2.1.8~rc1 + pcmk__cluster_is_node_active@Base 2.1.8~rc1 + pcmk__cluster_local_node_name@Base 2.1.8~rc1 + pcmk__cluster_lookup_remote_node@Base 2.1.8~rc1 + pcmk__cluster_node_name@Base 2.1.8~rc1 + pcmk__cluster_node_uuid@Base 2.1.8~rc1 + pcmk__cluster_num_active_nodes@Base 2.1.8~rc1 + pcmk__cluster_num_remote_nodes@Base 2.1.8~rc1 + pcmk__cluster_parse_msg_type@Base 2.1.8~rc1 + pcmk__cluster_send_message@Base 2.1.8~rc1 + pcmk__cluster_set_autoreap@Base 2.1.8~rc1 + pcmk__cluster_set_status_callback@Base 2.1.8~rc1 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__cpg_confchg_cb@Base 2.1.8~rc1 + pcmk__cpg_message_data@Base 2.1.8~rc1 + pcmk__get_node@Base 2.1.8~rc1 + pcmk__node_name_from_uuid@Base 2.1.8~rc1 + pcmk__purge_node_from_cache@Base 2.1.8~rc1 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 - pcmk__search_known_node_cache@Base 2.1.1 pcmk__search_node_caches@Base 2.1.1 pcmk__update_peer_expected@Base 2.1.1 pcmk__update_peer_state@Base 2.1.1 + pcmk_cluster_connect@Base 2.1.8~rc1 + pcmk_cluster_disconnect@Base 2.1.8~rc1 pcmk_cluster_free@Base 2.1.6 + pcmk_cluster_layer_text@Base 2.1.8~rc1 pcmk_cluster_new@Base 2.1.6 + pcmk_cluster_set_destroy_fn@Base 2.1.8~rc1 pcmk_cpg_membership@Base 1.1.10 + pcmk_cpg_set_confchg_fn@Base 2.1.8~rc1 + pcmk_cpg_set_deliver_fn@Base 2.1.8~rc1 + pcmk_get_cluster_layer@Base 2.1.8~rc1 pcmk_message_common_cs@Base 1.1.10 reap_crm_member@Base 1.1.10 send_cluster_message@Base 1.1.10 diff --git a/debian/libcrmcommon34t64.symbols b/debian/libcrmcommon34t64.symbols index 3274555..5478205 100644 --- a/debian/libcrmcommon34t64.symbols +++ b/debian/libcrmcommon34t64.symbols @@ -232,13 +232,14 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__attrd_api_refresh@Base 2.1.5 pcmk__attrd_api_update@Base 2.1.5 pcmk__attrd_api_update_list@Base 2.1.5 - pcmk__auto_watchdog_timeout@Base 2.0.4 + pcmk__auto_stonith_watchdog_timeout@Base 2.1.8~rc1 pcmk__build_arg_context@Base 2.0.3 pcmk__build_path@Base 2.0.4 + pcmk__build_schema_xml_node@Base 2.1.8~rc1 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__check_feature_set@Base 2.1.8~rc1 pcmk__chown_series_sequence@Base 2.0.4 pcmk__cib_abs_xpath_for@Base 2.1.7 pcmk__cli_help@Base 2.0.4 @@ -251,11 +252,14 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__close_fds_in_child@Base 2.0.3 pcmk__cluster_option@Base 2.0.4 pcmk__cmdline_preproc@Base 2.0.3 + pcmk__cmp_schemas_by_name@Base 2.1.8~rc1 pcmk__compress@Base 2.0.4 + pcmk__condition_type@Base 2.1.8~rc1 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__configured_schema_validates@Base 2.1.8~rc1 pcmk__connect_generic_ipc@Base 2.1.7 pcmk__connect_ipc@Base 2.1.7 pcmk__connect_remote@Base 2.0.4 @@ -263,7 +267,9 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__copy_result@Base 2.1.4 pcmk__copy_timet@Base 2.1.6 pcmk__daemon_can_write@Base 1.1.19 + pcmk__daemon_metadata@Base 2.1.8~rc1 pcmk__daemonize@Base 2.0.5~rc2 + pcmk__diff_v1_xml_object@Base 2.1.8~rc1 pcmk__drop_all_clients@Base 2.0.4 pcmk__dup_alert@Base 2.0.4 pcmk__effective_rc@Base 2.0.5~rc2 @@ -274,15 +280,18 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__env_option@Base 2.0.4 pcmk__env_option_enabled@Base 2.0.4 pcmk__epoch2str@Base 2.0.4 + pcmk__evaluate_condition@Base 2.1.8~rc1 + pcmk__evaluate_date_expression@Base 2.1.8~rc1 + pcmk__evaluate_rules@Base 2.1.8~rc1 pcmk__exitc_error_quark@Base 2.0.5~rc2 pcmk__file_contents@Base 2.0.4 pcmk__filter_op_for_digest@Base 2.0.4 pcmk__find_client@Base 2.0.4 pcmk__find_client_by_id@Base 2.0.4 + pcmk__find_node_in_list@Base 2.1.8~rc1 pcmk__force_args@Base 2.0.3 pcmk__foreach_ipc_client@Base 2.0.4 pcmk__format_nvpair@Base 2.1.1 - pcmk__format_option_metadata@Base 2.1.4 pcmk__format_result@Base 2.1.4 pcmk__formatted_printf@Base 2.1.1 pcmk__formatted_vprintf@Base 2.1.1 @@ -294,14 +303,18 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# 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_sbd_watchdog_timeout@Base 2.1.8~rc1 + pcmk__get_schema@Base 2.1.8~rc1 pcmk__get_tmpdir@Base 2.0.4 pcmk__guint_from_hash@Base 2.0.4 + pcmk__highest_schema_name@Base 2.1.8~rc1 pcmk__html_add_header@Base 2.0.3 + pcmk__html_create@Base 2.1.8~rc1 pcmk__html_output_entries@Base 2.0.3 pcmk__indented_printf@Base 2.0.2 pcmk__indented_vprintf@Base 2.0.3 pcmk__init_tls_dh@Base 2.0.1~rc2 + pcmk__insert_dup@Base 2.1.8~rc1 pcmk__ipc_client_count@Base 2.0.4 pcmk__ipc_create_ack_as@Base 2.1.4 pcmk__ipc_fd@Base 2.1.7 @@ -312,9 +325,9 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__ipc_send_xml@Base 2.0.4 pcmk__is_daemon@Base 2.1.1 pcmk__is_fencing_action@Base 2.1.4 + pcmk__load_schemas_from_dir@Base 2.1.8~rc1 pcmk__locate_sbd@Base 2.0.5~rc2 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 @@ -325,32 +338,41 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__mk_none_output@Base 2.0.3 pcmk__mk_text_output@Base 2.0.2 pcmk__mk_xml_output@Base 2.0.2 + pcmk__multiply_active_text@Base 2.1.8~rc1 pcmk__n_rc@Base 2.1.5 pcmk__new_client@Base 2.0.4 pcmk__new_common_args@Base 2.0.3 pcmk__new_tls_session@Base 2.0.1~rc2 pcmk__new_unauth_client@Base 2.0.4 + pcmk__node_attr@Base 2.1.8~rc1 pcmk__node_attr_target@Base 2.0.4 - pcmk__none_output_entries@Base 2.0.3 pcmk__notify_key@Base 2.0.4 pcmk__numeric_strcasecmp@Base 2.1.1 pcmk__op_key@Base 2.0.4 pcmk__our_nodename@Base 2.1.6 pcmk__output_and_clear_error@Base 2.1.1 + pcmk__output_cluster_options@Base 2.1.8~rc1 pcmk__output_create_html_node@Base 2.0.3 pcmk__output_create_xml_node@Base 2.0.3 pcmk__output_create_xml_text_node@Base 2.0.3 + pcmk__output_enable_list_element@Base 2.1.8~rc1 + pcmk__output_fencing_params@Base 2.1.8~rc1 pcmk__output_free@Base 2.0.2 + pcmk__output_get_legacy_xml@Base 2.1.8~rc1 pcmk__output_get_log_level@Base 2.1.6 pcmk__output_new@Base 2.0.2 + pcmk__output_primitive_meta@Base 2.1.8~rc1 + pcmk__output_set_legacy_xml@Base 2.1.8~rc1 pcmk__output_set_log_filter@Base 2.1.7 pcmk__output_set_log_level@Base 2.1.1 + pcmk__output_text_set_fancy@Base 2.1.8~rc1 pcmk__output_xml_add_node_copy@Base 2.1.6 pcmk__output_xml_create_parent@Base 2.0.3 pcmk__output_xml_peek_parent@Base 2.0.3 pcmk__output_xml_pop_parent@Base 2.0.3 pcmk__output_xml_push_parent@Base 2.0.3 pcmk__panic@Base 2.0.5~rc2 + pcmk__parse_combine@Base 2.1.8~rc1 pcmk__parse_health_strategy@Base 2.1.4 pcmk__parse_ll_range@Base 2.0.4 pcmk__pcmkd_api_reply2str@Base 2.1.6 @@ -377,7 +399,9 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__register_messages@Base 2.0.2 pcmk__remote_message_xml@Base 2.0.4 pcmk__remote_ready@Base 2.0.4 + pcmk__remote_schema_dir@Base 2.1.8~rc1 pcmk__remote_send_xml@Base 2.0.4 + pcmk__replace_submatches@Base 2.1.8~rc1 pcmk__reset_request@Base 2.1.4 pcmk__reset_result@Base 2.1.2 pcmk__result_bounds@Base 2.1.5 @@ -386,6 +410,7 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__scan_min_int@Base 2.1.1 pcmk__scan_nvpair@Base 2.1.1 pcmk__scan_port@Base 2.1.1 + pcmk__schema_files_later_than@Base 2.1.8~rc1 pcmk__score_green@Base 2.0.4 pcmk__score_red@Base 2.0.4 pcmk__score_yellow@Base 2.0.4 @@ -406,9 +431,11 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__set_xml_doc_flag@Base 2.1.4 pcmk__sleep_ms@Base 2.1.1 pcmk__sockaddr2str@Base 2.0.4 + pcmk__sort_schemas@Base 2.1.8~rc1 pcmk__starts_with@Base 2.0.4 pcmk__stop_based_ipc@Base 2.0.4 pcmk__str_any_of@Base 2.0.5~rc2 + pcmk__str_copy_as@Base 2.1.8~rc1 pcmk__str_in_list@Base 2.0.4 pcmk__str_table_dup@Base 2.1.1 pcmk__str_update@Base 2.1.4 @@ -436,41 +463,63 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk__uid2username@Base 2.0.4 pcmk__unregister_formats@Base 2.0.4 pcmk__update_acl_user@Base 2.0.4 + pcmk__update_schema@Base 2.1.8~rc1 pcmk__valid_boolean@Base 2.0.4 + pcmk__valid_int@Base 2.1.8~rc1 pcmk__valid_interval_spec@Base 2.0.4 - pcmk__valid_number@Base 2.0.4 + pcmk__valid_no_quorum_policy@Base 2.1.8~rc1 pcmk__valid_percentage@Base 2.1.4 - pcmk__valid_positive_number@Base 2.0.4 - pcmk__valid_quorum@Base 2.0.4 - pcmk__valid_sbd_timeout@Base 2.0.4 - pcmk__valid_script@Base 2.0.4 + pcmk__valid_placement_strategy@Base 2.1.8~rc1 + pcmk__valid_positive_int@Base 2.1.8~rc1 + pcmk__valid_stonith_watchdog_timeout@Base 2.1.8~rc1 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__warn_if_schema_deprecated@Base 2.1.8~rc1 + pcmk__warn_multiple_name_matches@Base 2.1.8~rc1 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 pcmk__xe_add_node@Base 2.1.5 pcmk__xe_attr_is_true@Base 2.1.4 + pcmk__xe_copy_attrs@Base 2.1.8~rc1 + pcmk__xe_create@Base 2.1.8~rc1 + pcmk__xe_delete_match@Base 2.1.8~rc1 + pcmk__xe_first_child@Base 2.1.8~rc1 pcmk__xe_foreach_child@Base 2.1.5 pcmk__xe_get_bool_attr@Base 2.1.4 - pcmk__xe_match@Base 2.0.5~rc2 + pcmk__xe_get_datetime@Base 2.1.8~rc1 + pcmk__xe_next_same@Base 2.1.8~rc1 + pcmk__xe_remove_attr@Base 2.1.8~rc1 + pcmk__xe_remove_attr_cb@Base 2.1.8~rc1 pcmk__xe_remove_matching_attrs@Base 2.1.1 + pcmk__xe_replace_match@Base 2.1.8~rc1 pcmk__xe_set_bool_attr@Base 2.1.4 + pcmk__xe_set_content@Base 2.1.8~rc1 pcmk__xe_set_props@Base 2.1.1 pcmk__xe_set_propv@Base 2.1.1 + pcmk__xe_update_match@Base 2.1.8~rc1 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 + pcmk__xml_copy@Base 2.1.8~rc1 + pcmk__xml_escape@Base 2.1.8~rc1 + pcmk__xml_needs_escape@Base 2.1.8~rc1 pcmk__xml_output_finish@Base 2.1.5 pcmk__xml_output_new@Base 2.1.5 + pcmk__xml_parse@Base 2.1.8~rc1 + pcmk__xml_read@Base 2.1.8~rc1 pcmk__xml_show@Base 2.1.6 pcmk__xml_show_changes@Base 2.1.6 + pcmk__xml_string@Base 2.1.8~rc1 + pcmk__xml_tree_foreach@Base 2.1.8~rc1 + pcmk__xml_write_fd@Base 2.1.8~rc1 + pcmk__xml_write_file@Base 2.1.8~rc1 pcmk__xpath_node_id@Base 2.1.1 pcmk_acl_required@Base 1.1.12 + pcmk_action_text@Base 2.1.8~rc1 pcmk_cib_parent_name_for@Base 2.1.4 pcmk_cib_xpath_for@Base 2.1.4 pcmk_connect_ipc@Base 2.0.5~rc2 @@ -489,14 +538,20 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk_dispatch_ipc@Base 2.0.5~rc2 pcmk_drain_main_loop@Base 2.0.1~rc2 pcmk_errorname@Base 1.1.10 + pcmk_evaluate_rule@Base 2.1.8~rc1 pcmk_find_cib_element@Base 2.1.4 + pcmk_find_node@Base 2.1.8~rc1 + pcmk_foreach_active_resource@Base 2.1.8~rc1 pcmk_format_named_time@Base 2.0.3 pcmk_format_nvpair@Base 2.0.3 pcmk_free_ipc_api@Base 2.0.5~rc2 pcmk_free_ipc_event@Base 2.0.0~rc4 pcmk_free_nvpairs@Base 2.0.1~rc5 pcmk_free_xml_subtree@Base 2.0.3 + pcmk_get_dc@Base 2.1.8~rc1 + pcmk_get_no_quorum_policy@Base 2.1.8~rc1 pcmk_get_ra_caps@Base 2.0.1~rc2 + pcmk_has_quorum@Base 2.1.8~rc1 pcmk_hostname@Base 2.0.1~rc2 pcmk_ipc_is_connected@Base 2.0.5~rc2 pcmk_ipc_name@Base 2.0.5~rc2 @@ -506,12 +561,21 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# 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_node_is_clean@Base 2.1.8~rc1 + pcmk_node_is_in_maintenance@Base 2.1.8~rc1 + pcmk_node_is_online@Base 2.1.8~rc1 + pcmk_node_is_pending@Base 2.1.8~rc1 + pcmk_node_is_shutting_down@Base 2.1.8~rc1 pcmk_numeric_strcasecmp@Base 2.0.5~rc2 pcmk_nvpairs2xml_attrs@Base 2.0.1~rc5 + pcmk_on_fail_text@Base 2.1.8~rc1 pcmk_pacemakerd_api_daemon_state_enum2text@Base 2.0.5~rc2 pcmk_pacemakerd_api_daemon_state_text2enum@Base 2.0.5~rc2 pcmk_pacemakerd_api_ping@Base 2.0.5~rc2 pcmk_pacemakerd_api_shutdown@Base 2.1.1 + pcmk_parse_action@Base 2.1.8~rc1 + pcmk_parse_interval_spec@Base 2.1.8~rc1 + pcmk_parse_role@Base 2.1.8~rc1 pcmk_poll_ipc@Base 2.0.5~rc2 pcmk_prepend_nvpair@Base 2.0.1~rc5 pcmk_promotion_score_name@Base 2.1.1 @@ -523,14 +587,19 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# pcmk_rc_str@Base 2.0.4 pcmk_readable_score@Base 2.1.5 pcmk_register_ipc_callback@Base 2.0.5~rc2 + pcmk_resource_id@Base 2.1.8~rc1 + pcmk_resource_is_managed@Base 2.1.8~rc1 pcmk_result_get_strings@Base 2.1.5 + pcmk_role_text@Base 2.1.8~rc1 pcmk_scan_nvpair@Base 2.0.2 pcmk_schedulerd_api_graph@Base 2.1.4 + pcmk_set_scheduler_cib@Base 2.1.8~rc1 pcmk_sort_nvpairs@Base 2.0.1~rc5 pcmk_stonith_param@Base 2.1.1 pcmk_str_is_infinity@Base 2.0.4 pcmk_str_is_minus_infinity@Base 2.0.4 pcmk_strerror@Base 1.1.9 + pcmk_update_configured_schema@Base 2.1.8~rc1 pcmk_xe_is_probe@Base 2.1.4 pcmk_xe_mask_probe_failure@Base 2.1.4 pcmk_xml_attrs2nvpairs@Base 2.0.1~rc5 @@ -550,6 +619,8 @@ libcrmcommon.so.34 libcrmcommon34t64 #MINVER# update_xml_child@Base 1.1.9 validate_xml@Base 1.1.9 validate_xml_verbose@Base 1.1.9 + was_processing_error@Base 2.1.8~rc1 + was_processing_warning@Base 2.1.8~rc1 write_xml_fd@Base 1.1.9 write_xml_file@Base 1.1.9 xml2list@Base 1.1.9 diff --git a/debian/libpacemaker1t64.symbols b/debian/libpacemaker1t64.symbols index 8ebca42..7d3bd2b 100644 --- a/debian/libpacemaker1t64.symbols +++ b/debian/libpacemaker1t64.symbols @@ -23,11 +23,15 @@ libpacemaker.so.1 libpacemaker1t64 #MINVER# pcmk__fence_validate@Base 2.0.4 pcmk__free_graph@Base 2.1.2 pcmk__get_fencing_history@Base 2.1.4 + pcmk__get_ticket_state@Base 2.1.8~rc1 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_cluster_options@Base 2.1.8~rc1 + pcmk__list_fencing_params@Base 2.1.8~rc1 pcmk__list_nodes@Base 2.1.1 + pcmk__list_primitive_meta@Base 2.1.8~rc1 pcmk__list_providers@Base 2.1.7 pcmk__list_result_codes@Base 2.1.5 pcmk__list_standards@Base 2.1.7 @@ -38,10 +42,12 @@ libpacemaker.so.1 libpacemaker1t64 #MINVER# pcmk__output_cluster_status@Base 2.1.4 pcmk__output_simple_status@Base 2.1.4 pcmk__pacemakerd_status@Base 2.1.1 + pcmk__parse_cib@Base 2.1.8~rc1 pcmk__profile_dir@Base 2.1.2 pcmk__query_node_info@Base 2.1.6 pcmk__register_lib_messages@Base 2.1.1 pcmk__request_fencing@Base 2.1.4 + pcmk__resource_delete@Base 2.1.8~rc1 pcmk__resource_digests@Base 2.1.1 pcmk__rsc_can_migrate@Base 2.1.5 pcmk__schedule_actions@Base 2.0.2 @@ -51,22 +57,42 @@ libpacemaker.so.1 libpacemaker1t64 #MINVER# pcmk__simulate_node_config@Base 2.1.4 pcmk__simulate_transition@Base 2.1.4 pcmk__status@Base 2.1.4 + pcmk__ticket_constraints@Base 2.1.8~rc1 + pcmk__ticket_delete@Base 2.1.8~rc1 + pcmk__ticket_get_attr@Base 2.1.8~rc1 + pcmk__ticket_info@Base 2.1.8~rc1 + pcmk__ticket_remove_attr@Base 2.1.8~rc1 + pcmk__ticket_set_attr@Base 2.1.8~rc1 + pcmk__ticket_state@Base 2.1.8~rc1 pcmk__unpack_constraints@Base 2.1.2 pcmk__unpack_graph@Base 2.1.2 pcmk__update_graph@Base 2.1.2 + pcmk__verify@Base 2.1.8~rc1 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_cluster_options@Base 2.1.8~rc1 + pcmk_list_fencing_params@Base 2.1.8~rc1 pcmk_list_nodes@Base 2.1.1 + pcmk_list_primitive_meta@Base 2.1.8~rc1 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_delete@Base 2.1.8~rc1 pcmk_resource_digests@Base 2.1.1 pcmk_show_result_code@Base 2.1.5 pcmk_simulate@Base 2.1.2 pcmk_status@Base 2.1.4 + pcmk_ticket_constraints@Base 2.1.8~rc1 + pcmk_ticket_delete@Base 2.1.8~rc1 + pcmk_ticket_get_attr@Base 2.1.8~rc1 + pcmk_ticket_info@Base 2.1.8~rc1 + pcmk_ticket_remove_attr@Base 2.1.8~rc1 + pcmk_ticket_set_attr@Base 2.1.8~rc1 + pcmk_ticket_state@Base 2.1.8~rc1 + pcmk_verify@Base 2.1.8~rc1 diff --git a/debian/libpe-rules26t64.symbols b/debian/libpe-rules26t64.symbols index 1a98d29..5544bfb 100644 --- a/debian/libpe-rules26t64.symbols +++ b/debian/libpe-rules26t64.symbols @@ -1,15 +1,7 @@ libpe_rules.so.26 libpe-rules26t64 #MINVER# * Build-Depends-Package: pacemaker-dev - add_hash_param@Base 1.0.10 fail2text@Base 1.0.10 find_expression_type@Base 1.0.10 - pe__eval_attr_expr@Base 2.0.5~rc2 - pe__eval_date_expr@Base 2.0.5~rc2 - 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 pe_eval_rules@Base 2.0.5~rc2 @@ -17,8 +9,6 @@ libpe_rules.so.26 libpe-rules26t64 #MINVER# pe_evaluate_rules@Base 2.0.3 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_raw@Base 1.1.18~rc3 pe_pref@Base 1.0.10 pe_test_expression@Base 2.0.3 pe_test_expression_full@Base 1.1.17~rc1 @@ -36,6 +26,3 @@ libpe_rules.so.26 libpe-rules26t64 #MINVER# text2role@Base 1.0.10 text2task@Base 1.0.10 unpack_instance_attributes@Base 1.0.10 - verify_pe_options@Base 1.0.10 - was_processing_error@Base 1.0.10 - was_processing_warning@Base 1.0.10 diff --git a/debian/libpe-status28t64.symbols b/debian/libpe-status28t64.symbols index 4762469..aa75659 100644 --- a/debian/libpe-status28t64.symbols +++ b/debian/libpe-status28t64.symbols @@ -1,6 +1,5 @@ libpe_status.so.28 libpe-status28t64 #MINVER# * Build-Depends-Package: pacemaker-dev - add_hash_param@Base 1.1.14~rc4 add_tag_ref@Base 1.1.14~rc4 calculate_active_ops@Base 1.1.14~rc4 cleanup_calculations@Base 1.1.14~rc4 @@ -96,11 +95,6 @@ libpe_status.so.28 libpe-status28t64 #MINVER# pe__create_clone_notif_pseudo_ops@Base 2.1.6 pe__create_clone_notifications@Base 2.1.6 pe__create_promotable_pseudo_ops@Base 2.1.5 - pe__eval_attr_expr@Base 2.0.5~rc2 - pe__eval_date_expr@Base 2.0.5~rc2 - 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__failed_probe_for_rsc@Base 2.1.4 pe__filter_rsc_list@Base 2.0.5~rc2 pe__find_active_requires@Base 1.1.19 @@ -118,17 +112,12 @@ libpe_status.so.28 libpe-status28t64 #MINVER# pe__group_flag_is_set@Base 2.1.5 pe__group_is_filtered@Base 2.0.5~rc2 pe__group_xml@Base 2.0.3 - pe__is_bundle_node@Base 2.0.4 - pe__is_guest_node@Base 2.0.2 - pe__is_guest_or_remote_node@Base 2.0.2 pe__is_newer_op@Base 2.1.5 - pe__is_remote_node@Base 2.0.2 pe__is_universal_clone@Base 2.0.1~rc2 pe__last_group_member@Base 2.1.5 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 @@ -141,7 +130,6 @@ libpe_status.so.28 libpe-status28t64 #MINVER# pe__resource_description@Base 2.1.6 pe__resource_html@Base 2.0.3 pe__resource_is_disabled@Base 2.0.3 - pe__resource_is_remote_conn@Base 2.0.2 pe__resource_text@Base 2.0.3 pe__resource_xml@Base 2.0.3 pe__rsc_has_tag@Base 2.0.5~rc2 @@ -167,7 +155,6 @@ libpe_status.so.28 libpe-status28t64 #MINVER# pe_can_fence@Base 1.1.14~rc4 pe_create_node@Base 1.1.17~rc1 pe_create_remote_xml@Base 1.1.18~rc3 - pe_cron_range_satisfied@Base 2.0.2 pe_eval_expr@Base 2.0.5~rc2 pe_eval_nvpairs@Base 2.0.5~rc2 pe_eval_rules@Base 2.0.5~rc2 @@ -184,11 +171,8 @@ libpe_status.so.28 libpe-status28t64 #MINVER# pe_foreach_guest_node@Base 1.1.15~rc1 pe_free_action@Base 1.1.14~rc4 pe_free_working_set@Base 2.0.1~rc2 - pe_get_configured_timeout@Base 1.1.18~rc4 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_raw@Base 1.1.18~rc3 pe_pref@Base 1.1.14~rc4 pe_reset_working_set@Base 2.0.1~rc2 pe_rsc_params@Base 2.1.1 @@ -217,7 +201,4 @@ libpe_status.so.28 libpe-status28t64 #MINVER# trigger_unfencing@Base 1.1.14~rc4 uber_parent@Base 1.1.14~rc4 unpack_instance_attributes@Base 1.1.14~rc4 - verify_pe_options@Base 1.1.14~rc4 - was_processing_error@Base 1.1.14~rc4 - was_processing_warning@Base 1.1.14~rc4 xml_contains_remote_node@Base 1.1.14~rc4 diff --git a/debian/pacemaker-cli-utils.install b/debian/pacemaker-cli-utils.install index 5840dc8..e1a5306 100755..100644 --- a/debian/pacemaker-cli-utils.install +++ b/debian/pacemaker-cli-utils.install @@ -1,7 +1,5 @@ -#!/usr/bin/dh-exec - etc/default/crm_mon -${deb_systemdsystemunitdir}/crm_mon.service usr/share/doc/pacemaker-cli-utils/examples [linux-any] +${env:deb_systemdsystemunitdir}/crm_mon.service usr/share/doc/pacemaker-cli-utils/examples usr/sbin/attrd_updater usr/sbin/cibadmin usr/sbin/cibsecret diff --git a/debian/pacemaker-remote.install b/debian/pacemaker-remote.install index 1692e1b..92d6312 100755..100644 --- a/debian/pacemaker-remote.install +++ b/debian/pacemaker-remote.install @@ -1,7 +1,5 @@ -#!/usr/bin/dh-exec - daemons/execd/pacemaker_remote etc/init.d -${deb_systemdsystemunitdir}/pacemaker_remote.service [linux-any] +${env:deb_systemdsystemunitdir}/pacemaker_remote.service usr/sbin/pacemaker_remoted usr/sbin/pacemaker-remoted usr/share/man/man8/pacemaker-remoted.8 diff --git a/debian/pacemaker.install b/debian/pacemaker.install index 25fcc48..8e805fc 100755..100644 --- a/debian/pacemaker.install +++ b/debian/pacemaker.install @@ -1,7 +1,5 @@ -#!/usr/bin/dh-exec - etc/init.d/pacemaker -${deb_systemdsystemunitdir}/pacemaker.service [linux-any] +${env:deb_systemdsystemunitdir}/pacemaker.service usr/lib/pacemaker/cts-exec-helper usr/lib/pacemaker/cts-fence-helper usr/lib/pacemaker/pacemaker-attrd @@ -20,9 +18,10 @@ usr/sbin/pacemakerd usr/share/man/man7/ocf_pacemaker_controld.7 usr/share/man/man7/ocf_pacemaker_o2cb.7 usr/share/man/man7/ocf_pacemaker_remote.7 -usr/share/man/man7/pacemaker-schedulerd.7 +usr/share/man/man7/pacemaker-based.7 usr/share/man/man7/pacemaker-controld.7 usr/share/man/man7/pacemaker-fenced.7 +usr/share/man/man7/pacemaker-schedulerd.7 usr/share/man/man8/crm_node.8 usr/share/man/man8/fence_legacy.8 usr/share/man/man8/fence_watchdog.8 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 deleted file mode 100644 index afcad60..0000000 --- a/debian/patches/Always-format-time_t-values-as-long-long.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org> -Date: Fri, 22 Mar 2024 16:40:07 +0100 -Subject: Always format time_t values as long long -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Conventionally it's signed long under the GNU C library, which is 32 -bits on 32-bit architectures, but Glibc provides the __TIME_BITS==64 -option, which makes it signed long long instead (64 bits) and makes no -difference on 64-bit architectures [1]. This enables using the %llu -conversion specifier uniformly across all supported architectures. -This got exposed by Debian recently transitioning to 64-bit time_t [2]. - -[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign -[2] https://wiki.debian.org/ReleaseGoals/64bit-time - -Signed-off-by: Ferenc Wágner <wferi@debian.org> ---- - daemons/fenced/fenced_remote.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/daemons/fenced/fenced_remote.c b/daemons/fenced/fenced_remote.c -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) - } - if ((other->total_timeout > 0) - && (now > (other->total_timeout + other->created))) { -- crm_trace("%.8s not duplicate of %.8s: old (%ld vs. %ld + %d)", -- op->id, other->id, now, other->created, -+ crm_trace("%.8s not duplicate of %.8s: old (%lld vs. %lld + %d)", -+ op->id, other->id, (long long)now, (long long)other->created, - other->total_timeout); - continue; - } 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 076daac..1546187 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,7 +7,7 @@ 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 e48e19a..54e2896 100644 +index b95f47b..4c35f00 100644 --- a/doc/sphinx/Makefile.am +++ b/doc/sphinx/Makefile.am @@ -104,7 +104,7 @@ DEPS_Pacemaker_Remote = $(PNGS_Pacemaker_Remote) diff --git a/debian/patches/Fix-typos-resouce-resource.patch b/debian/patches/Fix-typos-resouce-resource.patch index 7f3ed87..9ec45e7 100644 --- a/debian/patches/Fix-typos-resouce-resource.patch +++ b/debian/patches/Fix-typos-resouce-resource.patch @@ -21,24 +21,24 @@ 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/lib/pacemaker/pcmk_sched_primitive.c b/lib/pacemaker/pcmk_sched_primitive.c -index 96acf1c..91adbff 100644 +index a113cca..9e4961a 100644 --- a/lib/pacemaker/pcmk_sched_primitive.c +++ b/lib/pacemaker/pcmk_sched_primitive.c -@@ -1326,7 +1326,7 @@ start_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) +@@ -1338,7 +1338,7 @@ start_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) * reasons later. */ - pe_rsc_trace(rsc, -- "Start of multiply active resouce %s " -+ "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, pcmk_action_pseudo); -@@ -1373,7 +1373,7 @@ promote_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) + pcmk__rsc_trace(rsc, +- "Start of multiply active resouce %s " ++ "Start of multiply active resource %s " + "on expected node %s will be a pseudo-action", + rsc->id, pcmk__node_name(node)); + pcmk__set_action_flags(start, pcmk_action_pseudo); +@@ -1385,7 +1385,7 @@ promote_resource(pcmk_resource_t *rsc, pcmk_node_t *node, bool optional) * other reasons later. */ - pe_rsc_trace(rsc, -- "Promotion of multiply active resouce %s " -+ "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, pcmk_action_pseudo); + pcmk__rsc_trace(rsc, +- "Promotion of multiply active resouce %s " ++ "Promotion of multiply active resource %s " + "on expected node %s will be a pseudo-action", + rsc->id, pcmk__node_name(node)); + pcmk__set_action_flags(promote, pcmk_action_pseudo); diff --git a/debian/patches/Remove-references-to-the-build-directory.patch b/debian/patches/Remove-references-to-the-build-directory.patch index 30c6321..7671783 100644 --- a/debian/patches/Remove-references-to-the-build-directory.patch +++ b/debian/patches/Remove-references-to-the-build-directory.patch @@ -7,8 +7,8 @@ directory can be solved by setting environment variables. --- agents/stonith/fence_legacy.in | 9 --------- mk/man.mk | 12 +++++++----- - python/pacemaker/buildoptions.py.in | 6 ------ - 3 files changed, 7 insertions(+), 20 deletions(-) + python/pacemaker/buildoptions.py.in | 8 -------- + 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/agents/stonith/fence_legacy.in b/agents/stonith/fence_legacy.in index c0eeca1..7583986 100755 @@ -65,19 +65,21 @@ index 51dd1e6..ccd8730 100644 $(abs_builddir)/$< --output $@ ; \ fi diff --git a/python/pacemaker/buildoptions.py.in b/python/pacemaker/buildoptions.py.in -index 17fe981..3bb85c1 100644 +index a97640c..d66a691 100644 --- a/python/pacemaker/buildoptions.py.in +++ b/python/pacemaker/buildoptions.py.in -@@ -13,12 +13,6 @@ class BuildOptions: +@@ -16,14 +16,6 @@ class BuildOptions: BASH_PATH = "@BASH_PATH@" - """ Path to the bash shell """ + """Path to the bash shell.""" - _BUILD_DIR = "@abs_top_builddir@" -- """ Top-level build directory -- NOTE: This is not especially useful on installed systems, but is useful for -- running various programs from a source checkout +- """ +- Top-level build directory. +- +- NOTE: This is not especially useful on installed systems, but is useful for +- running various programs from a source checkout - """ - CIB_DIR = "@CRM_CONFIG_DIR@" - """ Where CIB files are stored """ + """Where CIB files are stored.""" 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 f36112a..cbf1590 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 b594ac3..f0cba42 100644 +index c9a219d..f187f7d 100644 --- a/cts/cts-attrd.in +++ b/cts/cts-attrd.in @@ -17,16 +17,6 @@ import subprocess @@ -52,7 +52,7 @@ index be19d07..acd10af 100644 from pacemaker.exitstatus import ExitStatus from pacemaker._cts.errors import ExitCodeError, OutputFoundError, OutputNotFoundError diff --git a/cts/cts-fencing.in b/cts/cts-fencing.in -index c2ed29a..99a1286 100644 +index 6785144..29dbac5 100644 --- a/cts/cts-fencing.in +++ b/cts/cts-fencing.in @@ -11,15 +11,6 @@ import sys diff --git a/debian/patches/series b/debian/patches/series index fb12979..0ad30a0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ Fix-typos-resouce-resource.patch Remove-references-to-the-build-directory.patch cts-do-not-capture-the-build-directory.patch python-clean-up-the-__pycache__-directories.patch -Always-format-time_t-values-as-long-long.patch diff --git a/debian/rules b/debian/rules index 8151063..e46a733 100755 --- a/debian/rules +++ b/debian/rules @@ -29,8 +29,10 @@ override_dh_auto_configure: dh_auto_configure -- --disable-static \ BASH_PATH=/bin/bash \ PYTHON=/usr/bin/python3 \ + --enable-systemd \ --with-cibsecrets \ --with-configdir=/etc/default \ + --with-initdir=/etc/init.d \ --libexecdir=/usr/lib # because the daemon executables and Nagios plugins don't need multiarch paths diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 4811dc6..6b8bf92 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,5 +1,2 @@ # Some elements in these XML files have many attributes and no line breaks: pacemaker source: very-long-line-length-in-source-file * [cts/scheduler/exp/*] - -# We export this variable from debian/rules: -pacemaker source: dh-exec-subst-unknown-variable deb_systemdsystemunitdir * |