Pull main branch into 3.0 ahead of 3.0.1-rc1 release

Author: clumens

.clang-format

@@ -0,0 +1,184 @@
+# These options seem to change all the time.  I've removed things that are C++,
+# Objective-C, or JSON specific.  For reference:
+# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+
+---
+Language:        Cpp
+BasedOnStyle: GNU
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    false
+AlignConsecutiveBitFields:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    false
+AlignConsecutiveShortCaseStatements:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCaseColons: false
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments:
+  Kind:            Always
+  OverEmptyLines:  0
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: AllDefinitions
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros:
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
+BraceWrapping:
+   AfterCaseLabel:  false
+   AfterControlStatement: Never
+   AfterEnum:       false
+   AfterExternBlock: true
+   AfterFunction:   true
+   AfterStruct:     false
+   AfterUnion:      false
+   BeforeElse:      false
+   BeforeWhile:     false
+   IndentBraces:    false
+   SplitEmptyFunction: true
+   SplitEmptyRecord: true
+   SplitEmptyNamespace: true
+BreakAdjacentStringLiterals: false
+BreakAfterAttributes: Leave
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakStringLiterals: false
+ColumnLimit:     80
+CommentPragmas:  '^\\.+'
+ContinuationIndentWidth: 4
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:
+IfMacros:
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseBlocks: true
+IndentCaseLabels: true
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces:    true
+InsertNewlineAtEOF: false
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary:          0
+  BinaryMinDigits: 0
+  Decimal:         0
+  DecimalMinDigits: 0
+  Hex:             0
+  HexMinDigits:    0
+KeepEmptyLinesAtTheStartOfBlocks: true
+KeepEmptyLinesAtEOF: false
+LineEnding:      DeriveLF
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakScopeResolution: 500
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+PPIndentWidth:   -1
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
+ReflowComments:  true
+RemoveBracesLLVM: false
+RemoveParentheses: MultipleParentheses
+RemoveSemicolon: true
+SeparateDefinitionBlocks: Always
+SkipMacroDefinitionBody: false
+SortIncludes:    CaseSensitive
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeParens: Custom
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpacesBeforeTrailingComments: 1
+SpacesInContainerLiterals: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParens:  Custom
+SpacesInParensOptions:
+  InCStyleCasts:   false
+  InConditionalStatements: false
+  InEmptyParentheses: false
+  Other:           false
+SpacesInSquareBrackets: false
+Standard:        c++03
+StatementAttributeLikeMacros:
+StatementMacros:
+TabWidth:        4
+UseTab:          Never
+WhitespaceSensitiveMacros:
+...

.copr/Makefile

@@ -13,13 +13,11 @@
 # These should be provided by COPR, so these are just fallbacks
 MAKE	?= make
 outdir	?= .
-spec	?= ..
 
 LAST_RELEASE	=
 
 srpm:
-	dnf -y install git
-	cd "$(spec)"/rpm			\
+	cd rpm			\
 		&& echo "$$(git rev-list --count $$(git describe --tags --abbrev=0)..HEAD)"	\
 			> build.counter		\
 		&& $(MAKE) -f Makefile.am srpm	\

.gitignore

@@ -212,12 +212,10 @@ GTAGS
 TAGS
 /daemons/fenced/pacemaker-fenced.xml
 /daemons/schedulerd/pacemaker-schedulerd.xml
-/doc/.ABI-build
 /doc/HTML
-/doc/abi_dumps
+/doc/abi/
 /doc/abi-check
 /doc/api/
-/doc/compat_reports
 /doc/crm_fencing.html
 /doc/sphinx/*/_build
 /doc/sphinx/*/conf.py
@@ -307,9 +305,12 @@ pacemaker_*.info
 /doc/*/publican.cfg
 /doc/*/publish
 /doc/*/tmp/**
+/doc/.ABI-build
 /doc/Clusters_from_Scratch.txt
 /doc/Pacemaker_Explained.txt
+/doc/abi_dumps
 /doc/acls.html
+/doc/compat_reports
 /doc/publican-catalog*
 /doc/shared/en-US/*.xml
 /doc/shared/en-US/images/pcmk-*.png

ChangeLog.md

@@ -405,7 +405,7 @@
 * **libcrmservice:** drop header `services_compat.h`
 * **libcrmservice:** deprecate function `services_ocf_exitcode_str()`
 * **libcrmservice:** drop enums (including all their values) `nagios_exitcode`
-  and `op_status` 
+  and `op_status`
 * **libcrmservice:** drop defined constants `F_LRMD_ALERT`, `F_LRMD_ALERT_ID`,
   `F_LRMD_ALERT_PATH`, `F_LRMD_CALLBACK_TOKEN`, `F_LRMD_CALLDATA`,
   `F_LRMD_CALLID`, `F_LRMD_CALLOPTS`, `F_LRMD_CLASS`, `F_LRMD_CLIENTID`,

INSTALL.md

@@ -47,7 +47,6 @@ Also:
 | systemd support                                 |                | systemd-devel           | systemd-devel           | libsystemd-dev          |
 | systemd resource support                | 1.5.12 or later| dbus-devel              | dbus-devel              | libdbus-1-dev           |
 | Linux-HA style fencing agents                   |                | cluster-glue-libs-devel | libglue-devel           | cluster-glue-dev        |
-| documentation                                   |                | asciidoc or asciidoctor | asciidoc or asciidoctor | asciidoc or asciidoctor |
 | documentation                                   |                | help2man                | help2man                | help2man                |
 | documentation                                   |                | docbook-style-xsl       | docbook-xsl-stylesheets | docbook-xsl             |
 | documentation                                   |                | python3-sphinx          | python3-sphinx          | python3-sphinx          |

agents/ocf/remote.in

@@ -2,7 +2,7 @@
 #
 # ocf:pacemaker:remote OCF resource agent
 #
-# Copyright 2013-2023 the Pacemaker project contributors
+# Copyright 2013-2025 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
@@ -56,7 +56,7 @@ meta_data() {
   <actions>
     <action name="start"         timeout="60s" />
     <action name="stop"          timeout="60s" />
-    <action name="monitor"       timeout="30s" />
+    <action name="monitor"       timeout="30s" interval="30s" />
     <action name="migrate_to"    timeout="60s" />
     <action name="migrate_from"  timeout="60s" />
     <action name="reload"        timeout="60s" />

agents/stonith/fence_legacy.in

@@ -1,6 +1,6 @@
 #!@PYTHON@
 
-__copyright__ = "Copyright 2018-2023 the Pacemaker project contributors"
+__copyright__ = "Copyright 2018-2025 the Pacemaker project contributors"
 __license__ = "GNU General Public License version 2 or later (GPLv2+) WITHOUT ANY WARRANTY"
 
 import os
@@ -116,9 +116,7 @@ def parse_cli_options():
     parser.add_argument("-h", "--help", action="store_true",
                         help="show usage and exit")
 
-    # Don't use action="version", because that printed to stderr before
-    # Python 3.4, and help2man doesn't like that.
-    parser.add_argument("-V", "--version", action="store_true",
+    parser.add_argument("-V", "--version", action="version", version=VERSION,
                         help="show version and exit")
 
     return parser.parse_args()
@@ -209,10 +207,6 @@ def handle_local_options(options):
         print(USAGE)
         sys.exit(ExitStatus.OK)
 
-    if options.version:
-        print(VERSION)
-        sys.exit(ExitStatus.OK)
-
 
 def remap_action(options):
     """ Pre-process requested action """

configure.ac

@@ -229,16 +229,24 @@ AC_ARG_ENABLE([hardening],
 yes_no_try "$enable_hardening" "try"
 enable_hardening=$?
 
-dnl --enable-* options: features
+dnl --enable-* options: features within Pacemaker
 
+dnl @COMPAT This should be --with-systemd
 AC_ARG_ENABLE([systemd],
     [AS_HELP_STRING([--enable-systemd],
         [enable support for managing resources via systemd @<:@try@:>@])]
 )
 yes_no_try "$enable_systemd" "try"
 enable_systemd=$?
 
-dnl --enable-* options: features inherent to Pacemaker
+AC_ARG_ENABLE([deprecated-libs],
+    [AS_HELP_STRING([--enable-deprecated-libs],
+        [Build and install deprecated C libraries @<:@yes@:>@])]
+)
+yes_no_try "$enable_deprecated_libs" "yes"
+enable_deprecated_libs=$?
+AM_CONDITIONAL([BUILD_DEPRECATED_LIBS],
+               [test $enable_deprecated_libs -ne $DISABLED])
 
 # AM_GNU_GETTEXT calls AM_NLS which defines the nls option, but it defaults
 # to enabled. We override the definition of AM_NLS to flip the default and mark
@@ -255,7 +263,7 @@ AC_DEFUN([AM_NLS],
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.18])
 
-dnl --with-* options: external software support, and custom locations
+dnl --with-* options: external software support, and custom values
 
 dnl This argument is defined via an M4 macro so default can be a variable
 AC_DEFUN([VERSION_ARG],
@@ -295,8 +303,7 @@ AC_ARG_WITH([bug-url],
 AS_IF([test x"${BUG_URL}" = x""],
       [BUG_URL="https://bugs.clusterlabs.org/enter_bug.cgi?product=Pacemaker"])
 
-dnl --with-* options: features
-
+dnl @COMPAT This should be --enable-cibsecrets option
 AC_ARG_WITH([cibsecrets],
     [AS_HELP_STRING([--with-cibsecrets],
         [support separate file for CIB secrets @<:@no@:>@])]
@@ -971,7 +978,6 @@ dnl ==============================================
 dnl Documentation build dependencies and checks
 dnl ==============================================
 
-AC_PATH_PROGS([ASCIIDOC_CONV], [asciidoc asciidoctor])
 AC_PATH_PROG([HELP2MAN], [help2man])
 AC_PATH_PROG([SPHINX], [sphinx-build])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
@@ -1013,11 +1019,6 @@ AM_CONDITIONAL(BUILD_XML_HELP, test x"${MANPAGE_XSLT}" != x"")
 AS_IF([test x"${MANPAGE_XSLT}" != x""],
       [PCMK_FEATURES="$PCMK_FEATURES agent-manpages"])
 
-AM_CONDITIONAL([IS_ASCIIDOC], [echo "${ASCIIDOC_CONV}" | grep -Eq 'asciidoc$'])
-AM_CONDITIONAL([BUILD_ASCIIDOC], [test "x${ASCIIDOC_CONV}" != x])
-AS_IF([test x"${ASCIIDOC_CONV}" != x""],
-      [PCMK_FEATURES="$PCMK_FEATURES ascii-docs"])
-
 AM_CONDITIONAL([BUILD_SPHINX_DOCS], [test x"${SPHINX}" != x""])
 AM_COND_IF([BUILD_SPHINX_DOCS], [PCMK_FEATURES="$PCMK_FEATURES books"])
 
@@ -1111,7 +1112,6 @@ cc_temp_flags "$CFLAGS $WERROR"
 
 # Optional headers (inclusion of these should be conditional in C code)
 AC_CHECK_HEADERS([linux/swab.h])
-AC_CHECK_HEADERS([stddef.h])
 AC_CHECK_HEADERS([sys/signalfd.h])
 AC_CHECK_HEADERS([uuid/uuid.h])
 AC_CHECK_HEADERS([security/pam_appl.h pam/pam_appl.h])
@@ -1215,9 +1215,6 @@ dnl Structures
 dnl ========================================================================
 
 AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[[#include <time.h>]])
-AC_CHECK_MEMBER([struct dirent.d_type],
-    AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE,1,[Define this if struct dirent has d_type]),,
-    [#include <dirent.h>])
 
 dnl ========================================================================
 dnl Functions
@@ -2075,6 +2072,7 @@ AC_CONFIG_FILES(Makefile                                            \
                 lib/common/tests/xml/Makefile                       \
                 lib/common/tests/xml_comment/Makefile               \
                 lib/common/tests/xml_element/Makefile               \
+                lib/common/tests/xml_idref/Makefile                 \
                 lib/common/tests/xpath/Makefile                     \
                 lib/fencing/Makefile                                \
                 lib/libpacemaker.pc                                 \