diff -pruN 1.0.12-25/debian/changelog 1.0.12-25ubuntu1/debian/changelog --- 1.0.12-25/debian/changelog 2025-08-28 22:11:18.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/changelog 2025-11-17 04:15:31.000000000 +0000 @@ -1,3 +1,47 @@ +cluster-glue (1.0.12-25ubuntu1) resolute; urgency=medium + + * Merge with Debian unstable (LP: #2125989). Remaining changes: + - Ubuntu: post-release fixes (LP #1895355) + + agent fixes + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + + generic fixes + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + + getaddrinfo improvement/fixes + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + + documentation and related (fixes/adjustments) + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + + ec2 stonith agent support and fixes + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + - d/libplumb2.symbols: add missing symbol. + + -- Renan Rodrigo Mon, 17 Nov 2025 01:15:31 -0300 + cluster-glue (1.0.12-25) unstable; urgency=medium [ Bastian Germann ] @@ -13,12 +57,114 @@ cluster-glue (1.0.12-25) unstable; urgen -- Ferenc Wágner Fri, 29 Aug 2025 00:11:18 +0200 +cluster-glue (1.0.12-24ubuntu3) questing; urgency=medium + + * No-change rebuild for libxml2 soname change. + + -- Matthias Klose Wed, 21 May 2025 08:15:59 +0200 + +cluster-glue (1.0.12-24ubuntu2) plucky; urgency=medium + + * No-change rebuild with Python 3.13 only + + -- Graham Inggs Tue, 04 Mar 2025 17:03:29 +0000 + +cluster-glue (1.0.12-24ubuntu1) plucky; urgency=medium + + * Merge with Debian unstable (LP: #2085223). Remaining changes: + - Ubuntu: post-release fixes (LP #1895355) + + agent fixes + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + + generic fixes + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + + getaddrinfo improvement/fixes + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + + documentation and related (fixes/adjustments) + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + + ec2 stonith agent support and fixes + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + - d/libplumb2.symbols: add missing symbol. + + -- Athos Ribeiro Tue, 19 Nov 2024 16:29:06 -0300 + cluster-glue (1.0.12-24) unstable; urgency=medium * New patch: Use nfds_t in cl_poll() (Closes: #1077353) -- Ferenc Wágner Sat, 31 Aug 2024 15:48:18 +0200 +cluster-glue (1.0.12-23ubuntu1) oracular; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Ubuntu: post-release fixes + + agent fixes + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + + generic fixes + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + + getaddrinfo improvement/fixes + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + + documentation and related (fixes/adjustments) + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + + ec2 stonith agent support and fixes + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + - d/libplumb2.symbols: add missing symbol. + * Dropped changes, superseded in Debian: + - d/*.symbols: mark strl* symbols as optional. + + -- Steve Langasek Thu, 11 Jul 2024 14:37:06 -0700 + cluster-glue (1.0.12-23) unstable; urgency=medium * Switch Build-Depends to systemd-dev (Closes: #1060558) @@ -27,6 +173,64 @@ cluster-glue (1.0.12-23) unstable; urgen -- Valentin Vidic Sat, 04 May 2024 09:53:20 +0200 +cluster-glue (1.0.12-22.1ubuntu3) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 17:50:13 +0000 + +cluster-glue (1.0.12-22.1ubuntu2) noble; urgency=medium + + * No-change rebuild against libcurl4t64 + + -- Steve Langasek Sat, 16 Mar 2024 06:10:24 +0000 + +cluster-glue (1.0.12-22.1ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2056059). Remaining changes: + - Ubuntu: post-release fixes (LP #1895355) + + agent fixes + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + + generic fixes + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + + getaddrinfo improvement/fixes + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + + documentation and related (fixes/adjustments) + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + + ec2 stonith agent support and fixes + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + - d/libplumb2.symbols: add missing symbol. + - d/*.symbols: mark strl* symbols as optional. These were included in glibc + 2.38. (LP #2036250) + + -- Andreas Hasenack Mon, 04 Mar 2024 14:08:58 -0300 + cluster-glue (1.0.12-22.1) unstable; urgency=medium * Non-maintainer upload. @@ -34,6 +238,52 @@ cluster-glue (1.0.12-22.1) unstable; urg -- Steve Langasek Wed, 28 Feb 2024 16:16:41 +0000 +cluster-glue (1.0.12-22ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2040373). Remaining changes: + - Ubuntu: post-release fixes (LP #1895355) + + agent fixes + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + + generic fixes + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + + getaddrinfo improvement/fixes + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + + documentation and related (fixes/adjustments) + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + + ec2 stonith agent support and fixes + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + - d/libplumb2.symbols: add missing symbol. + - d/*.symbols: mark strl* symbols as optional. These were included in glibc + 2.38. (LP #2036250) + + -- Athos Ribeiro Tue, 02 Jan 2024 11:20:39 -0300 + cluster-glue (1.0.12-22) unstable; urgency=medium [ Valentin Vidic ] @@ -47,6 +297,70 @@ cluster-glue (1.0.12-22) unstable; urgen -- Valentin Vidic Tue, 24 Oct 2023 20:23:52 +0200 +cluster-glue (1.0.12-21ubuntu3) noble; urgency=medium + + * d/*.symbols: mark strl* symbols as optional. These were included in glibc + 2.38. (LP: #2036250) + + -- Athos Ribeiro Wed, 29 Nov 2023 11:09:28 -0300 + +cluster-glue (1.0.12-21ubuntu2) lunar; urgency=medium + + * Rebuild to drop Python 3.10 extension + + -- Jeremy Bicha Wed, 01 Mar 2023 12:32:59 -0500 + +cluster-glue (1.0.12-21ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable (LP: #1971268). Remaining changes: + - Ubuntu: post-release fixes (LP #1895355) + + agent fixes + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + + generic fixes + [eeacbaac] Low: ipc: fix poll function parameter type + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [bc7b874f] fix syslogmsgfmt logging inconsistency for stderr/stdout + [433c6fbd] Medium: clplumbing: don't abort on bad input + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + + getaddrinfo improvement/fixes + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + + documentation and related (fixes/adjustments) + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + + ec2 stonith agent support and fixes + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + - d/libplumb2.symbols: add missing symbol. + * Removed: + - d/t/logd: use journalctl to check logs instead of relying in a log file. + It fixes a test failure and the behavior of the test is the same. + [applied in version 1.0.12-21] + + -- Lucas Kanashiro Tue, 26 Jul 2022 12:08:53 -0300 + cluster-glue (1.0.12-21) unstable; urgency=medium [ Lucas Kanashiro ] @@ -61,6 +375,68 @@ cluster-glue (1.0.12-21) unstable; urgen -- Valentin Vidic Sun, 10 Apr 2022 16:17:14 +0200 +cluster-glue (1.0.12-20ubuntu3) jammy; urgency=medium + + * No-change rebuild with Python 3.10 only. + + -- Matthias Klose Thu, 17 Mar 2022 15:06:23 +0100 + +cluster-glue (1.0.12-20ubuntu2) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:10:09 +0200 + +cluster-glue (1.0.12-20ubuntu1) hirsute; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - Ubuntu: post-release fixes (LP #1895355) + + agent fixes + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + + generic fixes + [eeacbaac] Low: ipc: fix poll function parameter type + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [bc7b874f] fix syslogmsgfmt logging inconsistency for stderr/stdout + [433c6fbd] Medium: clplumbing: don't abort on bad input + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + + getaddrinfo improvement/fixes + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + + documentation and related (fixes/adjustments) + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + + ec2 stonith agent support and fixes + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + * Added: + - d/t/logd: use journalctl to check logs instead of relying in a log file. + It fixes a test failure and the behavior of the test is the same. + - d/libplumb2.symbols: add missing symbol. + + -- Lucas Kanashiro Wed, 20 Jan 2021 15:51:27 -0300 + cluster-glue (1.0.12-20) unstable; urgency=medium [ Helmut Grohne ] @@ -76,6 +452,69 @@ cluster-glue (1.0.12-20) unstable; urgen -- Ferenc Wágner Wed, 20 Jan 2021 12:45:21 +0100 +cluster-glue (1.0.12-19ubuntu4) hirsute; urgency=medium + + * No-change upload to build against net-snmp on armhf. + + -- Sergio Durigan Junior Thu, 07 Jan 2021 20:11:00 -0500 + +cluster-glue (1.0.12-19ubuntu3) hirsute; urgency=medium + + * No-change upload due to net-snmp transition. + + -- Sergio Durigan Junior Thu, 07 Jan 2021 15:18:30 -0500 + +cluster-glue (1.0.12-19ubuntu2) hirsute; urgency=medium + + * No-change rebuild to drop python3.8 extensions. + + -- Matthias Klose Mon, 07 Dec 2020 18:46:26 +0100 + +cluster-glue (1.0.12-19ubuntu1) groovy; urgency=medium + + * d/p/ubuntu/lp1895355-*: post-release fixes (LP: #1895355) + - agent fixes: + [26acc098] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't + [27e83692] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + [0fabedc2] Fix: stonith: external/vcenter: Reset returns success with + [a182a0dd] Medium: stonith: external/vcenter: replace experimental + - generic fixes: + [eeacbaac] Low: ipc: fix poll function parameter type + [71bf1503] Medium: ha_logd: prevent race caused by pid reuse + [bc7b874f] fix syslogmsgfmt logging inconsistency for stderr/stdout + [433c6fbd] Medium: clplumbing: don't abort on bad input + [b5be33ae] low: cl_plumbing: Fix incorrect negations + [9174550c] Medium: stonith: external/libvirt: fix handling of hosts + - getaddrinfo improvement/fixes: + [c63c2498] Low: wti_mpc: Convert gethostbyname() usage to + [04e56080] Low: ipmilan_command: Convert gethostbyname() to + [d46533b2] Low: apcmastersnmp: Convert gethostbyname() usage to + [a682f50b] Low: stonith: Convert gethostbyname() usage to + - documentation and related (fixes/adjustments): + [afaeeb2f] update AUTHORS (with names/addresses from source files) + [bc4aab44] Dev: Clean up AUTHORS + [73b68fb2] Dev: Update AUTHORS + [c9016806] Dev: Set foreign option to handle README.md + [788a1183] Dev: I always get this backwards + [e3970b0e] Dev: Update README and rename to README.md + [1f5a2ace] stonith: describe -E option + [7271abf9] fix ambiguous "GPL v 2.1" + [eec6232f] fix addresses of FSF, point to gnu.org/licenses instead + - ec2 stonith agent support and fixes: + [7c84a6ae] Fix EC2 stonith plugin + [76138dfb] Medium: external/ec2: Mitigate fence race (bsc#1088656) + [6734e0d0] High: external/ec2: Avoid unicode errors and improve + [ba5710b3] Dev: external/ec2: Clean up whitespace + [609cc386] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + [0f081f69] Medium: stonith: external/ec2: use target's uname as + [291a4378] Dev: stonith: external/ec2: protect unknown_are_stopped + [5cd5ffd2] Dev: stonith: external/ec2: add unknown_are_stopped to + [289e8fd3] Low: stonith: external/ec2: update name in the short + [b7bed186] Dev: update permissions for ec2 + [de5e068d] High: stonith: external/ec2: new agent for aws/ec2 + + -- Rafael David Tinoco Fri, 11 Sep 2020 22:10:59 +0000 + cluster-glue (1.0.12-19) unstable; urgency=medium * Fix failing logd autopkgtest diff -pruN 1.0.12-25/debian/control 1.0.12-25ubuntu1/debian/control --- 1.0.12-25/debian/control 2025-08-28 22:11:11.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/control 2025-11-17 04:15:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: cluster-glue Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Valentin Vidic , Ferenc Wágner , diff -pruN 1.0.12-25/debian/libplumb2t64.symbols 1.0.12-25ubuntu1/debian/libplumb2t64.symbols --- 1.0.12-25/debian/libplumb2t64.symbols 2024-08-31 12:12:03.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/libplumb2t64.symbols 2025-11-17 03:52:19.000000000 +0000 @@ -37,6 +37,7 @@ libplumb.so.2 libplumb2t64 #MINVER# Gmain_timeout_add_full@Base 0 Gmain_timeout_remove@Base 0 HMAC@Base 0 + IsRunning@Base 1.0.12 LogToDaemon@Base 0 MD5@Base 0 MD5Final@Base 0 diff -pruN 1.0.12-25/debian/patches/series 1.0.12-25ubuntu1/debian/patches/series --- 1.0.12-25/debian/patches/series 2025-08-28 22:11:11.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/series 2025-11-17 03:52:19.000000000 +0000 @@ -18,3 +18,49 @@ fix-configure-libxml2.patch 0019-Current-Pacemaker-does-not-use-ha_logd.patch 0020-Fix-typo-bounary-boundary.patch use-nfds_t-in-cl_poll.patch +# +# ubuntu: new aws ec2 stonith agent +# +ubuntu/lp1895355-de5e068d-High-stonith-external-ec2-new-agent-for-aws-ec2.patch +ubuntu/lp1895355-b7bed186-Dev-update-permissions-for-ec2.patch +ubuntu/lp1895355-289e8fd3-Low-stonith-external-ec2-update-name-in-the-short-de.patch +ubuntu/lp1895355-5cd5ffd2-Dev-stonith-external-ec2-add-unknown_are_stopped-to-.patch +ubuntu/lp1895355-291a4378-Dev-stonith-external-ec2-protect-unknown_are_stopped.patch +ubuntu/lp1895355-0f081f69-Medium-stonith-external-ec2-use-target-s-uname-as-de.patch +ubuntu/lp1895355-609cc386-Fix-stonith-external-ec2-Enforce-en_US.UTF-8-locale-.patch +ubuntu/lp1895355-ba5710b3-Dev-external-ec2-Clean-up-whitespace.patch +ubuntu/lp1895355-6734e0d0-High-external-ec2-Avoid-unicode-errors-and-improve-p.patch +ubuntu/lp1895355-76138dfb-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch +ubuntu/lp1895355-7c84a6ae-Fix-EC2-stonith-plugin.patch +# +# ubuntu: documentation fixes +# +ubuntu/lp1895355-eec6232f-fix-addresses-of-FSF-point-to-gnu.org-licenses-inste.patch +ubuntu/lp1895355-7271abf9-fix-ambiguous-GPL-v-2.1.patch +ubuntu/lp1895355-1f5a2ace-stonith-describe-E-option.patch +ubuntu/lp1895355-e3970b0e-Dev-Update-README-and-rename-to-README.md.patch +ubuntu/lp1895355-788a1183-Dev-I-always-get-this-backwards.patch +ubuntu/lp1895355-c9016806-Dev-Set-foreign-option-to-handle-README.md.patch +ubuntu/lp1895355-73b68fb2-Dev-Update-AUTHORS.patch +ubuntu/lp1895355-bc4aab44-Dev-Clean-up-AUTHORS.patch +ubuntu/lp1895355-afaeeb2f-update-AUTHORS-with-names-addresses-from-source-file.patch +# +# ubuntu: agent fixes +# +ubuntu/lp1895355-27e83692-Fix-stonith-ibmhmc-Add-managedsyspat-and-password-as.patch +ubuntu/lp1895355-26acc098-ibmhmc-Create-var-run-heartbeat-rsctmp-if-it-doesn-t.patch +ubuntu/lp1895355-a182a0dd-Medium-stonith-external-vcenter-replace-experimental.patch +ubuntu/lp1895355-0fabedc2-Fix-stonith-external-vcenter-Reset-returns-success-w.patch +# +# ubuntu: use getaddrinfo +# +ubuntu/lp1895355-c63c2498-Low-wti_mpc-Convert-gethostbyname-usage-to-getaddrin.patch +ubuntu/lp1895355-04e56080-Low-ipmilan_command-Convert-gethostbyname-to-getaddr.patch +ubuntu/lp1895355-d46533b2-Low-apcmastersnmp-Convert-gethostbyname-usage-to-get.patch +ubuntu/lp1895355-a682f50b-Low-stonith-Convert-gethostbyname-usage-to-getaddrin.patch +# +# ubuntu: generic fixes +# +ubuntu/lp1895355-9174550c-Medium-stonith-external-libvirt-fix-handling-of-host.patch +ubuntu/lp1895355-b5be33ae-low-cl_plumbing-Fix-incorrect-negations.patch +ubuntu/lp1895355-71bf1503-Medium-ha_logd-prevent-race-caused-by-pid-reuse-bsc-.patch diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-04e56080-Low-ipmilan_command-Convert-gethostbyname-to-getaddr.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-04e56080-Low-ipmilan_command-Convert-gethostbyname-to-getaddr.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-04e56080-Low-ipmilan_command-Convert-gethostbyname-to-getaddr.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-04e56080-Low-ipmilan_command-Convert-gethostbyname-to-getaddr.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,60 @@ +From 04e56080f68a012962f139ef0bff3c501d5da15c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 18 Oct 2016 12:38:04 +0200 +Subject: [PATCH] Low: ipmilan_command: Convert gethostbyname() to + getaddrinfo() + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/04e56080f68a012962f139ef0bff3c501d5da15c +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/ipmilan_command.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/plugins/stonith/ipmilan_command.c b/lib/plugins/stonith/ipmilan_command.c +index c763d217..e67bb277 100644 +--- a/lib/plugins/stonith/ipmilan_command.c ++++ b/lib/plugins/stonith/ipmilan_command.c +@@ -23,7 +23,7 @@ + #include /* malloc() */ + #include /* getopt() */ + #include /* strerror() */ +-#include /* gethostbyname() */ ++#include /* getaddrinfo() */ + #include + #include + +@@ -260,9 +260,9 @@ con_changed_handler(ipmi_con_t *ipmi, int err, unsigned int port_num, + static int + setup_ipmi_conn(struct ipmilanHostInfo * host, int *request) + { +- int rv; ++ int rv, rc; + +- struct hostent *ent; ++ struct addrinfo *res; + struct in_addr lan_addr[2]; + int lan_port[2]; + int num_addr = 1; +@@ -293,13 +293,13 @@ setup_ipmi_conn(struct ipmilanHostInfo * host, int *request) + return rv; + } + +- ent = gethostbyname(host->ipaddr); +- if (!ent) { +- PILCallLog(PluginImports->log,PIL_CRIT, "gethostbyname failed: %s\n", strerror(h_errno)); ++ rc = getaddrinfo(host->ipaddr, NULL, NULL, &res); ++ if (rc != 0) { ++ PILCallLog(PluginImports->log,PIL_CRIT, "getaddrinfo failed: %s\n", gai_strerror(rc)); + return 1; + } + +- memcpy(&lan_addr[0], ent->h_addr_list[0], ent->h_length); ++ memcpy(&lan_addr[0], res->ai_addr, res->ai_addrlen); + lan_port[0] = host->portnumber; + lan_port[1] = 0; + +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-0f081f69-Medium-stonith-external-ec2-use-target-s-uname-as-de.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-0f081f69-Medium-stonith-external-ec2-use-target-s-uname-as-de.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-0f081f69-Medium-stonith-external-ec2-use-target-s-uname-as-de.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-0f081f69-Medium-stonith-external-ec2-use-target-s-uname-as-de.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,138 @@ +From 0f081f69450de20d117d443b96e918e52cd7ec60 Mon Sep 17 00:00:00 2001 +From: Kazuhiko Higashi +Date: Mon, 28 Sep 2015 14:14:49 +0900 +Subject: [PATCH] Medium: stonith: external/ec2: use target's uname as default + for port + +If the "port" option is not set, use the 2nd argument (node to +fence) as the "port". + +- the "tag" and the "port" options are not required anymore + +- the "status" ("stat") action is the same as "monitor" + (because they don't peruse the "port" parameter in "stat" action.) + +If the Name tag is equal to uname, "tag" and "port" parameters +are not required. + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/0f081f69450de20d117d443b96e918e52cd7ec60 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 27 +++++++++++++++++---------- + 1 file changed, 17 insertions(+), 10 deletions(-) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index 69b94c75..f5de2818 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -47,7 +47,6 @@ If the tag containing the uname is not [Name], then it will need to be specified + ####################################################################### + + quiet=0 +-port_default="" + + instance_not_found=0 + unknown_are_stopped=0 +@@ -57,10 +56,9 @@ ec2_tag_default="Name" # EC2 Tag containing the instance's uname + + sleep_time="1" + +-ec2_tag=${tag} ++[ -n "$tag" ] && ec2_tag="$tag" + + : ${ec2_tag=${ec2_tag_default}} +-: ${port=${port_default}} + + function usage() + { +@@ -94,7 +92,7 @@ function getinfo_xml() + { + cat < +- ++ + + The name/id/tag of a instance to control/check + +@@ -102,7 +100,7 @@ function getinfo_xml() + + Use a specific profile from your credential file. + +- ++ + + Name of the tag containing the instances uname + +@@ -129,7 +127,7 @@ $description + + Fencing Action + +- ++ + + + The name/id/tag of a instance to control/check +@@ -139,7 +137,7 @@ $description + + Use a specific profile from your credential file. + +- ++ + + + Name of the tag containing the instances uname +@@ -219,6 +217,11 @@ function instance_status() + return $rc + } + ++function monitor() ++{ ++ # Is the device ok? ++ aws ec2 describe-instances $options | grep INSTANCES &> /dev/null ++} + + TEMP=`getopt -o qVho:e:p:n:t:U --long version,help,action:,port:,option:,profile:,tag:,quiet,unknown-are-stopped \ + -n 'fence_ec2' -- "$@"` +@@ -265,6 +268,7 @@ while true ; do + done + + [ -n "$1" ] && action=$1 ++[ -n "$2" ] && node_to_fence=$2 + + if [ -z "$ec2_profile"]; then + options="--output text --profile default" +@@ -324,6 +328,10 @@ if [ "$mystatus" != "running" ]; then #do not fence + exit 1 + fi + ++if [ -z "$port" ]; then ++ port="$node_to_fence" ++fi ++ + # get target's instance id + instance="" + if [ ! -z "$port" ]; then +@@ -376,8 +384,7 @@ case $action in + done + ;; + monitor) +- # Is the device ok? +- aws ec2 describe-instances $options | grep INSTANCES &> /dev/null ++ monitor + ;; + gethosts|hostlist|list) + # List of names we know about +@@ -388,7 +395,7 @@ case $action in + echo $a + ;; + stat|status) +- instance_status $instance > /dev/null ++ monitor + ;; + *) ha_log.sh err "Unknown action: $action"; exit 1;; + esac +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-0fabedc2-Fix-stonith-external-vcenter-Reset-returns-success-w.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-0fabedc2-Fix-stonith-external-vcenter-Reset-returns-success-w.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-0fabedc2-Fix-stonith-external-vcenter-Reset-returns-success-w.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-0fabedc2-Fix-stonith-external-vcenter-Reset-returns-success-w.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,30 @@ +From 0fabedc2249ff084e5c3af8775f980284e07cba2 Mon Sep 17 00:00:00 2001 +From: "Gao,Yan" +Date: Tue, 1 Aug 2017 18:22:43 +0200 +Subject: [PATCH] Fix: stonith: external/vcenter: Reset returns success with + RESETPOWERON=0 if vm is already off + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/0fabedc2249ff084e5c3af8775f980284e07cba2 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/vcenter | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/plugins/stonith/external/vcenter b/lib/plugins/stonith/external/vcenter +index c6b8091a..38ba36e3 100755 +--- a/lib/plugins/stonith/external/vcenter ++++ b/lib/plugins/stonith/external/vcenter +@@ -209,6 +209,8 @@ elsif (grep /^\Q$command\E$/, @netCommands) { + if ($powerState eq "poweredOff" && (! exists $ENV{'RESETPOWERON'} || $ENV{'RESETPOWERON'} ne 0)) { + $vm->PowerOnVM(); + system("ha_log.sh", "info", "Machine $esx:$vm->{'name'} has been powered on"); ++ } elsif ($powerState eq "poweredOff") { ++ system("ha_log.sh", "info", "Machine $esx:$vm->{'name'} won't be powered on with configured parameter RESETPOWERON=0"); + } else { + dielog("Could not complete $esx:$vm->{'name'} power cycle"); + } +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-1f5a2ace-stonith-describe-E-option.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-1f5a2ace-stonith-describe-E-option.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-1f5a2ace-stonith-describe-E-option.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-1f5a2ace-stonith-describe-E-option.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,52 @@ +From 1f5a2ace89d60e1ce93f337a874b5aa1cc7579c4 Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Mon, 4 Jul 2016 18:11:37 +0200 +Subject: [PATCH] stonith: describe -E option + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/1f5a2ace89d60e1ce93f337a874b5aa1cc7579c4 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + doc/stonith.xml.in | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/doc/stonith.xml.in b/doc/stonith.xml.in +index 575c3393..b975b90a 100644 +--- a/doc/stonith.xml.in ++++ b/doc/stonith.xml.in +@@ -64,6 +64,7 @@ + name=value + + stonith-device-parameters ++ + stonith-device-parameters-file + + count +@@ -80,6 +81,7 @@ + name=value + + stonith-device-parameters ++ + stonith-device-parameters-file + + count +@@ -132,6 +134,15 @@ + whitespace. + + ++ ++ ++ ++ ++ ++ Read the configuration from the environment. The environment variable ++ names are the same as the parameter names. ++ ++ + + + +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-26acc098-ibmhmc-Create-var-run-heartbeat-rsctmp-if-it-doesn-t.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-26acc098-ibmhmc-Create-var-run-heartbeat-rsctmp-if-it-doesn-t.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-26acc098-ibmhmc-Create-var-run-heartbeat-rsctmp-if-it-doesn-t.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-26acc098-ibmhmc-Create-var-run-heartbeat-rsctmp-if-it-doesn-t.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,39 @@ +From 26acc098f0fce9e109b91b4b0d307e83e8fa1dd1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Mon, 10 Jun 2019 12:04:49 +0200 +Subject: [PATCH] ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't exist + (bsc#1131545) + +Since /var/run is considered a volatile / runtime location, agents +shouldn't count on certain directories existing there. Besides, it +was unclear who was actually supposed to have created the +/var/run/heartbeat/rsctmp directory: Seems it used to be the +resource-agents package once, so even then it didn't make sense for +stonith agents to rely on it existing. + +ibmhmc seems to be the only case where this assumption was made. + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/26acc098f0fce9e109b91b4b0d307e83e8fa1dd1 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/ibmhmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/stonith/ibmhmc.c b/lib/plugins/stonith/ibmhmc.c +index 71ad9456..c1b6f66d 100644 +--- a/lib/plugins/stonith/ibmhmc.c ++++ b/lib/plugins/stonith/ibmhmc.c +@@ -1135,7 +1135,7 @@ do_shell_cmd(const char* cmd, int* status, const char* password) + snprintf(cmd_password, MAX_CMD_LEN + ,"umask 077;" + "if [ ! -d " HA_VARRUNDIR "/heartbeat/rsctmp/ibmhmc ];" +- "then mkdir " HA_VARRUNDIR "/heartbeat/rsctmp/ibmhmc 2>/dev/null;" ++ "then mkdir -p " HA_VARRUNDIR "/heartbeat/rsctmp/ibmhmc 2>/dev/null;" + "fi;" + "export ibmhmc_tmp=`mktemp -p " HA_VARRUNDIR "/heartbeat/rsctmp/ibmhmc/`;" + "echo \"echo '%s'\">$ibmhmc_tmp;" +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-27e83692-Fix-stonith-ibmhmc-Add-managedsyspat-and-password-as.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-27e83692-Fix-stonith-ibmhmc-Add-managedsyspat-and-password-as.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-27e83692-Fix-stonith-ibmhmc-Add-managedsyspat-and-password-as.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-27e83692-Fix-stonith-ibmhmc-Add-managedsyspat-and-password-as.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,33 @@ +From 27e836926abc647871e98e399f1db86e6d53546a Mon Sep 17 00:00:00 2001 +From: "Gao,Yan" +Date: Fri, 6 Jul 2018 14:57:57 +0200 +Subject: [PATCH] Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as + supported parameters + +So that the stonith agent correctly receives parameters from environment +variables. + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/27e836926abc647871e98e399f1db86e6d53546a +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/ibmhmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/stonith/ibmhmc.c b/lib/plugins/stonith/ibmhmc.c +index 5e185364..71ad9456 100644 +--- a/lib/plugins/stonith/ibmhmc.c ++++ b/lib/plugins/stonith/ibmhmc.c +@@ -320,7 +320,7 @@ ibmhmc_hostlist(StonithPlugin *s) + static const char * const * + ibmhmc_get_confignames(StonithPlugin* p) + { +- static const char * names[] = {ST_IPADDR, NULL}; ++ static const char * names[] = {ST_IPADDR, ST_MANSYSPAT, ST_PASSWD, NULL}; + if (Debug) { + LOG(PIL_DEBUG, "%s: called.", __FUNCTION__); + } +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-289e8fd3-Low-stonith-external-ec2-update-name-in-the-short-de.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-289e8fd3-Low-stonith-external-ec2-update-name-in-the-short-de.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-289e8fd3-Low-stonith-external-ec2-update-name-in-the-short-de.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-289e8fd3-Low-stonith-external-ec2-update-name-in-the-short-de.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,30 @@ +From 289e8fd36ec957da1d733d285f0e0fcf9cb2a443 Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Wed, 11 Mar 2015 13:08:35 +0100 +Subject: [PATCH] Low: stonith: external/ec2: update name in the short + description + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/289e8fd36ec957da1d733d285f0e0fcf9cb2a443 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index ea10f7db..310c18c2 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -297,7 +297,7 @@ case $action in + exit 0 + ;; + getinfo-devdescr) +- echo "fence_ec2 is an I/O Fencing agent which can be used with Amazon EC2 instances." ++ echo "ec2 is an I/O Fencing agent which can be used with Amazon EC2 instances." + exit 0 + ;; + getinfo-devurl) +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-291a4378-Dev-stonith-external-ec2-protect-unknown_are_stopped.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-291a4378-Dev-stonith-external-ec2-protect-unknown_are_stopped.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-291a4378-Dev-stonith-external-ec2-protect-unknown_are_stopped.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-291a4378-Dev-stonith-external-ec2-protect-unknown_are_stopped.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,39 @@ +From 291a437821d58798240750079ae8c3377bd95c2d Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Wed, 11 Mar 2015 13:24:25 +0100 +Subject: [PATCH] Dev: stonith: external/ec2: protect unknown_are_stopped + expansion + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/291a437821d58798240750079ae8c3377bd95c2d +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index e7ec07b7..69b94c75 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -191,7 +191,7 @@ function instance_on() + + function instance_off() + { +- if [ $unknown_are_stopped = 1 -a $instance_not_found ]; then ++ if [ "$unknown_are_stopped" = 1 -a $instance_not_found ]; then + : nothing to do + ha_log.sh info "Assuming unknown instance $instance is already off" + else +@@ -206,7 +206,7 @@ function instance_status() + local rc=1 + + # List of instances and their current status +- if [ $unknown_are_stopped = 1 -a $instance_not_found ]; then ++ if [ "$unknown_are_stopped" = 1 -a $instance_not_found ]; then + ha_log.sh info "$instance stopped (unknown)" + else + status=`aws ec2 describe-instances $options --instance-ids $instance | awk '{ +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-5cd5ffd2-Dev-stonith-external-ec2-add-unknown_are_stopped-to-.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-5cd5ffd2-Dev-stonith-external-ec2-add-unknown_are_stopped-to-.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-5cd5ffd2-Dev-stonith-external-ec2-add-unknown_are_stopped-to-.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-5cd5ffd2-Dev-stonith-external-ec2-add-unknown_are_stopped-to-.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,30 @@ +From 5cd5ffd2089b49a70d624fffcdb150fb9e9e7300 Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Wed, 11 Mar 2015 13:20:20 +0100 +Subject: [PATCH] Dev: stonith: external/ec2: add unknown_are_stopped to + getconfignames + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/5cd5ffd2089b49a70d624fffcdb150fb9e9e7300 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index 310c18c2..e7ec07b7 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -282,7 +282,7 @@ case $action in + getinfo_xml + ;; + getconfignames) +- for i in profile port tag ++ for i in profile port tag unknown_are_stopped + do + echo $i + done +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-609cc386-Fix-stonith-external-ec2-Enforce-en_US.UTF-8-locale-.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-609cc386-Fix-stonith-external-ec2-Enforce-en_US.UTF-8-locale-.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-609cc386-Fix-stonith-external-ec2-Enforce-en_US.UTF-8-locale-.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-609cc386-Fix-stonith-external-ec2-Enforce-en_US.UTF-8-locale-.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,34 @@ +From 609cc3866108464ee3f47ff4aeb47e01db31fee1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 19 Sep 2017 10:54:43 +0200 +Subject: [PATCH] Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when + invoking aws client (bsc#1059171) + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/609cc3866108464ee3f47ff4aeb47e01db31fee1 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index b3a15f98..4798b3e5 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -59,6 +59,12 @@ sleep_time="1" + + : ${ec2_tag=${ec2_tag_default}} + ++# Always invoke aws command with UTF-8 locale ++# to avoid issues when the tag contains non-ASCII ++# characters (bsc#1059171) ++LC_ALL=en_US.UTF-8 ++export LC_ALL ++ + function usage() + { + cat < +Date: Mon, 9 Apr 2018 14:47:49 +0200 +Subject: [PATCH] High: external/ec2: Avoid unicode errors and improve + performance (bsc#1088656) + +Originally by stsch@amazon.de: + +All AWS CLI describe commands have been changed to report the result directly. + +This has the following advantages: + +* No more unicode errors when other tags use UNICODE characters. +* No more interpreatation errors with aws and grep if the text format changes. +* Faster execution due to significantly reduced result sets. + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/6734e0d0f6c20e44f31ab3f6664569adb3109dfd +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 19 ++++++------------- + 1 file changed, 6 insertions(+), 13 deletions(-) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index 2fe59749..7ff4b512 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -22,6 +22,8 @@ If the tag containing the uname is not [Name], then it will need to be specified + + + # ++# Copyright (c) 2018 Stefan Schneider ++# Copyright (c) 2018 Kristoffer Gronlund + # Copyright (c) 2011-2013 Andrew Beekhof + # Copyright (c) 2014 NIPPON TELEGRAPH AND TELEPHONE CORPORATION + # All Rights Reserved. +@@ -174,11 +176,7 @@ function instance_for_port() + local instance="" + + # Look for port name -n in the INSTANCE data +- instance=`aws ec2 describe-instances $options | grep "^INSTANCES[[:space:]].*[[:space:]]$port[[:space:]]" | awk '{print $8}'` +- if [ -z $instance ]; then +- # Look for port name -n in the Name TAG +- instance=`aws ec2 describe-tags $options | grep "^TAGS[[:space:]]$ec2_tag[[:space:]].*[[:space:]]instance[[:space:]]$port$" | awk '{print $3}'` +- fi ++ instance=`aws ec2 describe-instances $options --filters "Name=tag-value,Values=${port}" "Name=tag-key,Values=${ec2_tag}" --query 'Reservations[*].Instances[*].InstanceId' ` + + if [ -z $instance ]; then + instance_not_found=1 +@@ -213,9 +211,7 @@ function instance_status() + if [ "$unknown_are_stopped" = 1 -a $instance_not_found ]; then + ha_log.sh info "$instance stopped (unknown)" + else +- status=`aws ec2 describe-instances $options --instance-ids $instance | awk '{ +- if (/^STATE\t/) { printf "%s", $3 } +- }'` ++ status=`aws ec2 describe-instances $options --instance-ids $instance --query 'Reservations[*].Instances[*].State.Name' ` + rc=$? + fi + ha_log.sh info "status check for $instance is $status" +@@ -226,7 +222,7 @@ function instance_status() + function monitor() + { + # Is the device ok? +- aws ec2 describe-instances $options | grep INSTANCES &> /dev/null ++ aws ec2 describe-instances $options --filters "Name=tag-key,Values=${ec2_tag}" | grep INSTANCES &> /dev/null + } + + TEMP=`getopt -o qVho:e:p:n:t:U --long version,help,action:,port:,option:,profile:,tag:,quiet,unknown-are-stopped \ +@@ -394,10 +390,7 @@ case $action in + ;; + gethosts|hostlist|list) + # List of names we know about +- a=`aws ec2 describe-instances $options | awk -v tag_pat="^TAGS\t$ec2_tag\t" -F '\t' '{ +- if (/^INSTANCES/) { printf "%s\n", $8 } +- else if ( $1"\t"$2"\t" ~ tag_pat ) { printf "%s\n", $3 } +- }' | sort -u` ++ a=`aws ec2 describe-instances $options --filters "Name=tag-key,Values=${ec2_tag}" --query 'Reservations[*].Instances[*].Tags[?Key==\`'${ec2_tag}'\`].Value' | sort -u` + echo $a + ;; + stat|status) +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-71bf1503-Medium-ha_logd-prevent-race-caused-by-pid-reuse-bsc-.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-71bf1503-Medium-ha_logd-prevent-race-caused-by-pid-reuse-bsc-.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-71bf1503-Medium-ha_logd-prevent-race-caused-by-pid-reuse-bsc-.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-71bf1503-Medium-ha_logd-prevent-race-caused-by-pid-reuse-bsc-.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,83 @@ +From 71bf150312da7ff6c0e7eca1ccea83e09dbba5a9 Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Fri, 31 Oct 2014 15:43:17 +0100 +Subject: [PATCH] Medium: ha_logd: prevent race caused by pid reuse + (bsc#894272) + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/71bf150312da7ff6c0e7eca1ccea83e09dbba5a9 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + include/clplumbing/cl_pidfile.h | 1 + + lib/clplumbing/cl_pidfile.c | 4 ++-- + logd/ha_logd.c | 15 ++++++--------- + 3 files changed, 9 insertions(+), 11 deletions(-) + +diff --git a/include/clplumbing/cl_pidfile.h b/include/clplumbing/cl_pidfile.h +index 3dba50fc..d04e5cf7 100644 +--- a/include/clplumbing/cl_pidfile.h ++++ b/include/clplumbing/cl_pidfile.h +@@ -21,5 +21,6 @@ int cl_read_pidfile(const char *filename); + int cl_read_pidfile_no_checking(const char *filename); + int cl_lock_pidfile(const char *filename); + int cl_unlock_pidfile(const char *filename); ++int IsRunning(long pid); + + #endif +diff --git a/lib/clplumbing/cl_pidfile.c b/lib/clplumbing/cl_pidfile.c +index b94573ba..ae2f503d 100644 +--- a/lib/clplumbing/cl_pidfile.c ++++ b/lib/clplumbing/cl_pidfile.c +@@ -74,7 +74,7 @@ + /* This is what the FHS standard specifies for the size of our lock file */ + #define LOCKSTRLEN 11 + #include +-static int IsRunning(long pid) ++int IsRunning(long pid) + { + int rc = 0; + long mypid; +@@ -224,7 +224,7 @@ cl_read_pidfile(const char*filename) + pid = cl_read_pidfile_no_checking(filename); + + if (pid < 0){ +- return - LSB_STATUS_STOPPED; ++ return -LSB_STATUS_STOPPED; + } + + if (IsRunning(pid)){ +diff --git a/logd/ha_logd.c b/logd/ha_logd.c +index c98b9d73..5f1f66e6 100644 +--- a/logd/ha_logd.c ++++ b/logd/ha_logd.c +@@ -590,20 +590,17 @@ logd_stop(void) + alarm(0); + do { + sleep(1); +- }while (kill((pid_t)running_logd_pid, 0) >= 0); +- } +- err = errno; +- +- if(errno == ESRCH) { +- cl_log(LOG_INFO, "Pid %ld exited", running_logd_pid); +- exit(LSB_EXIT_OK); +- } else { ++ }while (IsRunning(running_logd_pid)); ++ } else if (errno != ESRCH) { ++ err = errno; + cl_perror("Pid %ld not killed", running_logd_pid); + exit((err == EPERM || err == EACCES) + ? LSB_EXIT_EPERM + : LSB_EXIT_GENERIC); + } +- ++ ++ cl_log(LOG_INFO, "Pid %ld exited", running_logd_pid); ++ exit(LSB_EXIT_OK); + } + + +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-7271abf9-fix-ambiguous-GPL-v-2.1.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-7271abf9-fix-ambiguous-GPL-v-2.1.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-7271abf9-fix-ambiguous-GPL-v-2.1.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-7271abf9-fix-ambiguous-GPL-v-2.1.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,749 @@ +From 7271abf92f04db484d1eea48ab014cca7dfeac5a Mon Sep 17 00:00:00 2001 +From: Lars Ellenberg +Date: Mon, 21 Mar 2016 13:47:12 +0100 +Subject: [PATCH] fix ambiguous "GPL v 2.1" + +Apparently, back in 2000, at least heartbeat/api_test.c +was first part of a "batch tag" with the LGPLv2.1 stanza, +then was manually "re-tagged" as GPLv2 (because, well, +not a library, but a test program). + +But the version (2.1) was not corrected to 2 at the same time. +There is no GPL v 2.1, though. + +From there this "GPLv2.1" propagated to ipfail.c, +and later attrd.c, and other source code files. + +See also: + Date: Fri, 18 Mar 2016 16:16:01 +0100 + From: Lars Ellenberg + To: developers@clusterlabs.org + Subject: Re: [ClusterLabs Developers] [booth][sbd] GPLv2.1+ clarification request + Message-ID: <20160318151601.GE4437@soda.linbit> + http://clusterlabs.org/pipermail/developers/2016-March/000180.html + http://thread.gmane.org/gmane.comp.clustering.clusterlabs.devel/133/focus=141 + https://www.mail-archive.com/developers@clusterlabs.org/msg00137.html + + +Affected: + "GPLv2.1" -> LGPL v 2.1 + lib/clplumbing/ipctransient.h + lib/clplumbing/ipctransientclient.c + lib/clplumbing/ipctransientlib.c + lib/clplumbing/ipctransientserver.c + lib/plugins/lrm/raexechb.c + lib/plugins/lrm/raexeclsb.c + lib/plugins/lrm/raexecocf.c + lib/plugins/lrm/raexecupstart.c + lib/plugins/lrm/upstart-dbus.c + lib/plugins/lrm/upstart-dbus.h + + "GPLv2.1" -> GPL v2 + hb_report/ha_cf_support.sh + hb_report/hb_report.in + hb_report/openais_conf_support.sh + hb_report/utillib.sh + lib/clplumbing/base64_md5_test.c + lib/clplumbing/netstring_test.c + lrm/admin/cibsecret.in + lrm/admin/lrmadmin.c + lrm/test/LRMBasicSanityCheck.in + lrm/test/evaltest.sh + lrm/test/plugintest.c + lrm/test/regression.sh.in + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/7271abf92f04db484d1eea48ab014cca7dfeac5a +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + hb_report/ha_cf_support.sh | 22 +++++++++++----------- + hb_report/hb_report.in | 20 ++++++++++---------- + hb_report/openais_conf_support.sh | 20 ++++++++++---------- + hb_report/utillib.sh | 20 ++++++++++---------- + lib/clplumbing/base64_md5_test.c | 16 ++++++++-------- + lib/clplumbing/ipctransient.h | 14 +++++++------- + lib/clplumbing/ipctransientclient.c | 14 +++++++------- + lib/clplumbing/ipctransientlib.c | 14 +++++++------- + lib/clplumbing/ipctransientserver.c | 14 +++++++------- + lib/clplumbing/netstring_test.c | 22 +++++++++++----------- + lib/plugins/lrm/raexechb.c | 14 +++++++------- + lib/plugins/lrm/raexeclsb.c | 14 +++++++------- + lib/plugins/lrm/raexecocf.c | 14 +++++++------- + lib/plugins/lrm/raexecupstart.c | 14 +++++++------- + lib/plugins/lrm/upstart-dbus.c | 14 +++++++------- + lib/plugins/lrm/upstart-dbus.h | 14 +++++++------- + lrm/admin/cibsecret.in | 20 ++++++++++---------- + lrm/admin/lrmadmin.c | 20 ++++++++++---------- + lrm/test/LRMBasicSanityCheck.in | 20 ++++++++++---------- + lrm/test/evaltest.sh | 20 ++++++++++---------- + lrm/test/plugintest.c | 20 ++++++++++---------- + lrm/test/regression.sh.in | 20 ++++++++++---------- + 22 files changed, 190 insertions(+), 190 deletions(-) + +diff --git a/hb_report/ha_cf_support.sh b/hb_report/ha_cf_support.sh +index bb63811a..3329f23a 100644 +--- a/hb_report/ha_cf_support.sh ++++ b/hb_report/ha_cf_support.sh +@@ -1,17 +1,17 @@ + # Copyright (C) 2007 Dejan Muhamedagic +- # ++ # + # This program is free software; you can redistribute it and/or +- # modify it under the terms of the GNU General Public +- # License as published by the Free Software Foundation; either +- # version 2.1 of the License, or (at your option) any later version. +- # +- # This software is distributed in the hope that it will be useful, ++ # modify it under the terms of the GNU General Public License ++ # as published by the Free Software Foundation; either version 2 ++ # of the License, or (at your option) any later version. ++ # ++ # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- # General Public License for more details. +- # +- # You should have received a copy of the GNU General Public +- # License along with this library; if not, see ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ # ++ # You should have received a copy of the GNU General Public License ++ # along with this library; if not, see + # + + # +diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in +index cc67303e..b0a96184 100755 +--- a/hb_report/hb_report.in ++++ b/hb_report/hb_report.in +@@ -3,17 +3,17 @@ + # Copyright (C) 2007 Dejan Muhamedagic + # + # This program is free software; you can redistribute it and/or +- # modify it under the terms of the GNU General Public +- # License as published by the Free Software Foundation; either +- # version 2.1 of the License, or (at your option) any later version. +- # +- # This software is distributed in the hope that it will be useful, ++ # modify it under the terms of the GNU General Public License ++ # as published by the Free Software Foundation; either version 2 ++ # of the License, or (at your option) any later version. ++ # ++ # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- # General Public License for more details. +- # +- # You should have received a copy of the GNU General Public +- # License along with this library; if not, see ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ # ++ # You should have received a copy of the GNU General Public License ++ # along with this library; if not, see + # + + . @OCF_ROOT_DIR@/lib/heartbeat/ocf-shellfuncs +diff --git a/hb_report/openais_conf_support.sh b/hb_report/openais_conf_support.sh +index 0a28638e..f61c200c 100644 +--- a/hb_report/openais_conf_support.sh ++++ b/hb_report/openais_conf_support.sh +@@ -1,17 +1,17 @@ + # Copyright (C) 2007 Dejan Muhamedagic + # + # This program is free software; you can redistribute it and/or +- # modify it under the terms of the GNU General Public +- # License as published by the Free Software Foundation; either +- # version 2.1 of the License, or (at your option) any later version. +- # +- # This software is distributed in the hope that it will be useful, ++ # modify it under the terms of the GNU General Public License ++ # as published by the Free Software Foundation; either version 2 ++ # of the License, or (at your option) any later version. ++ # ++ # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- # General Public License for more details. +- # +- # You should have received a copy of the GNU General Public +- # License along with this library; if not, see ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ # ++ # You should have received a copy of the GNU General Public License ++ # along with this library; if not, see + # + + # +diff --git a/hb_report/utillib.sh b/hb_report/utillib.sh +index 5c854abe..59727888 100644 +--- a/hb_report/utillib.sh ++++ b/hb_report/utillib.sh +@@ -1,17 +1,17 @@ + # Copyright (C) 2007 Dejan Muhamedagic + # + # This program is free software; you can redistribute it and/or +- # modify it under the terms of the GNU General Public +- # License as published by the Free Software Foundation; either +- # version 2.1 of the License, or (at your option) any later version. +- # +- # This software is distributed in the hope that it will be useful, ++ # modify it under the terms of the GNU General Public License ++ # as published by the Free Software Foundation; either version 2 ++ # of the License, or (at your option) any later version. ++ # ++ # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- # General Public License for more details. +- # +- # You should have received a copy of the GNU General Public +- # License along with this library; if not, see ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ # ++ # You should have received a copy of the GNU General Public License ++ # along with this library; if not, see + # + + # +diff --git a/lib/clplumbing/base64_md5_test.c b/lib/clplumbing/base64_md5_test.c +index 969b7f39..67ede7cb 100644 +--- a/lib/clplumbing/base64_md5_test.c ++++ b/lib/clplumbing/base64_md5_test.c +@@ -5,17 +5,17 @@ + * Copyright (c) 2005 International Business Machines + * + * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2.1 of the License, or (at your option) any later version. ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. + * +- * This software is distributed in the hope that it will be useful, ++ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. + * +- * You should have received a copy of the GNU General Public +- * License along with this library; if not, see ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see + */ + + #include +diff --git a/lib/clplumbing/ipctransient.h b/lib/clplumbing/ipctransient.h +index 0c90fbbf..7844050e 100644 +--- a/lib/clplumbing/ipctransient.h ++++ b/lib/clplumbing/ipctransient.h +@@ -1,17 +1,17 @@ + /* + * Copyright (C) 2007 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + #undef _GNU_SOURCE /* in case it was defined on the command line */ +diff --git a/lib/clplumbing/ipctransientclient.c b/lib/clplumbing/ipctransientclient.c +index f169573b..72d19639 100644 +--- a/lib/clplumbing/ipctransientclient.c ++++ b/lib/clplumbing/ipctransientclient.c +@@ -1,17 +1,17 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +diff --git a/lib/clplumbing/ipctransientlib.c b/lib/clplumbing/ipctransientlib.c +index bdd5c28b..7bea6889 100644 +--- a/lib/clplumbing/ipctransientlib.c ++++ b/lib/clplumbing/ipctransientlib.c +@@ -1,17 +1,17 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +diff --git a/lib/clplumbing/ipctransientserver.c b/lib/clplumbing/ipctransientserver.c +index 58440b07..9920d9fd 100644 +--- a/lib/clplumbing/ipctransientserver.c ++++ b/lib/clplumbing/ipctransientserver.c +@@ -1,17 +1,17 @@ + /* + * Copyright (C) 2004 Andrew Beekhof + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +diff --git a/lib/clplumbing/netstring_test.c b/lib/clplumbing/netstring_test.c +index 63d46e4f..f92551d0 100644 +--- a/lib/clplumbing/netstring_test.c ++++ b/lib/clplumbing/netstring_test.c +@@ -3,18 +3,18 @@ + * + * Copyright (C) 2000 Guochun Shi + * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this library; if not, see ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see + */ + + #include +diff --git a/lib/plugins/lrm/raexechb.c b/lib/plugins/lrm/raexechb.c +index ac22c6c2..32c91ab2 100644 +--- a/lib/plugins/lrm/raexechb.c ++++ b/lib/plugins/lrm/raexechb.c +@@ -1,15 +1,15 @@ + /* +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + * File: raexechb.c +diff --git a/lib/plugins/lrm/raexeclsb.c b/lib/plugins/lrm/raexeclsb.c +index 370e5d30..db9f6e63 100644 +--- a/lib/plugins/lrm/raexeclsb.c ++++ b/lib/plugins/lrm/raexeclsb.c +@@ -1,15 +1,15 @@ + /* +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + * File: raexeclsb.c +diff --git a/lib/plugins/lrm/raexecocf.c b/lib/plugins/lrm/raexecocf.c +index 0e06d304..0e32c7fd 100644 +--- a/lib/plugins/lrm/raexecocf.c ++++ b/lib/plugins/lrm/raexecocf.c +@@ -1,15 +1,15 @@ + /* +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + * File: raexecocf.c +diff --git a/lib/plugins/lrm/raexecupstart.c b/lib/plugins/lrm/raexecupstart.c +index e38af205..05050520 100644 +--- a/lib/plugins/lrm/raexecupstart.c ++++ b/lib/plugins/lrm/raexecupstart.c +@@ -1,15 +1,15 @@ + /* +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + * File: raexecupstart.c +diff --git a/lib/plugins/lrm/upstart-dbus.c b/lib/plugins/lrm/upstart-dbus.c +index 8c79726c..45a2256f 100644 +--- a/lib/plugins/lrm/upstart-dbus.c ++++ b/lib/plugins/lrm/upstart-dbus.c +@@ -1,15 +1,15 @@ + /* +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + * File: upstart-dbus.c +diff --git a/lib/plugins/lrm/upstart-dbus.h b/lib/plugins/lrm/upstart-dbus.h +index 91d16729..bd981938 100644 +--- a/lib/plugins/lrm/upstart-dbus.h ++++ b/lib/plugins/lrm/upstart-dbus.h +@@ -1,15 +1,15 @@ + /* +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + * File: upstart-dbus.c +diff --git a/lrm/admin/cibsecret.in b/lrm/admin/cibsecret.in +index 166be087..5278a378 100755 +--- a/lrm/admin/cibsecret.in ++++ b/lrm/admin/cibsecret.in +@@ -3,17 +3,17 @@ + # Copyright (C) 2011 Dejan Muhamedagic + # + # This program is free software; you can redistribute it and/or +-# modify it under the terms of the GNU General Public +-# License as published by the Free Software Foundation; either +-# version 2.1 of the License, or (at your option) any later version. +-# +-# This software is distributed in the hope that it will be useful, ++# modify it under the terms of the GNU General Public License ++# as published by the Free Software Foundation; either version 2 ++# of the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-# General Public License for more details. +-# +-# You should have received a copy of the GNU General Public +-# License along with this library; if not, see ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this library; if not, see + # + + # WARNING: +diff --git a/lrm/admin/lrmadmin.c b/lrm/admin/lrmadmin.c +index b51f287c..0cf504f2 100644 +--- a/lrm/admin/lrmadmin.c ++++ b/lrm/admin/lrmadmin.c +@@ -7,17 +7,17 @@ + * Todo: security verification + * + * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this library; if not, see ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see + */ + #include + +diff --git a/lrm/test/LRMBasicSanityCheck.in b/lrm/test/LRMBasicSanityCheck.in +index 801b295d..5d80359b 100755 +--- a/lrm/test/LRMBasicSanityCheck.in ++++ b/lrm/test/LRMBasicSanityCheck.in +@@ -4,17 +4,17 @@ + # Author: Huang Zhen + # + # This program is free software; you can redistribute it and/or +- # modify it under the terms of the GNU General Public +- # License as published by the Free Software Foundation; either +- # version 2.1 of the License, or (at your option) any later version. +- # +- # This software is distributed in the hope that it will be useful, ++ # modify it under the terms of the GNU General Public License ++ # as published by the Free Software Foundation; either version 2 ++ # of the License, or (at your option) any later version. ++ # ++ # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- # General Public License for more details. +- # +- # You should have received a copy of the GNU General Public +- # License along with this library; if not, see ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ # ++ # You should have received a copy of the GNU General Public License ++ # along with this library; if not, see + # + HBLIB=@libdir@/heartbeat + LRMD=$HBLIB/lrmd +diff --git a/lrm/test/evaltest.sh b/lrm/test/evaltest.sh +index 93ae4835..4bbd52b0 100755 +--- a/lrm/test/evaltest.sh ++++ b/lrm/test/evaltest.sh +@@ -3,17 +3,17 @@ + # Copyright (C) 2007 Dejan Muhamedagic + # + # This program is free software; you can redistribute it and/or +- # modify it under the terms of the GNU General Public +- # License as published by the Free Software Foundation; either +- # version 2.1 of the License, or (at your option) any later version. +- # +- # This software is distributed in the hope that it will be useful, ++ # modify it under the terms of the GNU General Public License ++ # as published by the Free Software Foundation; either version 2 ++ # of the License, or (at your option) any later version. ++ # ++ # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- # General Public License for more details. +- # +- # You should have received a copy of the GNU General Public +- # License along with this library; if not, see ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ # ++ # You should have received a copy of the GNU General Public License ++ # along with this library; if not, see + # + + : ${TESTDIR:=testcases} +diff --git a/lrm/test/plugintest.c b/lrm/test/plugintest.c +index e9efa614..bc5e2bd5 100644 +--- a/lrm/test/plugintest.c ++++ b/lrm/test/plugintest.c +@@ -7,17 +7,17 @@ + * Todo: security verification + * + * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2.1 of the License, or (at your option) any later version. +- * +- * This software is distributed in the hope that it will be useful, ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this library; if not, see ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, see + */ + #include + #include +diff --git a/lrm/test/regression.sh.in b/lrm/test/regression.sh.in +index edab02e6..cec692d9 100755 +--- a/lrm/test/regression.sh.in ++++ b/lrm/test/regression.sh.in +@@ -3,17 +3,17 @@ + # Copyright (C) 2007 Dejan Muhamedagic + # + # This program is free software; you can redistribute it and/or +- # modify it under the terms of the GNU General Public +- # License as published by the Free Software Foundation; either +- # version 2.1 of the License, or (at your option) any later version. +- # +- # This software is distributed in the hope that it will be useful, ++ # modify it under the terms of the GNU General Public License ++ # as published by the Free Software Foundation; either version 2 ++ # of the License, or (at your option) any later version. ++ # ++ # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of +- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- # General Public License for more details. +- # +- # You should have received a copy of the GNU General Public +- # License along with this library; if not, see ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ # ++ # You should have received a copy of the GNU General Public License ++ # along with this library; if not, see + # + + OCF_ROOT=@OCF_ROOT_DIR@ +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-73b68fb2-Dev-Update-AUTHORS.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-73b68fb2-Dev-Update-AUTHORS.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-73b68fb2-Dev-Update-AUTHORS.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-73b68fb2-Dev-Update-AUTHORS.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,92 @@ +From 73b68fb293c4445c49e7f6d563f0f78e9a6935c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Sat, 15 Oct 2016 09:54:56 +0200 +Subject: [PATCH] Dev: Update AUTHORS + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/73b68fb293c4445c49e7f6d563f0f78e9a6935c9 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + AUTHORS | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 52 insertions(+), 2 deletions(-) + +diff --git a/AUTHORS b/AUTHORS +index ec67fd05..1344abd0 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -1,19 +1,69 @@ ++abrugger + Alan Robertson ++Alessandro Federico ++Alex Tsariounov + Andreas Mock + Andrew Beekhof ++Ante Karamatic ++Bernd Schubert ++Borislav Borisov ++Darren Mansell + Dave Blaschke + David Lee + Dejan Muhamedagic ++Denis Chapligin ++Florian Haas ++Frederik Schüler ++Gao,Yan ++Goldwyn Rodrigues ++gshi + Hannes Eder ++Helmut Weymann ++Hideo Yamauchi ++Holger Teutsch + Huang Zhen ++Jean Raby ++Jochen Roeder + Junko Ikeda +-Lars Marowsky-Bree ++Kacper Kowalik ++Kazuhiko Higashi ++Kazuhiko Higashi ++Kazunori INOUE ++Keisuke MORI ++kevin ++Kristoffer Grönlund ++Lars Ellenberg ++Lars Marowsky-Brée ++lclaudio + Martin Bene ++Martin Gerhard Loschwitz ++Michael Prokop ++msoffen ++Nhan Ngo Dinh ++panjiam ++Pádraig Brady + Phil Carns ++ram ++Raoul Bhatia ++RaSca ++Ruediger Oertel + Satomi Taniguchi + Sean Reifschneider + Sebastian Reitenbach ++Senko Rasic + Serge Dubrouski + Simon Horman ++sunjd ++Takatoshi MATSUO ++Tim Serong ++Vadym Chepkov ++William Seligman ++xiliu + Xinwei Hu +- ++yao zhao ++yixiong ++Yoshihiko SATO ++Yuichi SEINO ++Yusuke Iida ++zhaokai ++zhenh +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-76138dfb-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-76138dfb-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-76138dfb-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-76138dfb-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,91 @@ +From 76138dfb642cae548f2aa48c0a9caaa16509b319 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Wed, 11 Apr 2018 10:19:00 +0200 +Subject: [PATCH] Medium: external/ec2: Mitigate fence race (bsc#1088656) + +Minimize risk of fence race by performing instance status check +after instance_for_port lookup. + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/76138dfb642cae548f2aa48c0a9caaa16509b319 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 47 ++++++++++++++++++++------------ + 1 file changed, 29 insertions(+), 18 deletions(-) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index 7ff4b512..8e6798a1 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -170,6 +170,33 @@ EOF + exit 0; + } + ++function is_instance_running() ++{ ++ local myinstance ++ local mystatus ++ ++ # get my instance id ++ myinstance="$(curl http://169.254.169.254/latest/meta-data/instance-id)" ++ ++ # check my status. ++ # When the EC2 instance be stopped by the "aws ec2 stop-instances" , the stop processing of the OS is executed. ++ # While the OS stop processing, Pacemaker can execute the STONITH processing. ++ # So, If my status is not "running", it determined that I was already fenced. And to prevent fencing each other ++ # in split-brain, I don't fence other node. ++ if [ -z "$myinstance" ]; then ++ ha_log.sh err "Failed to get Instance ID. Unable to check instance status." ++ return 1 ++ fi ++ ++ mystatus="$(instance_status $myinstance)" ++ ++ if [ "$mystatus" != "running" ]; then #do not fence ++ ha_log.sh warn "Already fenced (Instance status = $mystatus). Aborting fence attempt." ++ return 1 ++ fi ++ return 0 ++} ++ + function instance_for_port() + { + local port=$1 +@@ -312,24 +339,6 @@ case $action in + ;; + esac + +-# get my instance id +-myinstance=`curl http://169.254.169.254/latest/meta-data/instance-id` +- +-# check my status. +-# When the EC2 instance be stopped by the "aws ec2 stop-instances" , the stop processing of the OS is executed. +-# While the OS stop processing, Pacemaker can execute the STONITH processing. +-# So, If my status is not "running", it determined that I was already fenced. And to prevent fencing each other +-# in split-brain, I don't fence other node. +-if [ -z "$myinstance" ]; then +- ha_log.sh err "Failed to get My Instance ID. so can not check my status." +- exit 1 +-fi +-mystatus=`instance_status $myinstance` +-if [ "$mystatus" != "running" ]; then #do not fence +- ha_log.sh warn "I was already fenced (My instance status=$mystatus). I don't fence other node." +- exit 1 +-fi +- + if [ -z "$port" ]; then + port="$node_to_fence" + fi +@@ -340,6 +349,8 @@ if [ ! -z "$port" ]; then + instance=`instance_for_port $port $options` + fi + ++is_instance_running || exit 1 ++ + case $action in + reboot|reset) + status=`instance_status $instance` +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-788a1183-Dev-I-always-get-this-backwards.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-788a1183-Dev-I-always-get-this-backwards.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-788a1183-Dev-I-always-get-this-backwards.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-788a1183-Dev-I-always-get-this-backwards.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,29 @@ +From 788a1183a80310e29415967b7d850f353ce940b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 11 Oct 2016 09:04:42 +0200 +Subject: [PATCH] Dev: I always get this backwards + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/788a1183a80310e29415967b7d850f353ce940b2 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index ce0bf458..04865079 100644 +--- a/README.md ++++ b/README.md +@@ -43,7 +43,7 @@ frequently requested by the developers to isolate and fix bugs, and + are commonly found as attachments to Bugzilla entries. + + NOTE: hb_report has been integrated into +-[https://crmsh.github.io](crmsh), and is now maintained as part of the ++[crmsh](https://github.com/ClusterLabs/crmsh.git), and is now maintained as part of the + `crmsh` project. + + ### Cluster Plumbing Library +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-7c84a6ae-Fix-EC2-stonith-plugin.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-7c84a6ae-Fix-EC2-stonith-plugin.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-7c84a6ae-Fix-EC2-stonith-plugin.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-7c84a6ae-Fix-EC2-stonith-plugin.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,32 @@ +From 7c84a6ae8cab29a8eb1270b8c1de0cb346210df2 Mon Sep 17 00:00:00 2001 +From: Loic Devulder +Date: Fri, 17 Apr 2020 17:02:39 +0200 +Subject: [PATCH] Fix EC2 stonith plugin + +The 'profile' parameter is not handled correctly in EC2 stonith plugin. +This commit fix it using the same way as the 'tag' variable. + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/7c84a6ae8cab29a8eb1270b8c1de0cb346210df2 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -294,12 +294,7 @@ + [ -n "$1" ] && action=$1 + [ -n "$2" ] && node_to_fence=$2 + +-if [ -z "$ec2_profile"]; then +- options="--output text --profile default" +-else +- options="--output text --profile $ec2_profile " +-fi +- ++options="--output text --profile $ec2_profile" + action=`echo $action | tr 'A-Z' 'a-z'` + + case $action in diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-9174550c-Medium-stonith-external-libvirt-fix-handling-of-host.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-9174550c-Medium-stonith-external-libvirt-fix-handling-of-host.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-9174550c-Medium-stonith-external-libvirt-fix-handling-of-host.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-9174550c-Medium-stonith-external-libvirt-fix-handling-of-host.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,39 @@ +From 9174550c482b18d00e41f1a699579cc5150e49c9 Mon Sep 17 00:00:00 2001 +From: Hideo Yamauchi +Date: Fri, 30 Oct 2015 13:00:56 +0100 +Subject: [PATCH] Medium: stonith: external/libvirt: fix handling of hosts with + uppercase letters in names + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/9174550c482b18d00e41f1a699579cc5150e49c9 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/libvirt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/plugins/stonith/external/libvirt b/lib/plugins/stonith/external/libvirt +index 494b048b..f0380a02 100644 +--- a/lib/plugins/stonith/external/libvirt ++++ b/lib/plugins/stonith/external/libvirt +@@ -136,14 +136,15 @@ libvirt_set_domain_id () + { + for h in $hostlist + do +- case $h in ++ h_comp=`echo $h | tr A-Z a-z` ++ case $h_comp in + $1:*) + domain_id=`expr $h : '.*:\(.*\)'` + return + ;; + + $1) +- domain_id=$1 ++ domain_id=$h + return + esac + done +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-a182a0dd-Medium-stonith-external-vcenter-replace-experimental.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-a182a0dd-Medium-stonith-external-vcenter-replace-experimental.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-a182a0dd-Medium-stonith-external-vcenter-replace-experimental.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-a182a0dd-Medium-stonith-external-vcenter-replace-experimental.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,48 @@ +From a182a0dd9fa41f0b1c0ceb50dc97a9b3e379564c Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Mon, 3 Nov 2014 16:33:57 +0100 +Subject: [PATCH] Medium: stonith: external/vcenter: replace experimental + smartmatch (bnc#900353) + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/a182a0dd9fa41f0b1c0ceb50dc97a9b3e379564c +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/vcenter | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/plugins/stonith/external/vcenter b/lib/plugins/stonith/external/vcenter +index 71a63020..c6b8091a 100755 +--- a/lib/plugins/stonith/external/vcenter ++++ b/lib/plugins/stonith/external/vcenter +@@ -31,7 +31,7 @@ my @netCommands = (@actionCommands, qw{status gethosts listvms}); + my $command = $ARGV[0] || dielog("No command specified\n"); + + # Command belongs to the group of commands that do not require any connection to VMware vCenter +-if ($command ~~ @configCommands) { ++if (grep /^\Q$command\E$/, @configCommands) { + if ($command eq "getconfignames") { + print "VI_SERVER\nVI_PORTNUMBER\nVI_PROTOCOL\nVI_SERVICEPATH\nVI_CREDSTORE\nHOSTLIST\nRESETPOWERON\n"; + } +@@ -122,7 +122,7 @@ See LWP(3pm) for more information. + } + + # Command belongs to the group of commands that require connecting to VMware vCenter +-elsif ($command ~~ @netCommands) { ++elsif (grep /^\Q$command\E$/, @netCommands) { + + eval { require VMware::VIRuntime; } + or dielog("Missing perl module VMware::VIRuntime. Download and install 'VMware Infrastructure (VI) Perl Toolkit', available at http://www.vmware.com/support/developer/viperltoolkit/ \n"); +@@ -159,7 +159,7 @@ elsif ($command ~~ @netCommands) { + } + + # Command belongs to the group of commands that performs actions on Virtual Machines +- if ($command ~~ @actionCommands) { ++ if (grep /^\Q$command\E$/, @actionCommands) { + + my $targetHost = $ARGV[1] || dielog("No target specified\n"); + +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-a682f50b-Low-stonith-Convert-gethostbyname-usage-to-getaddrin.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-a682f50b-Low-stonith-Convert-gethostbyname-usage-to-getaddrin.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-a682f50b-Low-stonith-Convert-gethostbyname-usage-to-getaddrin.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-a682f50b-Low-stonith-Convert-gethostbyname-usage-to-getaddrin.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,51 @@ +From a682f50b42d30604bfb618897d4f1cf3ce97438a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 18 Oct 2016 12:32:27 +0200 +Subject: [PATCH] Low: stonith: Convert gethostbyname() usage to getaddrinfo() + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/a682f50b42d30604bfb618897d4f1cf3ce97438a +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/stonith/expect.c | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +diff --git a/lib/stonith/expect.c b/lib/stonith/expect.c +index fe0d5170..008ffd92 100644 +--- a/lib/stonith/expect.c ++++ b/lib/stonith/expect.c +@@ -480,13 +480,26 @@ OpenStreamSocket(const char * host, int port, const char * service) + }else if (inet_pton(AF_INET6, host, (void*)&sockun.si6.sin6_addr)<0){ + sockun.si6.sin6_family = AF_INET6; + }else{ +- struct hostent* hostp = gethostbyname(host); +- if (hostp == NULL) { ++ struct addrinfo *res; ++ int rc; ++ rc = getaddrinfo(host, NULL, NULL, &res); ++ if (rc != 0) { ++ errno = EINVAL; ++ return -1; ++ } ++ if (res->ai_family == AF_INET6) { ++ sockun.si6.sin6_family = res->ai_family; ++ memcpy(&sockun.si6.sin6_addr, res->ai_addr, res->ai_addrlen); ++ freeaddrinfo(res); ++ } else if (res->ai_family == AF_INET) { ++ sockun.si4.sin_family = res->ai_family; ++ memcpy(&sockun.si4.sin_addr, res->ai_addr, res->ai_addrlen); ++ freeaddrinfo(res); ++ } else { ++ freeaddrinfo(res); + errno = EINVAL; + return -1; + } +- sockun.si4.sin_family = hostp->h_addrtype; +- memcpy(&sockun.si4.sin_addr, hostp->h_addr, hostp->h_length); + } + if ((sock = socket(sockun.si4.sin_family, SOCK_STREAM, 0)) < 0) { + return -1; +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-afaeeb2f-update-AUTHORS-with-names-addresses-from-source-file.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-afaeeb2f-update-AUTHORS-with-names-addresses-from-source-file.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-afaeeb2f-update-AUTHORS-with-names-addresses-from-source-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-afaeeb2f-update-AUTHORS-with-names-addresses-from-source-file.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,65 @@ +From afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76 Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Wed, 2 Nov 2016 13:12:59 +0100 +Subject: [PATCH] update AUTHORS (with names/addresses from source files) + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + AUTHORS | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/AUTHORS b/AUTHORS +index 545fbac3..6bd73165 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -16,10 +16,10 @@ Florian Haas + Frederik Schüler + Gao,Yan + Goldwyn Rodrigues +-gshi ++Guochun Shi + Hannes Eder + Helmut Weymann +-Hideo Yamauchi ++Hideo Yamauchi + Holger Teutsch + Huang Zhen + Jean Raby +@@ -38,7 +38,7 @@ lclaudio <> + Martin Bene + Martin Gerhard Loschwitz + Michael Prokop <> +-msoffen <> ++Matt Soffen + Nhan Ngo Dinh + panjiam <> + Pádraig Brady +@@ -53,17 +53,17 @@ Sebastian Reitenbach + Senko Rasic + Serge Dubrouski + Simon Horman +-sunjd <> ++Sun Jiang Dong + Takatoshi MATSUO + Tim Serong + Vadym Chepkov + William Seligman +-xiliu <> ++Xiaoxiang Liu + Xinwei Hu + yao zhao +-yixiong ++Yixiong Zou + Yoshihiko SATO + Yuichi SEINO + Yusuke Iida +-zhaokai <> +-zhenh <> ++Zhaokai ++Huang Zhen +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-b5be33ae-low-cl_plumbing-Fix-incorrect-negations.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-b5be33ae-low-cl_plumbing-Fix-incorrect-negations.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-b5be33ae-low-cl_plumbing-Fix-incorrect-negations.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-b5be33ae-low-cl_plumbing-Fix-incorrect-negations.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,38 @@ +From b5be33ae29ae18ec78575af207c6aeb949e3f73d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Sat, 15 Oct 2016 09:36:37 +0200 +Subject: [PATCH] low: cl_plumbing: Fix incorrect negations + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/b5be33ae29ae18ec78575af207c6aeb949e3f73d +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/clplumbing/cl_msg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/clplumbing/cl_msg.c b/lib/clplumbing/cl_msg.c +index c6705d3d..2ff4882c 100644 +--- a/lib/clplumbing/cl_msg.c ++++ b/lib/clplumbing/cl_msg.c +@@ -1343,7 +1343,7 @@ cl_msg_add_list_str(struct ha_msg* msg, const char* name, + if (n <= 0 || buf == NULL|| name ==NULL ||msg == NULL){ + cl_log(LOG_ERR, "%s:" + "invalid parameter(%s)", +- !n <= 0?"n is negative or zero": ++ n <= 0?"n is negative or zero": + !buf?"buf is NULL": + !name?"name is NULL": + "msg is NULL",__FUNCTION__); +@@ -1396,7 +1396,7 @@ cl_msg_add_list_int(struct ha_msg* msg, const char* name, + if (n <= 0 || buf == NULL|| name ==NULL ||msg == NULL){ + cl_log(LOG_ERR, "cl_msg_add_list_int:" + "invalid parameter(%s)", +- !n <= 0?"n is negative or zero": ++ n <= 0?"n is negative or zero": + !buf?"buf is NULL": + !name?"name is NULL": + "msg is NULL"); +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-b7bed186-Dev-update-permissions-for-ec2.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-b7bed186-Dev-update-permissions-for-ec2.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-b7bed186-Dev-update-permissions-for-ec2.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-b7bed186-Dev-update-permissions-for-ec2.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,20 @@ +From b7bed186e78059f0e0c4425438e60ad132beff8a Mon Sep 17 00:00:00 2001 +From: Dejan Muhamedagic +Date: Wed, 11 Mar 2015 13:05:33 +0100 +Subject: [PATCH] Dev: update permissions for ec2 + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/b7bed186e78059f0e0c4425438e60ad132beff8a +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + mode change 100644 => 100755 lib/plugins/stonith/external/ec2 + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +old mode 100644 +new mode 100755 +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-ba5710b3-Dev-external-ec2-Clean-up-whitespace.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-ba5710b3-Dev-external-ec2-Clean-up-whitespace.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-ba5710b3-Dev-external-ec2-Clean-up-whitespace.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-ba5710b3-Dev-external-ec2-Clean-up-whitespace.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,108 @@ +From ba5710b368a233038162f87503aa0073485e8cb4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Mon, 9 Apr 2018 14:47:45 +0200 +Subject: [PATCH] Dev: external/ec2: Clean up whitespace + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/ba5710b368a233038162f87503aa0073485e8cb4 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/ec2 | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index 4798b3e5..2fe59749 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -20,6 +20,7 @@ then the agent should be able to automatically discover the instances it can con + If the tag containing the uname is not [Name], then it will need to be specified using the [tag] option. + " + ++ + # + # Copyright (c) 2011-2013 Andrew Beekhof + # Copyright (c) 2014 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +@@ -69,15 +70,15 @@ function usage() + { + cat < +Date: Wed, 19 Oct 2016 12:12:53 +0200 +Subject: [PATCH] Dev: Clean up AUTHORS + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/bc4aab4482a771ebcd4b16cbb5f169f431173c96 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + AUTHORS | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/AUTHORS b/AUTHORS +index 1344abd0..545fbac3 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -1,6 +1,6 @@ +-abrugger ++abrugger <> + Alan Robertson +-Alessandro Federico ++Alessandro Federico + Alex Tsariounov + Andreas Mock + Andrew Beekhof +@@ -12,14 +12,14 @@ Dave Blaschke + David Lee + Dejan Muhamedagic + Denis Chapligin +-Florian Haas ++Florian Haas + Frederik Schüler + Gao,Yan +-Goldwyn Rodrigues ++Goldwyn Rodrigues + gshi + Hannes Eder + Helmut Weymann +-Hideo Yamauchi ++Hideo Yamauchi + Holger Teutsch + Huang Zhen + Jean Raby +@@ -29,21 +29,21 @@ Kacper Kowalik + Kazuhiko Higashi + Kazuhiko Higashi + Kazunori INOUE +-Keisuke MORI +-kevin +-Kristoffer Grönlund +-Lars Ellenberg ++Keisuke MORI ++kevin <> ++Kristoffer Grönlund ++Lars Ellenberg + Lars Marowsky-Brée +-lclaudio ++lclaudio <> + Martin Bene + Martin Gerhard Loschwitz +-Michael Prokop +-msoffen ++Michael Prokop <> ++msoffen <> + Nhan Ngo Dinh +-panjiam ++panjiam <> + Pádraig Brady + Phil Carns +-ram ++ram <> + Raoul Bhatia + RaSca + Ruediger Oertel +@@ -53,17 +53,17 @@ Sebastian Reitenbach + Senko Rasic + Serge Dubrouski + Simon Horman +-sunjd ++sunjd <> + Takatoshi MATSUO +-Tim Serong ++Tim Serong + Vadym Chepkov + William Seligman +-xiliu ++xiliu <> + Xinwei Hu + yao zhao + yixiong + Yoshihiko SATO + Yuichi SEINO + Yusuke Iida +-zhaokai +-zhenh ++zhaokai <> ++zhenh <> +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-c63c2498-Low-wti_mpc-Convert-gethostbyname-usage-to-getaddrin.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-c63c2498-Low-wti_mpc-Convert-gethostbyname-usage-to-getaddrin.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-c63c2498-Low-wti_mpc-Convert-gethostbyname-usage-to-getaddrin.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-c63c2498-Low-wti_mpc-Convert-gethostbyname-usage-to-getaddrin.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,49 @@ +From c63c24982757cf0bfc8713e4e1c43169b30c2059 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 18 Oct 2016 12:41:49 +0200 +Subject: [PATCH] Low: wti_mpc: Convert gethostbyname() usage to getaddrinfo() + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/c63c24982757cf0bfc8713e4e1c43169b30c2059 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/wti_mpc.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/lib/plugins/stonith/wti_mpc.c b/lib/plugins/stonith/wti_mpc.c +index 6f49568c..3546f129 100644 +--- a/lib/plugins/stonith/wti_mpc.c ++++ b/lib/plugins/stonith/wti_mpc.c +@@ -650,6 +650,7 @@ static int + wti_mpc_set_config(StonithPlugin * s, StonithNVpair * list) + { + struct pluginDevice* sd = (struct pluginDevice *)s; ++ struct addrinfo *res; + int rc; + char * i; + int mo; +@@ -679,7 +680,8 @@ wti_mpc_set_config(StonithPlugin * s, StonithNVpair * list) + PluginImports->mfree(namestocopy[3].s_value); + + /* try to resolve the hostname/ip-address */ +- if (gethostbyname(sd->hostname) != NULL) { ++ if ((rc = getaddrinfo(sd->hostname, NULL, NULL, &res)) == 0) { ++ freeaddrinfo(res); + /* init snmp library */ + init_snmp("wti_mpc"); + +@@ -732,8 +734,8 @@ wti_mpc_set_config(StonithPlugin * s, StonithNVpair * list) + , __FUNCTION__); + } + }else{ +- LOG(PIL_CRIT, "%s: cannot resolve hostname '%s', h_errno %d." +- , __FUNCTION__, sd->hostname, h_errno); ++ LOG(PIL_CRIT, "%s: cannot resolve hostname '%s', %s." ++ , __FUNCTION__, sd->hostname, gai_strerror(rc)); + } + + /* not a valid config */ +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-c9016806-Dev-Set-foreign-option-to-handle-README.md.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-c9016806-Dev-Set-foreign-option-to-handle-README.md.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-c9016806-Dev-Set-foreign-option-to-handle-README.md.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-c9016806-Dev-Set-foreign-option-to-handle-README.md.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,29 @@ +From c90168062bc3e174c3dd0f382b1e9f633acf4e0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 11 Oct 2016 09:53:39 +0200 +Subject: [PATCH] Dev: Set foreign option to handle README.md + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/c90168062bc3e174c3dd0f382b1e9f633acf4e0b +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 3f1146c2..0d799b78 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -15,6 +15,8 @@ + # along with this program; if not, see . + # + ++AUTOMAKE_OPTIONS = foreign ++ + DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-d46533b2-Low-apcmastersnmp-Convert-gethostbyname-usage-to-get.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-d46533b2-Low-apcmastersnmp-Convert-gethostbyname-usage-to-get.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-d46533b2-Low-apcmastersnmp-Convert-gethostbyname-usage-to-get.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-d46533b2-Low-apcmastersnmp-Convert-gethostbyname-usage-to-get.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,65 @@ +From d46533b207c0869317d7672b1eaf035476b0bbf7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 18 Oct 2016 12:34:37 +0200 +Subject: [PATCH] Low: apcmastersnmp: Convert gethostbyname() usage to + getaddrinfo() + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/d46533b207c0869317d7672b1eaf035476b0bbf7 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/apcmastersnmp.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/lib/plugins/stonith/apcmastersnmp.c b/lib/plugins/stonith/apcmastersnmp.c +index 4411e1c5..fa87bba4 100644 +--- a/lib/plugins/stonith/apcmastersnmp.c ++++ b/lib/plugins/stonith/apcmastersnmp.c +@@ -716,6 +716,7 @@ apcmastersnmp_set_config(StonithPlugin * s, StonithNVpair * list) + struct pluginDevice* sd = (struct pluginDevice *)s; + int rc; + int * i; ++ struct addrinfo *res; + StonithNamesToGet namestocopy [] = + { {ST_IPADDR, NULL} + , {ST_PORT, NULL} +@@ -737,9 +738,12 @@ apcmastersnmp_set_config(StonithPlugin * s, StonithNVpair * list) + PluginImports->mfree(namestocopy[1].s_value); + sd->community = namestocopy[2].s_value; + +- /* try to resolve the hostname/ip-address */ +- if (gethostbyname(sd->hostname) != NULL) { +- /* init snmp library */ ++ /* try to resolve the hostname/ip-address */ ++ ++ rc = getaddrinfo(sd->hostname, NULL, NULL, &res); ++ if (rc == 0) { ++ freeaddrinfo(res); ++ /* init snmp library */ + init_snmp("apcmastersnmp"); + + /* now try to get a snmp session */ +@@ -747,7 +751,7 @@ apcmastersnmp_set_config(StonithPlugin * s, StonithNVpair * list) + + /* ok, get the number of outlets from the masterswitch */ + if ((i = APC_read(sd->sptr, OID_NUM_OUTLETS, ASN_INTEGER)) +- == NULL) { ++ == NULL) { + LOG(PIL_CRIT + , "%s: cannot read number of outlets." + , __FUNCTION__); +@@ -767,8 +771,8 @@ apcmastersnmp_set_config(StonithPlugin * s, StonithNVpair * list) + , __FUNCTION__); + } + }else{ +- LOG(PIL_CRIT, "%s: cannot resolve hostname '%s', h_errno %d." +- , __FUNCTION__, sd->hostname, h_errno); ++ LOG(PIL_CRIT, "%s: cannot resolve hostname '%s', %s." ++ , __FUNCTION__, sd->hostname, gai_strerror(rc)); + } + + /* not a valid config */ +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-de5e068d-High-stonith-external-ec2-new-agent-for-aws-ec2.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-de5e068d-High-stonith-external-ec2-new-agent-for-aws-ec2.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-de5e068d-High-stonith-external-ec2-new-agent-for-aws-ec2.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-de5e068d-High-stonith-external-ec2-new-agent-for-aws-ec2.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,441 @@ +From de5e068d12ec0b873c91a5f7004058a9bf82ee1e Mon Sep 17 00:00:00 2001 +From: Kazuhiko Higashi +Date: Wed, 11 Mar 2015 11:51:59 +0100 +Subject: [PATCH] High: stonith: external/ec2: new agent for aws/ec2 + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/de5e068d12ec0b873c91a5f7004058a9bf82ee1e +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + lib/plugins/stonith/external/Makefile.am | 2 +- + lib/plugins/stonith/external/ec2 | 405 +++++++++++++++++++++++ + 2 files changed, 406 insertions(+), 1 deletion(-) + create mode 100644 lib/plugins/stonith/external/ec2 + +diff --git a/lib/plugins/stonith/external/Makefile.am b/lib/plugins/stonith/external/Makefile.am +index 42e00463..d1411c48 100644 +--- a/lib/plugins/stonith/external/Makefile.am ++++ b/lib/plugins/stonith/external/Makefile.am +@@ -28,6 +28,6 @@ helperdir = $(stonith_plugindir) + + ext_SCRIPTS = drac5 dracmc-telnet ibmrsa ibmrsa-telnet ipmi riloe ssh vmware vcenter rackpdu xen0 hmchttp \ + xen0-ha kdumpcheck ippower9258 nut libvirt \ +- hetzner ++ hetzner ec2 + + helper_SCRIPTS = xen0-ha-dom0-stonith-helper +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +new file mode 100644 +index 00000000..ea10f7db +--- /dev/null ++++ b/lib/plugins/stonith/external/ec2 +@@ -0,0 +1,405 @@ ++#!/bin/bash ++ ++description=" ++fence_ec2 is an I/O Fencing agent which can be used with Amazon EC2 instances. ++ ++API functions used by this agent: ++- aws ec2 describe-tags ++- aws ec2 describe-instances ++- aws ec2 stop-instances ++- aws ec2 start-instances ++- aws ec2 reboot-instances ++ ++If the uname used by the cluster node is any of: ++ - Public DNS name (or part there of), ++ - Private DNS name (or part there of), ++ - Instance ID (eg. i-4f15a839) ++ - Contents of tag associated with the instance ++then the agent should be able to automatically discover the instances it can control. ++ ++If the tag containing the uname is not [Name], then it will need to be specified using the [tag] option. ++" ++ ++# ++# Copyright (c) 2011-2013 Andrew Beekhof ++# Copyright (c) 2014 NIPPON TELEGRAPH AND TELEPHONE CORPORATION ++# All Rights Reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of version 2 of the GNU General Public License as ++# published by the Free Software Foundation. ++# ++# This program is distributed in the hope that it would be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++# ++# Further, this software is distributed without any warranty that it is ++# free of the rightful claim of any third person regarding infringement ++# or the like. Any license provided herein, whether implied or ++# otherwise, applies only to this software file. Patent licenses, if ++# any, provided herein do not apply to combinations of this program with ++# other software, or any other product whatsoever. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write the Free Software Foundation, ++# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# ++####################################################################### ++ ++quiet=0 ++port_default="" ++ ++instance_not_found=0 ++unknown_are_stopped=0 ++ ++action_default="reset" # Default fence action ++ec2_tag_default="Name" # EC2 Tag containing the instance's uname ++ ++sleep_time="1" ++ ++ec2_tag=${tag} ++ ++: ${ec2_tag=${ec2_tag_default}} ++: ${port=${port_default}} ++ ++function usage() ++{ ++cat < ++ ++ ++ The name/id/tag of a instance to control/check ++ ++ ++ ++ Use a specific profile from your credential file. ++ ++ ++ ++ Name of the tag containing the instances uname ++ ++ ++ ++ DANGER: Assume any unknown instance is safely stopped ++ ++ ++EOF ++ exit 0; ++} ++ ++function metadata() ++{ ++ cat < ++ ++ ++$description ++ ++ ++ ++ ++ ++ Fencing Action ++ ++ ++ ++ ++ The name/id/tag of a instance to control/check ++ ++ ++ ++ ++ Use a specific profile from your credential file. ++ ++ ++ ++ ++ Name of the tag containing the instances uname ++ ++ ++ ++ ++ DANGER: Assume any unknown instance is safely stopped ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++EOF ++ exit 0; ++} ++ ++function instance_for_port() ++{ ++ local port=$1 ++ local instance="" ++ ++ # Look for port name -n in the INSTANCE data ++ instance=`aws ec2 describe-instances $options | grep "^INSTANCES[[:space:]].*[[:space:]]$port[[:space:]]" | awk '{print $8}'` ++ if [ -z $instance ]; then ++ # Look for port name -n in the Name TAG ++ instance=`aws ec2 describe-tags $options | grep "^TAGS[[:space:]]$ec2_tag[[:space:]].*[[:space:]]instance[[:space:]]$port$" | awk '{print $3}'` ++ fi ++ ++ if [ -z $instance ]; then ++ instance_not_found=1 ++ instance=$port ++ fi ++ ++ echo $instance ++} ++ ++function instance_on() ++{ ++ aws ec2 start-instances $options --instance-ids $instance ++} ++ ++function instance_off() ++{ ++ if [ $unknown_are_stopped = 1 -a $instance_not_found ]; then ++ : nothing to do ++ ha_log.sh info "Assuming unknown instance $instance is already off" ++ else ++ aws ec2 stop-instances $options --instance-ids $instance --force ++ fi ++} ++ ++function instance_status() ++{ ++ local instance=$1 ++ local status="unknown" ++ local rc=1 ++ ++ # List of instances and their current status ++ if [ $unknown_are_stopped = 1 -a $instance_not_found ]; then ++ ha_log.sh info "$instance stopped (unknown)" ++ else ++ status=`aws ec2 describe-instances $options --instance-ids $instance | awk '{ ++ if (/^STATE\t/) { printf "%s", $3 } ++ }'` ++ rc=$? ++ fi ++ ha_log.sh info "status check for $instance is $status" ++ echo $status ++ return $rc ++} ++ ++ ++TEMP=`getopt -o qVho:e:p:n:t:U --long version,help,action:,port:,option:,profile:,tag:,quiet,unknown-are-stopped \ ++ -n 'fence_ec2' -- "$@"` ++ ++if [ $? != 0 ];then ++ usage ++ exit 1 ++fi ++ ++# Note the quotes around `$TEMP': they are essential! ++eval set -- "$TEMP" ++ ++if [ -z $1 ]; then ++ # If there are no command line args, look for options from stdin ++ while read line; do ++ case $line in ++ option=*|action=*) action=`echo $line | sed s/.*=//`;; ++ port=*) port=`echo $line | sed s/.*=//`;; ++ profile=*) ec2_profile=`echo $line | sed s/.*=//`;; ++ tag=*) ec2_tag=`echo $line | sed s/.*=//`;; ++ quiet*) quiet=1;; ++ unknown-are-stopped*) unknown_are_stopped=1;; ++ --);; ++ *) ha_log.sh err "Invalid command: $line";; ++ esac ++ done ++fi ++ ++while true ; do ++ case "$1" in ++ -o|--action|--option) action=$2; shift; shift;; ++ -n|--port) port=$2; shift; shift;; ++ -p|--profile) ec2_profile=$2; shift; shift;; ++ -t|--tag) ec2_tag=$2; shift; shift;; ++ -U|--unknown-are-stopped) unknown_are_stopped=1; shift;; ++ -q|--quiet) quiet=1; shift;; ++ -V|--version) echo "1.0.0"; exit 0;; ++ --help|-h) ++ usage; ++ exit 0;; ++ --) shift ; break ;; ++ *) ha_log.sh err "Unknown option: $1. See --help for details."; exit 1;; ++ esac ++done ++ ++[ -n "$1" ] && action=$1 ++ ++if [ -z "$ec2_profile"]; then ++ options="--output text --profile default" ++else ++ options="--output text --profile $ec2_profile " ++fi ++ ++action=`echo $action | tr 'A-Z' 'a-z'` ++ ++case $action in ++ metadata) ++ metadata ++ ;; ++ getinfo-xml) ++ getinfo_xml ++ ;; ++ getconfignames) ++ for i in profile port tag ++ do ++ echo $i ++ done ++ exit 0 ++ ;; ++ getinfo-devid) ++ echo "EC2 STONITH device" ++ exit 0 ++ ;; ++ getinfo-devname) ++ echo "EC2 STONITH external device" ++ exit 0 ++ ;; ++ getinfo-devdescr) ++ echo "fence_ec2 is an I/O Fencing agent which can be used with Amazon EC2 instances." ++ exit 0 ++ ;; ++ getinfo-devurl) ++ echo "" ++ exit 0 ++ ;; ++esac ++ ++# get my instance id ++myinstance=`curl http://169.254.169.254/latest/meta-data/instance-id` ++ ++# check my status. ++# When the EC2 instance be stopped by the "aws ec2 stop-instances" , the stop processing of the OS is executed. ++# While the OS stop processing, Pacemaker can execute the STONITH processing. ++# So, If my status is not "running", it determined that I was already fenced. And to prevent fencing each other ++# in split-brain, I don't fence other node. ++if [ -z "$myinstance" ]; then ++ ha_log.sh err "Failed to get My Instance ID. so can not check my status." ++ exit 1 ++fi ++mystatus=`instance_status $myinstance` ++if [ "$mystatus" != "running" ]; then #do not fence ++ ha_log.sh warn "I was already fenced (My instance status=$mystatus). I don't fence other node." ++ exit 1 ++fi ++ ++# get target's instance id ++instance="" ++if [ ! -z "$port" ]; then ++ instance=`instance_for_port $port $options` ++fi ++ ++case $action in ++ reboot|reset) ++ status=`instance_status $instance` ++ if [ "$status" != "stopped" ]; then ++ instance_off ++ fi ++ while true; ++ do ++ status=`instance_status $instance` ++ if [ "$status" = "stopped" ]; then ++ break ++ fi ++ sleep $sleep_time ++ done ++ instance_on ++ while true; ++ do ++ status=`instance_status $instance` ++ if [ "$status" = "running" ]; then ++ break ++ fi ++ sleep $sleep_time ++ done ++ ;; ++ poweron|on) ++ instance_on ++ while true; ++ do ++ status=`instance_status $instance` ++ if [ "$status" = "running" ]; then ++ break ++ fi ++ done ++ ;; ++ poweroff|off) ++ instance_off ++ while true; ++ do ++ status=`instance_status $instance` ++ if [ "$status" = "stopped" ]; then ++ break ++ fi ++ sleep $sleep_time ++ done ++ ;; ++ monitor) ++ # Is the device ok? ++ aws ec2 describe-instances $options | grep INSTANCES &> /dev/null ++ ;; ++ gethosts|hostlist|list) ++ # List of names we know about ++ a=`aws ec2 describe-instances $options | awk -v tag_pat="^TAGS\t$ec2_tag\t" -F '\t' '{ ++ if (/^INSTANCES/) { printf "%s\n", $8 } ++ else if ( $1"\t"$2"\t" ~ tag_pat ) { printf "%s\n", $3 } ++ }' | sort -u` ++ echo $a ++ ;; ++ stat|status) ++ instance_status $instance > /dev/null ++ ;; ++ *) ha_log.sh err "Unknown action: $action"; exit 1;; ++esac ++ ++status=$? ++ ++if [ $quiet -eq 1 ]; then ++ : nothing ++elif [ $status -eq 0 ]; then ++ ha_log.sh info "Operation $action passed" ++else ++ ha_log.sh err "Operation $action failed: $status" ++fi ++exit $status +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-e3970b0e-Dev-Update-README-and-rename-to-README.md.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-e3970b0e-Dev-Update-README-and-rename-to-README.md.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-e3970b0e-Dev-Update-README-and-rename-to-README.md.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-e3970b0e-Dev-Update-README-and-rename-to-README.md.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,88 @@ +From e3970b0e0ce17f465e1a9e74ef66b65dc22bcca2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= +Date: Tue, 11 Oct 2016 08:55:48 +0200 +Subject: [PATCH] Dev: Update README and rename to README.md + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/e3970b0e0ce17f465e1a9e74ef66b65dc22bcca2 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + README | 1 - + README.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 1 deletion(-) + delete mode 100644 README + create mode 100644 README.md + +diff --git a/README b/README +deleted file mode 100644 +index 8d1c8b69..00000000 +--- a/README ++++ /dev/null +@@ -1 +0,0 @@ +- +diff --git a/README.md b/README.md +new file mode 100644 +index 00000000..ce0bf458 +--- /dev/null ++++ b/README.md +@@ -0,0 +1,56 @@ ++ ++# Cluster Glue ++ ++Cluster Glue is a set of libraries, tools and utilities used in the ++the Heartbeat/Pacemaker cluster stack. In essence, Glue are the parts ++of the cluster stack that don't fit in anywhere else, and aren't big ++enough pieces or actively developed enough to qualify as their own ++projects. ++ ++Cluster Glue has been managed as a separate Linux-HA sub-project since ++its 1.0 release, which coincided with the Heartbeat 2.99 ++release. Previously, it was a part of the then-monolithic Heartbeat ++project, and had no separate name. ++ ++## Components ++ ++### Local Resource Manager (LRM) ++ ++The Local Resource Manager is the interface between the Cluster ++Resource Manager (Pacemaker) and the resource agents. It is itself not ++cluster aware, nor does it apply any policies. It simply processes ++commands received from the Cluster Resource Manager, passes them to ++resource agents, and reports back success or failure. It particular, ++the LRM may ++ ++* start a resource; ++* stop a resource; ++* monitor a resource; ++* report a resource's status; ++* list all resource instances it currently controls, and their status. ++ ++### STONITH ++ ++A mechanism for node fencing. In case a node is considered "dead" by ++the cluster as a whole, STONITH ("Shoot The Other Node In The Head") ++forcefully removes is from the cluster so it can no longer pose a risk ++of interacting with other nodes in an uncoordinated fashion. ++ ++### hb_report (deprecated) ++ ++An advanced error reporting utility. hb_report-generated tarballs are ++frequently requested by the developers to isolate and fix bugs, and ++are commonly found as attachments to Bugzilla entries. ++ ++NOTE: hb_report has been integrated into ++[https://crmsh.github.io](crmsh), and is now maintained as part of the ++`crmsh` project. ++ ++### Cluster Plumbing Library ++ ++A low-level library for intra-cluster communications. ++ ++## Source Code Repository ++ ++Source code for Cluster Glue is being maintained in the ++https://github.com/ClusterLabs/cluster-glue git repository. +-- +2.27.0 + diff -pruN 1.0.12-25/debian/patches/ubuntu/lp1895355-eec6232f-fix-addresses-of-FSF-point-to-gnu.org-licenses-inste.patch 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-eec6232f-fix-addresses-of-FSF-point-to-gnu.org-licenses-inste.patch --- 1.0.12-25/debian/patches/ubuntu/lp1895355-eec6232f-fix-addresses-of-FSF-point-to-gnu.org-licenses-inste.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.12-25ubuntu1/debian/patches/ubuntu/lp1895355-eec6232f-fix-addresses-of-FSF-point-to-gnu.org-licenses-inste.patch 2025-11-17 03:52:19.000000000 +0000 @@ -0,0 +1,3215 @@ +From eec6232f6cfd16d9a2dd1f4fb4a4195d53979d93 Mon Sep 17 00:00:00 2001 +From: Lars Ellenberg +Date: Mon, 21 Mar 2016 13:08:41 +0100 +Subject: [PATCH] fix addresses of FSF, point to gnu.org/licenses instead + +Origin: upstream, https://github.com/ClusterLabs/cluster-glue/commit/eec6232f6cfd16d9a2dd1f4fb4a4195d53979d93 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1895355 +Reviewed-by: Rafael David Tinoco +Last-Update: 2020-09-15 +--- + COPYING | 3 +-- + COPYING.LIB | 3 +-- + GNUmakefile | 3 +-- + Makefile.am | 3 +-- + config/Makefile.am | 3 +-- + doc/Makefile.am | 3 +-- + doc/stonith/Makefile.am | 3 +-- + hb_report/Makefile.am | 3 +-- + hb_report/ha_cf_support.sh | 3 +-- + hb_report/hb_report.in | 3 +-- + hb_report/openais_conf_support.sh | 3 +-- + hb_report/utillib.sh | 3 +-- + include/Makefile.am | 3 +-- + include/clplumbing/GSource.h | 3 +-- + include/clplumbing/GSource_internal.h | 3 +-- + include/clplumbing/Gmain_timeout.h | 3 +-- + include/clplumbing/Makefile.am | 3 +-- + include/clplumbing/apphb_cs.h | 3 +-- + include/clplumbing/base64.h | 3 +-- + include/clplumbing/cl_log.h | 3 +-- + include/clplumbing/cl_misc.h | 3 +-- + include/clplumbing/cl_pidfile.h | 3 +-- + include/clplumbing/cl_plugin.h | 3 +-- + include/clplumbing/cl_poll.h | 3 +-- + include/clplumbing/cl_quorum.h | 3 +-- + include/clplumbing/cl_quorumd.h | 3 +-- + include/clplumbing/cl_random.h | 3 +-- + include/clplumbing/cl_signal.h | 3 +-- + include/clplumbing/cl_syslog.h | 3 +-- + include/clplumbing/cl_tiebreaker.h | 3 +-- + include/clplumbing/cl_uuid.h | 3 +-- + include/clplumbing/coredumps.h | 3 +-- + include/clplumbing/cpulimits.h | 3 +-- + include/clplumbing/ipc.h | 3 +-- + include/clplumbing/loggingdaemon.h | 3 +-- + include/clplumbing/longclock.h | 3 +-- + include/clplumbing/lsb_exitcodes.h | 3 +-- + include/clplumbing/md5.h | 3 +-- + include/clplumbing/mkstemp_mode.h | 3 +-- + include/clplumbing/netstring.h | 3 +-- + include/clplumbing/proctrack.h | 3 +-- + include/clplumbing/realtime.h | 3 +-- + include/clplumbing/replytrack.h | 3 +-- + include/clplumbing/setproctitle.h | 6 ++---- + include/clplumbing/timers.h | 3 +-- + include/clplumbing/uids.h | 3 +-- + include/compress.h | 3 +-- + include/ha_msg.h | 3 +-- + include/lha_internal.h | 3 +-- + include/lrm/Makefile.am | 3 +-- + include/lrm/lrm_api.h | 3 +-- + include/lrm/lrm_msg.h | 3 +-- + include/lrm/racommon.h | 3 +-- + include/lrm/raexec.h | 3 +-- + include/pils/Makefile.am | 3 +-- + include/pils/generic.h | 3 +-- + include/pils/interface.h | 3 +-- + include/pils/plugin.h.in | 3 +-- + include/replace_uuid.h | 3 +-- + include/stonith/Makefile.am | 3 +-- + include/stonith/expect.h | 3 +-- + include/stonith/st_ttylock.h | 3 +-- + include/stonith/stonith.h | 3 +-- + include/stonith/stonith_plugin.h | 3 +-- + lib/Makefile.am | 3 +-- + lib/clplumbing/GSource.c | 3 +-- + lib/clplumbing/Makefile.am | 3 +-- + lib/clplumbing/base64.c | 3 +-- + lib/clplumbing/base64_md5_test.c | 3 +-- + lib/clplumbing/cl_compress.c | 3 +-- + lib/clplumbing/cl_log.c | 3 +-- + lib/clplumbing/cl_malloc.c | 3 +-- + lib/clplumbing/cl_misc.c | 3 +-- + lib/clplumbing/cl_msg.c | 3 +-- + lib/clplumbing/cl_msg_types.c | 3 +-- + lib/clplumbing/cl_netstring.c | 3 +-- + lib/clplumbing/cl_pidfile.c | 3 +-- + lib/clplumbing/cl_plugin.c | 3 +-- + lib/clplumbing/cl_poll.c | 3 +-- + lib/clplumbing/cl_random.c | 3 +-- + lib/clplumbing/cl_signal.c | 3 +-- + lib/clplumbing/cl_syslog.c | 3 +-- + lib/clplumbing/cl_uuid.c | 3 +-- + lib/clplumbing/coredumps.c | 3 +-- + lib/clplumbing/cpulimits.c | 3 +-- + lib/clplumbing/ipcsocket.c | 3 +-- + lib/clplumbing/ipctest.c | 3 +-- + lib/clplumbing/ipctransient.h | 3 +-- + lib/clplumbing/ipctransientclient.c | 3 +-- + lib/clplumbing/ipctransientlib.c | 3 +-- + lib/clplumbing/ipctransientserver.c | 3 +-- + lib/clplumbing/longclock.c | 3 +-- + lib/clplumbing/mkstemp_mode.c | 3 +-- + lib/clplumbing/netstring_test.c | 3 +-- + lib/clplumbing/ocf_ipc.c | 3 +-- + lib/clplumbing/proctrack.c | 3 +-- + lib/clplumbing/realtime.c | 3 +-- + lib/clplumbing/replytrack.c | 3 +-- + lib/clplumbing/setproctitle.c | 6 ++---- + lib/clplumbing/timers.c | 3 +-- + lib/clplumbing/transient-test.sh | 3 +-- + lib/clplumbing/uids.c | 3 +-- + lib/lrm/Makefile.am | 3 +-- + lib/lrm/clientlib.c | 3 +-- + lib/lrm/lrm_msg.c | 3 +-- + lib/lrm/racommon.c | 3 +-- + lib/pils/Makefile.am | 3 +-- + lib/pils/main.c | 3 +-- + lib/pils/pils.c | 3 +-- + lib/pils/test.c | 3 +-- + lib/plugins/InterfaceMgr/HBauth.c | 3 +-- + lib/plugins/InterfaceMgr/Makefile.am | 3 +-- + lib/plugins/InterfaceMgr/generic.c | 3 +-- + lib/plugins/Makefile.am | 3 +-- + lib/plugins/compress/Makefile.am | 3 +-- + lib/plugins/compress/bz2.c | 3 +-- + lib/plugins/compress/zlib.c | 3 +-- + lib/plugins/lrm/Makefile.am | 3 +-- + lib/plugins/lrm/raexechb.c | 3 +-- + lib/plugins/lrm/raexeclsb.c | 3 +-- + lib/plugins/lrm/raexecocf.c | 3 +-- + lib/plugins/lrm/raexecupstart.c | 3 +-- + lib/plugins/lrm/upstart-dbus.c | 3 +-- + lib/plugins/lrm/upstart-dbus.h | 3 +-- + lib/plugins/stonith/Makefile.am | 3 +-- + lib/plugins/stonith/apcmaster.c | 3 +-- + lib/plugins/stonith/apcmastersnmp.c | 3 +-- + lib/plugins/stonith/apcsmart.c | 3 +-- + lib/plugins/stonith/baytech.c | 3 +-- + lib/plugins/stonith/bladehpi.c | 3 +-- + lib/plugins/stonith/cyclades.c | 3 +-- + lib/plugins/stonith/drac3.c | 3 +-- + lib/plugins/stonith/drac3_command.c | 3 +-- + lib/plugins/stonith/drac3_command.h | 3 +-- + lib/plugins/stonith/drac3_hash.c | 3 +-- + lib/plugins/stonith/drac3_hash.h | 3 +-- + lib/plugins/stonith/external.c | 3 +-- + lib/plugins/stonith/external/Makefile.am | 3 +-- + lib/plugins/stonith/external/dracmc-telnet | 3 +-- + lib/plugins/stonith/external/ec2 | 3 +-- + lib/plugins/stonith/external/hetzner | 3 +-- + lib/plugins/stonith/external/hmchttp | 3 +-- + lib/plugins/stonith/external/ibmrsa-telnet | 3 +-- + lib/plugins/stonith/external/ipmi | 3 +-- + lib/plugins/stonith/external/ippower9258.in | 3 +-- + lib/plugins/stonith/external/kdumpcheck.in | 3 +-- + lib/plugins/stonith/external/libvirt | 3 +-- + lib/plugins/stonith/external/rackpdu | 3 +-- + lib/plugins/stonith/external/riloe | 3 +-- + lib/plugins/stonith/external/ssh.in | 3 +-- + lib/plugins/stonith/external/vmware | 3 +-- + lib/plugins/stonith/ibmhmc.c | 3 +-- + lib/plugins/stonith/ipmi_os_handler.c | 3 +-- + lib/plugins/stonith/ipmilan.c | 3 +-- + lib/plugins/stonith/ipmilan.h | 3 +-- + lib/plugins/stonith/ipmilan_command.c | 3 +-- + lib/plugins/stonith/ipmilan_test.c | 3 +-- + lib/plugins/stonith/meatware.c | 3 +-- + lib/plugins/stonith/null.c | 3 +-- + lib/plugins/stonith/nw_rpc100s.c | 3 +-- + lib/plugins/stonith/rcd_serial.c | 3 +-- + lib/plugins/stonith/rhcs.c | 3 +-- + lib/plugins/stonith/ribcl.py.in | 3 +-- + lib/plugins/stonith/riloe.c | 3 +-- + lib/plugins/stonith/rps10.c | 3 +-- + lib/plugins/stonith/ssh.c | 3 +-- + lib/plugins/stonith/stonith_config_xml.h | 3 +-- + lib/plugins/stonith/stonith_expect_helpers.h | 3 +-- + lib/plugins/stonith/stonith_plugin_common.h | 3 +-- + lib/plugins/stonith/stonith_signal.h | 3 +-- + lib/plugins/stonith/suicide.c | 3 +-- + lib/plugins/stonith/vacm.c | 3 +-- + lib/plugins/stonith/wti_mpc.c | 3 +-- + lib/plugins/stonith/wti_nps.c | 3 +-- + lib/stonith/Makefile.am | 3 +-- + lib/stonith/expect.c | 3 +-- + lib/stonith/ha_log.sh | 3 +-- + lib/stonith/main.c | 3 +-- + lib/stonith/meatclient.c | 3 +-- + lib/stonith/st_ttylock.c | 3 +-- + lib/stonith/stonith.c | 3 +-- + logd/Makefile.am | 3 +-- + logd/ha_logd.c | 3 +-- + logd/ha_logger.c | 3 +-- + logd/logtest.c | 3 +-- + lrm/Makefile.am | 3 +-- + lrm/admin/Makefile.am | 3 +-- + lrm/admin/cibsecret.in | 3 +-- + lrm/admin/lrmadmin.c | 3 +-- + lrm/lrmd/Makefile.am | 3 +-- + lrm/lrmd/audit.c | 3 +-- + lrm/lrmd/cib_secrets.c | 3 +-- + lrm/lrmd/lrmd.c | 3 +-- + lrm/test/LRMBasicSanityCheck.in | 3 +-- + lrm/test/Makefile.am | 3 +-- + lrm/test/apitest.c | 3 +-- + lrm/test/callbacktest.c | 3 +-- + lrm/test/evaltest.sh | 3 +-- + lrm/test/lrmregtest.in | 3 +-- + lrm/test/plugintest.c | 3 +-- + lrm/test/regression.sh.in | 3 +-- + lrm/test/testcases/Makefile.am | 3 +-- + replace/Makefile.am | 3 +-- + replace/NoSuchFunctionName.c | 3 +-- + replace/setenv.c | 3 +-- + replace/strerror.c | 3 +-- + replace/strlcat.c | 3 +-- + replace/strlcpy.c | 3 +-- + replace/strndup.c | 3 +-- + replace/strnlen.c | 3 +-- + replace/unsetenv.c | 3 +-- + replace/uuid_parse.c | 3 +-- + 212 files changed, 214 insertions(+), 428 deletions(-) + +diff --git a/COPYING b/COPYING +index d511905c..5296e2c2 100644 +--- a/COPYING ++++ b/COPYING +@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found. + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along +- with this program; if not, write to the Free Software Foundation, Inc., +- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ with this program; if not, see . + + Also add information on how to contact you by electronic and paper mail. + +diff --git a/COPYING.LIB b/COPYING.LIB +index 602bfc94..9af6cdaf 100644 +--- a/COPYING.LIB ++++ b/COPYING.LIB +@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public +- License along with this library; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ License along with this library; if not, see + + Also add information on how to contact you by electronic and paper mail. + +diff --git a/GNUmakefile b/GNUmakefile +index a641d9c5..dbcbcd0e 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -12,8 +12,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + + -include Makefile +diff --git a/Makefile.am b/Makefile.am +index 93dbaf6a..3f1146c2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,8 +12,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + + DISTCHECK_CONFIGURE_FLAGS = \ +diff --git a/config/Makefile.am b/config/Makefile.am +index fa415162..de44af42 100644 +--- a/config/Makefile.am ++++ b/config/Makefile.am +@@ -12,8 +12,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + + MAINTAINERCLEANFILES = Makefile.in + EXTRA_DIST = byteorder_test.c +diff --git a/doc/Makefile.am b/doc/Makefile.am +index c8d67a88..ddd6886f 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in hb_report.xml ha_logd.xml ha_logger.xml stonith.xml meatclient.xml + +diff --git a/doc/stonith/Makefile.am b/doc/stonith/Makefile.am +index 4c9b76fe..bd799f88 100644 +--- a/doc/stonith/Makefile.am ++++ b/doc/stonith/Makefile.am +@@ -9,8 +9,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/hb_report/Makefile.am b/hb_report/Makefile.am +index cd4ad655..b072e453 100644 +--- a/hb_report/Makefile.am ++++ b/hb_report/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/hb_report/ha_cf_support.sh b/hb_report/ha_cf_support.sh +index 7b35c98e..bb63811a 100644 +--- a/hb_report/ha_cf_support.sh ++++ b/hb_report/ha_cf_support.sh +@@ -11,8 +11,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +- # License along with this library; if not, write to the Free Software +- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ # License along with this library; if not, see + # + + # +diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in +index 3f2cd031..cc67303e 100755 +--- a/hb_report/hb_report.in ++++ b/hb_report/hb_report.in +@@ -13,8 +13,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +- # License along with this library; if not, write to the Free Software +- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ # License along with this library; if not, see + # + + . @OCF_ROOT_DIR@/lib/heartbeat/ocf-shellfuncs +diff --git a/hb_report/openais_conf_support.sh b/hb_report/openais_conf_support.sh +index b96d1aa8..0a28638e 100644 +--- a/hb_report/openais_conf_support.sh ++++ b/hb_report/openais_conf_support.sh +@@ -11,8 +11,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +- # License along with this library; if not, write to the Free Software +- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ # License along with this library; if not, see + # + + # +diff --git a/hb_report/utillib.sh b/hb_report/utillib.sh +index b059ab18..5c854abe 100644 +--- a/hb_report/utillib.sh ++++ b/hb_report/utillib.sh +@@ -11,8 +11,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +- # License along with this library; if not, write to the Free Software +- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ # License along with this library; if not, see + # + + # +diff --git a/include/Makefile.am b/include/Makefile.am +index 2e07275a..feb91877 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -12,8 +12,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + + MAINTAINERCLEANFILES = Makefile.in +diff --git a/include/clplumbing/GSource.h b/include/clplumbing/GSource.h +index 2acc9eb1..26b5ad45 100644 +--- a/include/clplumbing/GSource.h ++++ b/include/clplumbing/GSource.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CLPLUMBING_GSOURCE_H +diff --git a/include/clplumbing/GSource_internal.h b/include/clplumbing/GSource_internal.h +index c20a9c90..099f7754 100644 +--- a/include/clplumbing/GSource_internal.h ++++ b/include/clplumbing/GSource_internal.h +@@ -13,8 +13,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/include/clplumbing/Gmain_timeout.h b/include/clplumbing/Gmain_timeout.h +index c696a9dc..ce8ef32e 100644 +--- a/include/clplumbing/Gmain_timeout.h ++++ b/include/clplumbing/Gmain_timeout.h +@@ -17,8 +17,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + /* +diff --git a/include/clplumbing/Makefile.am b/include/clplumbing/Makefile.am +index 599b24c8..57f24f96 100644 +--- a/include/clplumbing/Makefile.am ++++ b/include/clplumbing/Makefile.am +@@ -15,8 +15,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++# along with this program; if not, see + + # + MAINTAINERCLEANFILES = Makefile.in +diff --git a/include/clplumbing/apphb_cs.h b/include/clplumbing/apphb_cs.h +index 9506db6d..80793b32 100644 +--- a/include/clplumbing/apphb_cs.h ++++ b/include/clplumbing/apphb_cs.h +@@ -13,8 +13,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/clplumbing/base64.h b/include/clplumbing/base64.h +index 4ea68104..3ba1d591 100644 +--- a/include/clplumbing/base64.h ++++ b/include/clplumbing/base64.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CLPLUMBING_BASE64_H +diff --git a/include/clplumbing/cl_log.h b/include/clplumbing/cl_log.h +index aa30fcd6..048ad6cf 100644 +--- a/include/clplumbing/cl_log.h ++++ b/include/clplumbing/cl_log.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CLPLUMBING_CL_LOG_H +diff --git a/include/clplumbing/cl_misc.h b/include/clplumbing/cl_misc.h +index 6f698b56..bf103702 100644 +--- a/include/clplumbing/cl_misc.h ++++ b/include/clplumbing/cl_misc.h +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CLPLUMBING_CL_MISC_H +diff --git a/include/clplumbing/cl_pidfile.h b/include/clplumbing/cl_pidfile.h +index d04e5cf7..ec56c4df 100644 +--- a/include/clplumbing/cl_pidfile.h ++++ b/include/clplumbing/cl_pidfile.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _LOCKFILE_H_ +diff --git a/include/clplumbing/cl_plugin.h b/include/clplumbing/cl_plugin.h +index e2431bf4..7ef4a488 100644 +--- a/include/clplumbing/cl_plugin.h ++++ b/include/clplumbing/cl_plugin.h +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef __CL_PLUGIN__ +diff --git a/include/clplumbing/cl_poll.h b/include/clplumbing/cl_poll.h +index 1b1908fa..71d32618 100644 +--- a/include/clplumbing/cl_poll.h ++++ b/include/clplumbing/cl_poll.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + #ifndef CLPLUMBING_CL_POLL_H + # define CLPLUMBING_CL_POLL_H +diff --git a/include/clplumbing/cl_quorum.h b/include/clplumbing/cl_quorum.h +index b7798ba5..a25b9edc 100644 +--- a/include/clplumbing/cl_quorum.h ++++ b/include/clplumbing/cl_quorum.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _QUORUM_H_ +diff --git a/include/clplumbing/cl_quorumd.h b/include/clplumbing/cl_quorumd.h +index 6d282b37..d08eed4f 100644 +--- a/include/clplumbing/cl_quorumd.h ++++ b/include/clplumbing/cl_quorumd.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _QUORUMD_H_ +diff --git a/include/clplumbing/cl_random.h b/include/clplumbing/cl_random.h +index d1e37ce0..cca7152c 100644 +--- a/include/clplumbing/cl_random.h ++++ b/include/clplumbing/cl_random.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/include/clplumbing/cl_signal.h b/include/clplumbing/cl_signal.h +index 1a13a6bf..1460e5f7 100644 +--- a/include/clplumbing/cl_signal.h ++++ b/include/clplumbing/cl_signal.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #ifndef _CL_SIGNAL_H +diff --git a/include/clplumbing/cl_syslog.h b/include/clplumbing/cl_syslog.h +index a7c1bfa1..51ff145a 100644 +--- a/include/clplumbing/cl_syslog.h ++++ b/include/clplumbing/cl_syslog.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + /* +diff --git a/include/clplumbing/cl_tiebreaker.h b/include/clplumbing/cl_tiebreaker.h +index 11c10c46..513fedc7 100644 +--- a/include/clplumbing/cl_tiebreaker.h ++++ b/include/clplumbing/cl_tiebreaker.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CL_TIEBREAKER_H_ +diff --git a/include/clplumbing/cl_uuid.h b/include/clplumbing/cl_uuid.h +index 12542cdf..e03b53e1 100644 +--- a/include/clplumbing/cl_uuid.h ++++ b/include/clplumbing/cl_uuid.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CL_UUID_H_ +diff --git a/include/clplumbing/coredumps.h b/include/clplumbing/coredumps.h +index 4d5ce79e..9424d528 100644 +--- a/include/clplumbing/coredumps.h ++++ b/include/clplumbing/coredumps.h +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #ifndef _CLPLUMBING_COREFILES_H +diff --git a/include/clplumbing/cpulimits.h b/include/clplumbing/cpulimits.h +index f7dd875d..f2857ae4 100644 +--- a/include/clplumbing/cpulimits.h ++++ b/include/clplumbing/cpulimits.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + /* +diff --git a/include/clplumbing/ipc.h b/include/clplumbing/ipc.h +index 4a5e1519..601c40bf 100644 +--- a/include/clplumbing/ipc.h ++++ b/include/clplumbing/ipc.h +@@ -19,8 +19,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/clplumbing/loggingdaemon.h b/include/clplumbing/loggingdaemon.h +index ba986f52..3f1994dd 100644 +--- a/include/clplumbing/loggingdaemon.h ++++ b/include/clplumbing/loggingdaemon.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + /* Messages sent to the logging daemon */ +diff --git a/include/clplumbing/longclock.h b/include/clplumbing/longclock.h +index ae95b28f..1f59ed64 100644 +--- a/include/clplumbing/longclock.h ++++ b/include/clplumbing/longclock.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/clplumbing/lsb_exitcodes.h b/include/clplumbing/lsb_exitcodes.h +index e46b5beb..d5595de5 100644 +--- a/include/clplumbing/lsb_exitcodes.h ++++ b/include/clplumbing/lsb_exitcodes.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + /* LSB status exit codes. +diff --git a/include/clplumbing/md5.h b/include/clplumbing/md5.h +index 95b2c337..c89ff534 100644 +--- a/include/clplumbing/md5.h ++++ b/include/clplumbing/md5.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/clplumbing/mkstemp_mode.h b/include/clplumbing/mkstemp_mode.h +index ff5f8930..2d6d1841 100644 +--- a/include/clplumbing/mkstemp_mode.h ++++ b/include/clplumbing/mkstemp_mode.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + /* +diff --git a/include/clplumbing/netstring.h b/include/clplumbing/netstring.h +index ef24e8f4..0301e96a 100644 +--- a/include/clplumbing/netstring.h ++++ b/include/clplumbing/netstring.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/clplumbing/proctrack.h b/include/clplumbing/proctrack.h +index 975ff1ba..a4ed22ba 100644 +--- a/include/clplumbing/proctrack.h ++++ b/include/clplumbing/proctrack.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/clplumbing/realtime.h b/include/clplumbing/realtime.h +index 45eb76cb..94767848 100644 +--- a/include/clplumbing/realtime.h ++++ b/include/clplumbing/realtime.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CLPLUMBING_REALTIME_H +diff --git a/include/clplumbing/replytrack.h b/include/clplumbing/replytrack.h +index f98fe480..baf9bf27 100644 +--- a/include/clplumbing/replytrack.h ++++ b/include/clplumbing/replytrack.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/clplumbing/setproctitle.h b/include/clplumbing/setproctitle.h +index 5caeef07..b8665fe0 100644 +--- a/include/clplumbing/setproctitle.h ++++ b/include/clplumbing/setproctitle.h +@@ -24,8 +24,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program; if not, see . + */ + + /* +@@ -44,8 +43,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program; if not, see . + * + * As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Dihu + * and other respective copyright holders give permission to link this program +diff --git a/include/clplumbing/timers.h b/include/clplumbing/timers.h +index 669ac21d..50eb2c67 100644 +--- a/include/clplumbing/timers.h ++++ b/include/clplumbing/timers.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _CLPLUMBING_TIMERS_H +diff --git a/include/clplumbing/uids.h b/include/clplumbing/uids.h +index 89ba303e..bc1cfc10 100644 +--- a/include/clplumbing/uids.h ++++ b/include/clplumbing/uids.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef CLPLUMBING_UIDS_H +diff --git a/include/compress.h b/include/compress.h +index 9cd733c5..bc3adc02 100644 +--- a/include/compress.h ++++ b/include/compress.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef _COMPRESS_H_ +diff --git a/include/ha_msg.h b/include/ha_msg.h +index fcb6cf66..490eebe7 100644 +--- a/include/ha_msg.h ++++ b/include/ha_msg.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/lha_internal.h b/include/lha_internal.h +index bae10a09..92a44c11 100644 +--- a/include/lha_internal.h ++++ b/include/lha_internal.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ++ * License along with this library; if not, see * + */ + + #ifndef LHA_INTERNAL_H +diff --git a/include/lrm/Makefile.am b/include/lrm/Makefile.am +index ec4f5a5f..70dd851b 100644 +--- a/include/lrm/Makefile.am ++++ b/include/lrm/Makefile.am +@@ -13,8 +13,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/include/lrm/lrm_api.h b/include/lrm/lrm_api.h +index cebff1b8..3256b4e2 100644 +--- a/include/lrm/lrm_api.h ++++ b/include/lrm/lrm_api.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/lrm/lrm_msg.h b/include/lrm/lrm_msg.h +index 6f671e1d..e00a3633 100644 +--- a/include/lrm/lrm_msg.h ++++ b/include/lrm/lrm_msg.h +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/lrm/racommon.h b/include/lrm/racommon.h +index b16aa24e..bdded817 100644 +--- a/include/lrm/racommon.h ++++ b/include/lrm/racommon.h +@@ -13,8 +13,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef RACOMMON_H +diff --git a/include/lrm/raexec.h b/include/lrm/raexec.h +index 0b698312..ea93a955 100644 +--- a/include/lrm/raexec.h ++++ b/include/lrm/raexec.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef RAEXEC_H +diff --git a/include/pils/Makefile.am b/include/pils/Makefile.am +index 4b6c6a0a..63fb184a 100644 +--- a/include/pils/Makefile.am ++++ b/include/pils/Makefile.am +@@ -15,8 +15,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/include/pils/generic.h b/include/pils/generic.h +index 83bf3e35..3760ddbb 100644 +--- a/include/pils/generic.h ++++ b/include/pils/generic.h +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * + * Generic interface (implementation) manager +diff --git a/include/pils/interface.h b/include/pils/interface.h +index 5a5114e8..e64223d9 100644 +--- a/include/pils/interface.h ++++ b/include/pils/interface.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #ifndef PILS_INTERFACE_H +diff --git a/include/pils/plugin.h.in b/include/pils/plugin.h.in +index cb67d91e..c0f19e50 100644 +--- a/include/pils/plugin.h.in ++++ b/include/pils/plugin.h.in +@@ -13,8 +13,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/replace_uuid.h b/include/replace_uuid.h +index d6bca898..50a8cce6 100644 +--- a/include/replace_uuid.h ++++ b/include/replace_uuid.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + /* +diff --git a/include/stonith/Makefile.am b/include/stonith/Makefile.am +index 9e67a2a4..7f1c3ffe 100644 +--- a/include/stonith/Makefile.am ++++ b/include/stonith/Makefile.am +@@ -15,8 +15,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/include/stonith/expect.h b/include/stonith/expect.h +index 6084ef1c..b3d1bf90 100644 +--- a/include/stonith/expect.h ++++ b/include/stonith/expect.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/stonith/st_ttylock.h b/include/stonith/st_ttylock.h +index 5b5c7fd0..e7e039b7 100644 +--- a/include/stonith/st_ttylock.h ++++ b/include/stonith/st_ttylock.h +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #ifndef __STONITH_ST_TTYLOCK_H +diff --git a/include/stonith/stonith.h b/include/stonith/stonith.h +index 93fbaacb..e3e82fad 100644 +--- a/include/stonith/stonith.h ++++ b/include/stonith/stonith.h +@@ -35,8 +35,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/include/stonith/stonith_plugin.h b/include/stonith/stonith_plugin.h +index 9091a6e1..2b9b6ad9 100644 +--- a/include/stonith/stonith_plugin.h ++++ b/include/stonith/stonith_plugin.h +@@ -33,8 +33,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 5047e1d7..b9e9ddcd 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -12,8 +12,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + + MAINTAINERCLEANFILES = Makefile.in +diff --git a/lib/clplumbing/GSource.c b/lib/clplumbing/GSource.c +index 48bb1985..e8368278 100644 +--- a/lib/clplumbing/GSource.c ++++ b/lib/clplumbing/GSource.c +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/Makefile.am b/lib/clplumbing/Makefile.am +index 1b504fc7..de8e32d4 100644 +--- a/lib/clplumbing/Makefile.am ++++ b/lib/clplumbing/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/clplumbing/base64.c b/lib/clplumbing/base64.c +index c8ad3255..2d86fd4f 100644 +--- a/lib/clplumbing/base64.c ++++ b/lib/clplumbing/base64.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/base64_md5_test.c b/lib/clplumbing/base64_md5_test.c +index d536776f..969b7f39 100644 +--- a/lib/clplumbing/base64_md5_test.c ++++ b/lib/clplumbing/base64_md5_test.c +@@ -15,8 +15,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/cl_compress.c b/lib/clplumbing/cl_compress.c +index 6b56ad63..71cb75b0 100644 +--- a/lib/clplumbing/cl_compress.c ++++ b/lib/clplumbing/cl_compress.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + /* +diff --git a/lib/clplumbing/cl_log.c b/lib/clplumbing/cl_log.c +index 213e760c..1c8a4ce8 100644 +--- a/lib/clplumbing/cl_log.c ++++ b/lib/clplumbing/cl_log.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/cl_malloc.c b/lib/clplumbing/cl_malloc.c +index ca6dc0b3..404e2ab6 100644 +--- a/lib/clplumbing/cl_malloc.c ++++ b/lib/clplumbing/cl_malloc.c +@@ -13,8 +13,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #define HA_MALLOC_ORIGINAL +diff --git a/lib/clplumbing/cl_misc.c b/lib/clplumbing/cl_misc.c +index be6441d6..fef4fa2e 100644 +--- a/lib/clplumbing/cl_misc.c ++++ b/lib/clplumbing/cl_misc.c +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + +diff --git a/lib/clplumbing/cl_msg.c b/lib/clplumbing/cl_msg.c +index 22f00e3f..c6705d3d 100644 +--- a/lib/clplumbing/cl_msg.c ++++ b/lib/clplumbing/cl_msg.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/cl_msg_types.c b/lib/clplumbing/cl_msg_types.c +index 56cf56a2..8505e312 100644 +--- a/lib/clplumbing/cl_msg_types.c ++++ b/lib/clplumbing/cl_msg_types.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/cl_netstring.c b/lib/clplumbing/cl_netstring.c +index f4040e05..f5439fe8 100644 +--- a/lib/clplumbing/cl_netstring.c ++++ b/lib/clplumbing/cl_netstring.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/cl_pidfile.c b/lib/clplumbing/cl_pidfile.c +index ae2f503d..78d11291 100644 +--- a/lib/clplumbing/cl_pidfile.c ++++ b/lib/clplumbing/cl_pidfile.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/cl_plugin.c b/lib/clplumbing/cl_plugin.c +index c039a353..f9a9501a 100644 +--- a/lib/clplumbing/cl_plugin.c ++++ b/lib/clplumbing/cl_plugin.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + #include + #include +diff --git a/lib/clplumbing/cl_poll.c b/lib/clplumbing/cl_poll.c +index 789eb1af..98e58b69 100644 +--- a/lib/clplumbing/cl_poll.c ++++ b/lib/clplumbing/cl_poll.c +@@ -38,8 +38,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + **************************************************************************/ + +diff --git a/lib/clplumbing/cl_random.c b/lib/clplumbing/cl_random.c +index 4bafcfe1..c59e7038 100644 +--- a/lib/clplumbing/cl_random.c ++++ b/lib/clplumbing/cl_random.c +@@ -13,8 +13,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + +diff --git a/lib/clplumbing/cl_signal.c b/lib/clplumbing/cl_signal.c +index feedb3de..b8464c6d 100644 +--- a/lib/clplumbing/cl_signal.c ++++ b/lib/clplumbing/cl_signal.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/cl_syslog.c b/lib/clplumbing/cl_syslog.c +index 6920bd5d..f85724de 100644 +--- a/lib/clplumbing/cl_syslog.c ++++ b/lib/clplumbing/cl_syslog.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/cl_uuid.c b/lib/clplumbing/cl_uuid.c +index d0dfcb6c..df1dfbee 100644 +--- a/lib/clplumbing/cl_uuid.c ++++ b/lib/clplumbing/cl_uuid.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/coredumps.c b/lib/clplumbing/coredumps.c +index 79da7372..145b517f 100644 +--- a/lib/clplumbing/coredumps.c ++++ b/lib/clplumbing/coredumps.c +@@ -18,8 +18,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/cpulimits.c b/lib/clplumbing/cpulimits.c +index 4c03f236..bf19df34 100644 +--- a/lib/clplumbing/cpulimits.c ++++ b/lib/clplumbing/cpulimits.c +@@ -18,8 +18,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + ************************************************************************** + * +diff --git a/lib/clplumbing/ipcsocket.c b/lib/clplumbing/ipcsocket.c +index 14c35043..af7eab0a 100644 +--- a/lib/clplumbing/ipcsocket.c ++++ b/lib/clplumbing/ipcsocket.c +@@ -18,8 +18,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/ipctest.c b/lib/clplumbing/ipctest.c +index 333d3a02..884ed4f1 100644 +--- a/lib/clplumbing/ipctest.c ++++ b/lib/clplumbing/ipctest.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #undef _GNU_SOURCE /* in case it was defined on the command line */ +diff --git a/lib/clplumbing/ipctransient.h b/lib/clplumbing/ipctransient.h +index 9c1746ce..0c90fbbf 100644 +--- a/lib/clplumbing/ipctransient.h ++++ b/lib/clplumbing/ipctransient.h +@@ -12,8 +12,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + #undef _GNU_SOURCE /* in case it was defined on the command line */ + #define _GNU_SOURCE +diff --git a/lib/clplumbing/ipctransientclient.c b/lib/clplumbing/ipctransientclient.c +index 080acf22..f169573b 100644 +--- a/lib/clplumbing/ipctransientclient.c ++++ b/lib/clplumbing/ipctransientclient.c +@@ -12,8 +12,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/ipctransientlib.c b/lib/clplumbing/ipctransientlib.c +index 7a6721e3..bdd5c28b 100644 +--- a/lib/clplumbing/ipctransientlib.c ++++ b/lib/clplumbing/ipctransientlib.c +@@ -12,8 +12,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/ipctransientserver.c b/lib/clplumbing/ipctransientserver.c +index d7ee61d3..58440b07 100644 +--- a/lib/clplumbing/ipctransientserver.c ++++ b/lib/clplumbing/ipctransientserver.c +@@ -12,8 +12,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/longclock.c b/lib/clplumbing/longclock.c +index 594c9c5e..8ac3577c 100644 +--- a/lib/clplumbing/longclock.c ++++ b/lib/clplumbing/longclock.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/mkstemp_mode.c b/lib/clplumbing/mkstemp_mode.c +index 69c080b6..97721e96 100644 +--- a/lib/clplumbing/mkstemp_mode.c ++++ b/lib/clplumbing/mkstemp_mode.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/netstring_test.c b/lib/clplumbing/netstring_test.c +index 1f498ec3..63d46e4f 100644 +--- a/lib/clplumbing/netstring_test.c ++++ b/lib/clplumbing/netstring_test.c +@@ -14,8 +14,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/ocf_ipc.c b/lib/clplumbing/ocf_ipc.c +index c243934c..e5aa00b0 100644 +--- a/lib/clplumbing/ocf_ipc.c ++++ b/lib/clplumbing/ocf_ipc.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/lib/clplumbing/proctrack.c b/lib/clplumbing/proctrack.c +index f6a9df26..a27d5236 100644 +--- a/lib/clplumbing/proctrack.c ++++ b/lib/clplumbing/proctrack.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/realtime.c b/lib/clplumbing/realtime.c +index 9271204e..5e9508b0 100644 +--- a/lib/clplumbing/realtime.c ++++ b/lib/clplumbing/realtime.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/replytrack.c b/lib/clplumbing/replytrack.c +index 8c7c38ee..595f44f0 100644 +--- a/lib/clplumbing/replytrack.c ++++ b/lib/clplumbing/replytrack.c +@@ -24,8 +24,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/clplumbing/setproctitle.c b/lib/clplumbing/setproctitle.c +index ffc54812..ce292d88 100644 +--- a/lib/clplumbing/setproctitle.c ++++ b/lib/clplumbing/setproctitle.c +@@ -24,8 +24,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program; if not, see . + */ + + /* +@@ -44,8 +43,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program; if not, see . + * + * As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Dihu + * and other respective copyright holders give permission to link this program +diff --git a/lib/clplumbing/timers.c b/lib/clplumbing/timers.c +index c3e99da4..05ac0d8f 100644 +--- a/lib/clplumbing/timers.c ++++ b/lib/clplumbing/timers.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/clplumbing/transient-test.sh b/lib/clplumbing/transient-test.sh +index 7da88bfb..981f530a 100755 +--- a/lib/clplumbing/transient-test.sh ++++ b/lib/clplumbing/transient-test.sh +@@ -11,8 +11,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++# along with this program; if not, see + # + # + ####FIXME +diff --git a/lib/clplumbing/uids.c b/lib/clplumbing/uids.c +index 0727e1d1..cc7b2338 100644 +--- a/lib/clplumbing/uids.c ++++ b/lib/clplumbing/uids.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/lrm/Makefile.am b/lib/lrm/Makefile.am +index 815f92f9..ec77fc05 100644 +--- a/lib/lrm/Makefile.am ++++ b/lib/lrm/Makefile.am +@@ -13,8 +13,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/lrm/clientlib.c b/lib/lrm/clientlib.c +index 78dcdc86..a2567e69 100644 +--- a/lib/lrm/clientlib.c ++++ b/lib/lrm/clientlib.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/lib/lrm/lrm_msg.c b/lib/lrm/lrm_msg.c +index fdd3b3ff..458447d1 100644 +--- a/lib/lrm/lrm_msg.c ++++ b/lib/lrm/lrm_msg.c +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/lrm/racommon.c b/lib/lrm/racommon.c +index 2670f05c..e9c63358 100644 +--- a/lib/lrm/racommon.c ++++ b/lib/lrm/racommon.c +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * File: racommon.c + * Author: Sun Jiang Dong +diff --git a/lib/pils/Makefile.am b/lib/pils/Makefile.am +index d47c6c7e..10880c65 100644 +--- a/lib/pils/Makefile.am ++++ b/lib/pils/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/pils/main.c b/lib/pils/main.c +index 32faceb9..037cb2ec 100644 +--- a/lib/pils/main.c ++++ b/lib/pils/main.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/lib/pils/pils.c b/lib/pils/pils.c +index 4243b22e..5d08c8a6 100644 +--- a/lib/pils/pils.c ++++ b/lib/pils/pils.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/lib/pils/test.c b/lib/pils/test.c +index c2cdb26e..e4188f34 100644 +--- a/lib/pils/test.c ++++ b/lib/pils/test.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + /* +diff --git a/lib/plugins/InterfaceMgr/HBauth.c b/lib/plugins/InterfaceMgr/HBauth.c +index eae22cf2..d6dc9c35 100644 +--- a/lib/plugins/InterfaceMgr/HBauth.c ++++ b/lib/plugins/InterfaceMgr/HBauth.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + */ +diff --git a/lib/plugins/InterfaceMgr/Makefile.am b/lib/plugins/InterfaceMgr/Makefile.am +index 86b88d1b..c93d88a7 100644 +--- a/lib/plugins/InterfaceMgr/Makefile.am ++++ b/lib/plugins/InterfaceMgr/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/plugins/InterfaceMgr/generic.c b/lib/plugins/InterfaceMgr/generic.c +index 6ddad3b0..430e9db8 100644 +--- a/lib/plugins/InterfaceMgr/generic.c ++++ b/lib/plugins/InterfaceMgr/generic.c +@@ -40,8 +40,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/Makefile.am b/lib/plugins/Makefile.am +index 21827cdb..922aaead 100644 +--- a/lib/plugins/Makefile.am ++++ b/lib/plugins/Makefile.am +@@ -12,8 +12,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + + MAINTAINERCLEANFILES = Makefile.in +diff --git a/lib/plugins/compress/Makefile.am b/lib/plugins/compress/Makefile.am +index 3a3193a8..546384ea 100644 +--- a/lib/plugins/compress/Makefile.am ++++ b/lib/plugins/compress/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/plugins/compress/bz2.c b/lib/plugins/compress/bz2.c +index 2eab1164..07f37602 100644 +--- a/lib/plugins/compress/bz2.c ++++ b/lib/plugins/compress/bz2.c +@@ -20,8 +20,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/compress/zlib.c b/lib/plugins/compress/zlib.c +index 59589667..a907e6b4 100644 +--- a/lib/plugins/compress/zlib.c ++++ b/lib/plugins/compress/zlib.c +@@ -20,8 +20,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/lrm/Makefile.am b/lib/plugins/lrm/Makefile.am +index fd24579e..b6d377e0 100644 +--- a/lib/plugins/lrm/Makefile.am ++++ b/lib/plugins/lrm/Makefile.am +@@ -13,8 +13,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + if UPSTART +diff --git a/lib/plugins/lrm/raexechb.c b/lib/plugins/lrm/raexechb.c +index f9f1eb9b..ac22c6c2 100644 +--- a/lib/plugins/lrm/raexechb.c ++++ b/lib/plugins/lrm/raexechb.c +@@ -10,8 +10,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * File: raexechb.c + * Author: Sun Jiang Dong +diff --git a/lib/plugins/lrm/raexeclsb.c b/lib/plugins/lrm/raexeclsb.c +index 46d75465..370e5d30 100644 +--- a/lib/plugins/lrm/raexeclsb.c ++++ b/lib/plugins/lrm/raexeclsb.c +@@ -10,8 +10,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * File: raexeclsb.c + * Author: Sun Jiang Dong +diff --git a/lib/plugins/lrm/raexecocf.c b/lib/plugins/lrm/raexecocf.c +index f7cd7ed3..0e06d304 100644 +--- a/lib/plugins/lrm/raexecocf.c ++++ b/lib/plugins/lrm/raexecocf.c +@@ -10,8 +10,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * File: raexecocf.c + * Author: Sun Jiang Dong +diff --git a/lib/plugins/lrm/raexecupstart.c b/lib/plugins/lrm/raexecupstart.c +index baa02786..e38af205 100644 +--- a/lib/plugins/lrm/raexecupstart.c ++++ b/lib/plugins/lrm/raexecupstart.c +@@ -10,8 +10,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * File: raexecupstart.c + * Copyright (C) 2010 Senko Rasic +diff --git a/lib/plugins/lrm/upstart-dbus.c b/lib/plugins/lrm/upstart-dbus.c +index b994d87b..8c79726c 100644 +--- a/lib/plugins/lrm/upstart-dbus.c ++++ b/lib/plugins/lrm/upstart-dbus.c +@@ -10,8 +10,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * File: upstart-dbus.c + * Copyright (C) 2010 Senko Rasic +diff --git a/lib/plugins/lrm/upstart-dbus.h b/lib/plugins/lrm/upstart-dbus.h +index bc72c958..91d16729 100644 +--- a/lib/plugins/lrm/upstart-dbus.h ++++ b/lib/plugins/lrm/upstart-dbus.h +@@ -10,8 +10,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * File: upstart-dbus.c + * Copyright (C) 2010 Senko Rasic +diff --git a/lib/plugins/stonith/Makefile.am b/lib/plugins/stonith/Makefile.am +index 01f2f4a5..fc007f21 100644 +--- a/lib/plugins/stonith/Makefile.am ++++ b/lib/plugins/stonith/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/plugins/stonith/apcmaster.c b/lib/plugins/stonith/apcmaster.c +index 09a56d33..945ef42a 100644 +--- a/lib/plugins/stonith/apcmaster.c ++++ b/lib/plugins/stonith/apcmaster.c +@@ -25,8 +25,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/apcmastersnmp.c b/lib/plugins/stonith/apcmastersnmp.c +index a9eeaebd..4411e1c5 100644 +--- a/lib/plugins/stonith/apcmastersnmp.c ++++ b/lib/plugins/stonith/apcmastersnmp.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/apcsmart.c b/lib/plugins/stonith/apcsmart.c +index 18d16124..56146d53 100644 +--- a/lib/plugins/stonith/apcsmart.c ++++ b/lib/plugins/stonith/apcsmart.c +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * Original version of this UPS code was taken from: + * 'Network UPS Tools' by Russell Kroll +diff --git a/lib/plugins/stonith/baytech.c b/lib/plugins/stonith/baytech.c +index 33093add..15d97cdd 100644 +--- a/lib/plugins/stonith/baytech.c ++++ b/lib/plugins/stonith/baytech.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/bladehpi.c b/lib/plugins/stonith/bladehpi.c +index ae9a4cfc..2fd12eca 100644 +--- a/lib/plugins/stonith/bladehpi.c ++++ b/lib/plugins/stonith/bladehpi.c +@@ -17,8 +17,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/cyclades.c b/lib/plugins/stonith/cyclades.c +index 6744cd46..77394a10 100644 +--- a/lib/plugins/stonith/cyclades.c ++++ b/lib/plugins/stonith/cyclades.c +@@ -21,8 +21,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/drac3.c b/lib/plugins/stonith/drac3.c +index 95be7750..93e4d66a 100644 +--- a/lib/plugins/stonith/drac3.c ++++ b/lib/plugins/stonith/drac3.c +@@ -19,8 +19,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/drac3_command.c b/lib/plugins/stonith/drac3_command.c +index 4d9002db..fc6e95d9 100644 +--- a/lib/plugins/stonith/drac3_command.c ++++ b/lib/plugins/stonith/drac3_command.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/drac3_command.h b/lib/plugins/stonith/drac3_command.h +index cd03e15d..a51bec49 100644 +--- a/lib/plugins/stonith/drac3_command.h ++++ b/lib/plugins/stonith/drac3_command.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/drac3_hash.c b/lib/plugins/stonith/drac3_hash.c +index 605a1266..614081bc 100644 +--- a/lib/plugins/stonith/drac3_hash.c ++++ b/lib/plugins/stonith/drac3_hash.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/drac3_hash.h b/lib/plugins/stonith/drac3_hash.h +index fab2f582..c3ae3248 100644 +--- a/lib/plugins/stonith/drac3_hash.h ++++ b/lib/plugins/stonith/drac3_hash.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/external.c b/lib/plugins/stonith/external.c +index da036656..2b36b828 100644 +--- a/lib/plugins/stonith/external.c ++++ b/lib/plugins/stonith/external.c +@@ -25,8 +25,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/external/Makefile.am b/lib/plugins/stonith/external/Makefile.am +index d1411c48..3a209817 100644 +--- a/lib/plugins/stonith/external/Makefile.am ++++ b/lib/plugins/stonith/external/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/plugins/stonith/external/dracmc-telnet b/lib/plugins/stonith/external/dracmc-telnet +index d9939612..78c01453 100644 +--- a/lib/plugins/stonith/external/dracmc-telnet ++++ b/lib/plugins/stonith/external/dracmc-telnet +@@ -43,8 +43,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + ####################################################################### + import sys +diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2 +index f5de2818..b3a15f98 100755 +--- a/lib/plugins/stonith/external/ec2 ++++ b/lib/plugins/stonith/external/ec2 +@@ -41,8 +41,7 @@ If the tag containing the uname is not [Name], then it will need to be specified + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + ####################################################################### + +diff --git a/lib/plugins/stonith/external/hetzner b/lib/plugins/stonith/external/hetzner +index 2b3e6756..2f6361a1 100755 +--- a/lib/plugins/stonith/external/hetzner ++++ b/lib/plugins/stonith/external/hetzner +@@ -20,8 +20,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + # Read parameters from config file, format is based upon the hetzner OCF resource agent +diff --git a/lib/plugins/stonith/external/hmchttp b/lib/plugins/stonith/external/hmchttp +index 9d111bc3..0e125dca 100644 +--- a/lib/plugins/stonith/external/hmchttp ++++ b/lib/plugins/stonith/external/hmchttp +@@ -19,8 +19,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + #set -x +diff --git a/lib/plugins/stonith/external/ibmrsa-telnet b/lib/plugins/stonith/external/ibmrsa-telnet +index 4d75d9a9..adb2a3eb 100644 +--- a/lib/plugins/stonith/external/ibmrsa-telnet ++++ b/lib/plugins/stonith/external/ibmrsa-telnet +@@ -44,8 +44,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + ####################################################################### + import sys +diff --git a/lib/plugins/stonith/external/ipmi b/lib/plugins/stonith/external/ipmi +index abadd5a0..1000a442 100644 +--- a/lib/plugins/stonith/external/ipmi ++++ b/lib/plugins/stonith/external/ipmi +@@ -23,8 +23,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# along with this program; if not, see . + # + + # Initialization -- fix locale settings so we can parse output from +diff --git a/lib/plugins/stonith/external/ippower9258.in b/lib/plugins/stonith/external/ippower9258.in +index 6ae7e023..4b5fbe79 100755 +--- a/lib/plugins/stonith/external/ippower9258.in ++++ b/lib/plugins/stonith/external/ippower9258.in +@@ -20,8 +20,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + # +diff --git a/lib/plugins/stonith/external/kdumpcheck.in b/lib/plugins/stonith/external/kdumpcheck.in +index 7f3f7529..a53f925f 100644 +--- a/lib/plugins/stonith/external/kdumpcheck.in ++++ b/lib/plugins/stonith/external/kdumpcheck.in +@@ -20,8 +20,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + SSH_COMMAND="@SSH@ -q -x -o PasswordAuthentication=no -o StrictHostKeyChecking=no -n" +diff --git a/lib/plugins/stonith/external/libvirt b/lib/plugins/stonith/external/libvirt +index f0380a02..540a72ea 100644 +--- a/lib/plugins/stonith/external/libvirt ++++ b/lib/plugins/stonith/external/libvirt +@@ -21,8 +21,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++# along with this program; if not, see . + # + + # start a domain +diff --git a/lib/plugins/stonith/external/rackpdu b/lib/plugins/stonith/external/rackpdu +index 7d0e20b8..e430e785 100644 +--- a/lib/plugins/stonith/external/rackpdu ++++ b/lib/plugins/stonith/external/rackpdu +@@ -24,8 +24,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + SWITCH_ON="1" +diff --git a/lib/plugins/stonith/external/riloe b/lib/plugins/stonith/external/riloe +index ce988476..412873f5 100644 +--- a/lib/plugins/stonith/external/riloe ++++ b/lib/plugins/stonith/external/riloe +@@ -28,8 +28,7 @@ + # Lesser General Public License for more details. + # + # You should have received a copy of the GNU Lesser General Public +-# License along with this library; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# License along with this library; if not, see + # + import sys + import os +diff --git a/lib/plugins/stonith/external/ssh.in b/lib/plugins/stonith/external/ssh.in +index 2a8eb73f..1f8926cc 100644 +--- a/lib/plugins/stonith/external/ssh.in ++++ b/lib/plugins/stonith/external/ssh.in +@@ -20,8 +20,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + SSH_COMMAND="@SSH@ -q -x -o PasswordAuthentication=no -o StrictHostKeyChecking=no -n -l root" +diff --git a/lib/plugins/stonith/external/vmware b/lib/plugins/stonith/external/vmware +index 55966baf..717b6698 100644 +--- a/lib/plugins/stonith/external/vmware ++++ b/lib/plugins/stonith/external/vmware +@@ -19,8 +19,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + sub supply_default +diff --git a/lib/plugins/stonith/ibmhmc.c b/lib/plugins/stonith/ibmhmc.c +index d33fea91..5e185364 100644 +--- a/lib/plugins/stonith/ibmhmc.c ++++ b/lib/plugins/stonith/ibmhmc.c +@@ -17,8 +17,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/ipmi_os_handler.c b/lib/plugins/stonith/ipmi_os_handler.c +index bdb6d6ed..f9534e58 100644 +--- a/lib/plugins/stonith/ipmi_os_handler.c ++++ b/lib/plugins/stonith/ipmi_os_handler.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/plugins/stonith/ipmilan.c b/lib/plugins/stonith/ipmilan.c +index 1efdfee8..138f1547 100644 +--- a/lib/plugins/stonith/ipmilan.c ++++ b/lib/plugins/stonith/ipmilan.c +@@ -18,8 +18,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/ipmilan.h b/lib/plugins/stonith/ipmilan.h +index fb548f09..804f5686 100644 +--- a/lib/plugins/stonith/ipmilan.h ++++ b/lib/plugins/stonith/ipmilan.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/ipmilan_command.c b/lib/plugins/stonith/ipmilan_command.c +index a3de4937..c763d217 100644 +--- a/lib/plugins/stonith/ipmilan_command.c ++++ b/lib/plugins/stonith/ipmilan_command.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + #include + +diff --git a/lib/plugins/stonith/ipmilan_test.c b/lib/plugins/stonith/ipmilan_test.c +index 47859a0a..93d44a4b 100644 +--- a/lib/plugins/stonith/ipmilan_test.c ++++ b/lib/plugins/stonith/ipmilan_test.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/meatware.c b/lib/plugins/stonith/meatware.c +index 029ba355..0700f142 100644 +--- a/lib/plugins/stonith/meatware.c ++++ b/lib/plugins/stonith/meatware.c +@@ -21,8 +21,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/null.c b/lib/plugins/stonith/null.c +index 0d0cf049..16981714 100644 +--- a/lib/plugins/stonith/null.c ++++ b/lib/plugins/stonith/null.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/nw_rpc100s.c b/lib/plugins/stonith/nw_rpc100s.c +index 5ba0827d..e278ae0a 100644 +--- a/lib/plugins/stonith/nw_rpc100s.c ++++ b/lib/plugins/stonith/nw_rpc100s.c +@@ -21,8 +21,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/rcd_serial.c b/lib/plugins/stonith/rcd_serial.c +index f1396a7e..f1e82f5f 100644 +--- a/lib/plugins/stonith/rcd_serial.c ++++ b/lib/plugins/stonith/rcd_serial.c +@@ -27,8 +27,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/rhcs.c b/lib/plugins/stonith/rhcs.c +index 293a0818..3fc9b14d 100644 +--- a/lib/plugins/stonith/rhcs.c ++++ b/lib/plugins/stonith/rhcs.c +@@ -26,8 +26,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/ribcl.py.in b/lib/plugins/stonith/ribcl.py.in +index 14e070c7..0733bb24 100644 +--- a/lib/plugins/stonith/ribcl.py.in ++++ b/lib/plugins/stonith/ribcl.py.in +@@ -13,8 +13,7 @@ + # Lesser General Public License for more details. + # + # You should have received a copy of the GNU Lesser General Public +-# License along with this library; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# License along with this library; if not, see + # + + import sys +diff --git a/lib/plugins/stonith/riloe.c b/lib/plugins/stonith/riloe.c +index a4a83124..50583428 100644 +--- a/lib/plugins/stonith/riloe.c ++++ b/lib/plugins/stonith/riloe.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/rps10.c b/lib/plugins/stonith/rps10.c +index 08d98730..0e047ca3 100644 +--- a/lib/plugins/stonith/rps10.c ++++ b/lib/plugins/stonith/rps10.c +@@ -21,8 +21,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/ssh.c b/lib/plugins/stonith/ssh.c +index e90c1995..40b42348 100644 +--- a/lib/plugins/stonith/ssh.c ++++ b/lib/plugins/stonith/ssh.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/stonith_config_xml.h b/lib/plugins/stonith/stonith_config_xml.h +index ff04ae90..b413e883 100644 +--- a/lib/plugins/stonith/stonith_config_xml.h ++++ b/lib/plugins/stonith/stonith_config_xml.h +@@ -18,8 +18,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #ifndef _STONITH_CONFIG_XML_H +diff --git a/lib/plugins/stonith/stonith_expect_helpers.h b/lib/plugins/stonith/stonith_expect_helpers.h +index f9eaa192..b318cc94 100644 +--- a/lib/plugins/stonith/stonith_expect_helpers.h ++++ b/lib/plugins/stonith/stonith_expect_helpers.h +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/stonith_plugin_common.h b/lib/plugins/stonith/stonith_plugin_common.h +index dcdd7c83..7c7f4e01 100644 +--- a/lib/plugins/stonith/stonith_plugin_common.h ++++ b/lib/plugins/stonith/stonith_plugin_common.h +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #ifndef _STONITH_PLUGIN_COMMON_H +diff --git a/lib/plugins/stonith/stonith_signal.h b/lib/plugins/stonith/stonith_signal.h +index 99513f58..ae07dea6 100644 +--- a/lib/plugins/stonith/stonith_signal.h ++++ b/lib/plugins/stonith/stonith_signal.h +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #ifndef _STONITH_SIGNAL_H +diff --git a/lib/plugins/stonith/suicide.c b/lib/plugins/stonith/suicide.c +index b9d1db48..8e55bc3a 100644 +--- a/lib/plugins/stonith/suicide.c ++++ b/lib/plugins/stonith/suicide.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/plugins/stonith/vacm.c b/lib/plugins/stonith/vacm.c +index ce6d0416..85de8966 100644 +--- a/lib/plugins/stonith/vacm.c ++++ b/lib/plugins/stonith/vacm.c +@@ -42,8 +42,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #define DEVICE "VA Linux Cluster Manager" +diff --git a/lib/plugins/stonith/wti_mpc.c b/lib/plugins/stonith/wti_mpc.c +index 548f91c5..d04287c1 100644 +--- a/lib/plugins/stonith/wti_mpc.c ++++ b/lib/plugins/stonith/wti_mpc.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/plugins/stonith/wti_nps.c b/lib/plugins/stonith/wti_nps.c +index f0b81f72..a6553885 100644 +--- a/lib/plugins/stonith/wti_nps.c ++++ b/lib/plugins/stonith/wti_nps.c +@@ -37,8 +37,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/stonith/Makefile.am b/lib/stonith/Makefile.am +index 429e1d36..a063c460 100644 +--- a/lib/stonith/Makefile.am ++++ b/lib/stonith/Makefile.am +@@ -14,8 +14,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lib/stonith/expect.c b/lib/stonith/expect.c +index bb1f818f..fe0d5170 100644 +--- a/lib/stonith/expect.c ++++ b/lib/stonith/expect.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/stonith/ha_log.sh b/lib/stonith/ha_log.sh +index 73093f02..81a6648f 100755 +--- a/lib/stonith/ha_log.sh ++++ b/lib/stonith/ha_log.sh +@@ -19,8 +19,7 @@ + # Lesser General Public License for more details. + # + # You should have received a copy of the GNU Lesser General Public +-# License along with this library; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# License along with this library; if not, see + # + + # Build version: @GLUE_BUILD_VERSION@ +diff --git a/lib/stonith/main.c b/lib/stonith/main.c +index 44e099f9..d49e7bdb 100644 +--- a/lib/stonith/main.c ++++ b/lib/stonith/main.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/stonith/meatclient.c b/lib/stonith/meatclient.c +index e95dc0ea..fff88cc0 100644 +--- a/lib/stonith/meatclient.c ++++ b/lib/stonith/meatclient.c +@@ -18,8 +18,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lib/stonith/st_ttylock.c b/lib/stonith/st_ttylock.c +index adc918df..6f4d7d0a 100644 +--- a/lib/stonith/st_ttylock.c ++++ b/lib/stonith/st_ttylock.c +@@ -10,8 +10,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lib/stonith/stonith.c b/lib/stonith/stonith.c +index 4ced8c75..11f38609 100644 +--- a/lib/stonith/stonith.c ++++ b/lib/stonith/stonith.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/logd/Makefile.am b/logd/Makefile.am +index 7ac75e28..1f69d09c 100644 +--- a/logd/Makefile.am ++++ b/logd/Makefile.am +@@ -15,8 +15,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/logd/ha_logd.c b/logd/ha_logd.c +index 5f1f66e6..7f345b89 100644 +--- a/logd/ha_logd.c ++++ b/logd/ha_logd.c +@@ -14,8 +14,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * along with this program; if not, see + * + */ + #include +diff --git a/logd/ha_logger.c b/logd/ha_logger.c +index 5e2f9ef4..937a81f2 100644 +--- a/logd/ha_logger.c ++++ b/logd/ha_logger.c +@@ -14,8 +14,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * along with this program; if not, see + * + */ + #include +diff --git a/logd/logtest.c b/logd/logtest.c +index 11e4014c..124e0b96 100644 +--- a/logd/logtest.c ++++ b/logd/logtest.c +@@ -14,8 +14,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * along with this program; if not, see + * + */ + #include +diff --git a/lrm/Makefile.am b/lrm/Makefile.am +index 78a92c45..c9a6b57e 100644 +--- a/lrm/Makefile.am ++++ b/lrm/Makefile.am +@@ -12,8 +12,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lrm/admin/Makefile.am b/lrm/admin/Makefile.am +index a92cd72b..4032f181 100644 +--- a/lrm/admin/Makefile.am ++++ b/lrm/admin/Makefile.am +@@ -13,8 +13,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lrm/admin/cibsecret.in b/lrm/admin/cibsecret.in +index 5255cdd8..166be087 100755 +--- a/lrm/admin/cibsecret.in ++++ b/lrm/admin/cibsecret.in +@@ -13,8 +13,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +-# License along with this library; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# License along with this library; if not, see + # + + # WARNING: +diff --git a/lrm/admin/lrmadmin.c b/lrm/admin/lrmadmin.c +index 27f37bfa..b51f287c 100644 +--- a/lrm/admin/lrmadmin.c ++++ b/lrm/admin/lrmadmin.c +@@ -17,8 +17,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + #include + +diff --git a/lrm/lrmd/Makefile.am b/lrm/lrmd/Makefile.am +index 36809284..da09ae7d 100644 +--- a/lrm/lrmd/Makefile.am ++++ b/lrm/lrmd/Makefile.am +@@ -13,8 +13,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lrm/lrmd/audit.c b/lrm/lrmd/audit.c +index ec92dad7..cdee1f0e 100644 +--- a/lrm/lrmd/audit.c ++++ b/lrm/lrmd/audit.c +@@ -15,8 +15,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lrm/lrmd/cib_secrets.c b/lrm/lrmd/cib_secrets.c +index 612ffdb4..236c69ae 100644 +--- a/lrm/lrmd/cib_secrets.c ++++ b/lrm/lrmd/cib_secrets.c +@@ -15,8 +15,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lrm/lrmd/lrmd.c b/lrm/lrmd/lrmd.c +index 385096b1..1e6c40f3 100644 +--- a/lrm/lrmd/lrmd.c ++++ b/lrm/lrmd/lrmd.c +@@ -16,8 +16,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + + #include +diff --git a/lrm/test/LRMBasicSanityCheck.in b/lrm/test/LRMBasicSanityCheck.in +index dbe85484..801b295d 100755 +--- a/lrm/test/LRMBasicSanityCheck.in ++++ b/lrm/test/LRMBasicSanityCheck.in +@@ -14,8 +14,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +- # License along with this library; if not, write to the Free Software +- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ # License along with this library; if not, see + # + HBLIB=@libdir@/heartbeat + LRMD=$HBLIB/lrmd +diff --git a/lrm/test/Makefile.am b/lrm/test/Makefile.am +index 84f66573..544bb18c 100644 +--- a/lrm/test/Makefile.am ++++ b/lrm/test/Makefile.am +@@ -13,8 +13,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/lrm/test/apitest.c b/lrm/test/apitest.c +index 0d4c5720..7295870a 100644 +--- a/lrm/test/apitest.c ++++ b/lrm/test/apitest.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/lrm/test/callbacktest.c b/lrm/test/callbacktest.c +index 48f4d491..bdc8ae87 100644 +--- a/lrm/test/callbacktest.c ++++ b/lrm/test/callbacktest.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/lrm/test/evaltest.sh b/lrm/test/evaltest.sh +index f3691022..93ae4835 100755 +--- a/lrm/test/evaltest.sh ++++ b/lrm/test/evaltest.sh +@@ -13,8 +13,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +- # License along with this library; if not, write to the Free Software +- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ # License along with this library; if not, see + # + + : ${TESTDIR:=testcases} +diff --git a/lrm/test/lrmregtest.in b/lrm/test/lrmregtest.in +index 001a6620..2f80d239 100644 +--- a/lrm/test/lrmregtest.in ++++ b/lrm/test/lrmregtest.in +@@ -28,8 +28,7 @@ + # other software, or any other product whatsoever. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write the Free Software Foundation, +-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# along with this program; if not, see . + # + + ####################################################################### +diff --git a/lrm/test/plugintest.c b/lrm/test/plugintest.c +index d25c46dc..e9efa614 100644 +--- a/lrm/test/plugintest.c ++++ b/lrm/test/plugintest.c +@@ -17,8 +17,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + */ + #include + #include +diff --git a/lrm/test/regression.sh.in b/lrm/test/regression.sh.in +index 550321e8..edab02e6 100755 +--- a/lrm/test/regression.sh.in ++++ b/lrm/test/regression.sh.in +@@ -13,8 +13,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public +- # License along with this library; if not, write to the Free Software +- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ # License along with this library; if not, see + # + + OCF_ROOT=@OCF_ROOT_DIR@ +diff --git a/lrm/test/testcases/Makefile.am b/lrm/test/testcases/Makefile.am +index 49728d90..c6081920 100644 +--- a/lrm/test/testcases/Makefile.am ++++ b/lrm/test/testcases/Makefile.am +@@ -13,8 +13,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + MAINTAINERCLEANFILES = Makefile.in + +diff --git a/replace/Makefile.am b/replace/Makefile.am +index 52892ba3..a5004db1 100644 +--- a/replace/Makefile.am ++++ b/replace/Makefile.am +@@ -11,8 +11,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + + MAINTAINERCLEANFILES = Makefile.in +diff --git a/replace/NoSuchFunctionName.c b/replace/NoSuchFunctionName.c +index 373eabde..57928ca4 100644 +--- a/replace/NoSuchFunctionName.c ++++ b/replace/NoSuchFunctionName.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + void nosuchfunctionname(void); +diff --git a/replace/setenv.c b/replace/setenv.c +index e8cafb18..7a243f6d 100644 +--- a/replace/setenv.c ++++ b/replace/setenv.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/replace/strerror.c b/replace/strerror.c +index 477239f4..0061057a 100644 +--- a/replace/strerror.c ++++ b/replace/strerror.c +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + #include +diff --git a/replace/strlcat.c b/replace/strlcat.c +index 8b909f92..1f0d3f23 100644 +--- a/replace/strlcat.c ++++ b/replace/strlcat.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/replace/strlcpy.c b/replace/strlcpy.c +index 661d02ea..a6bae65f 100644 +--- a/replace/strlcpy.c ++++ b/replace/strlcpy.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/replace/strndup.c b/replace/strndup.c +index 43127439..a4d01ca2 100644 +--- a/replace/strndup.c ++++ b/replace/strndup.c +@@ -16,8 +16,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/replace/strnlen.c b/replace/strnlen.c +index 8b3bcd21..0bd10adc 100644 +--- a/replace/strnlen.c ++++ b/replace/strnlen.c +@@ -15,8 +15,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/replace/unsetenv.c b/replace/unsetenv.c +index aeb84a37..923ebb9c 100644 +--- a/replace/unsetenv.c ++++ b/replace/unsetenv.c +@@ -14,8 +14,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + */ + +diff --git a/replace/uuid_parse.c b/replace/uuid_parse.c +index beecac6c..11edba65 100644 +--- a/replace/uuid_parse.c ++++ b/replace/uuid_parse.c +@@ -12,8 +12,7 @@ + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * License along with this library; if not, see + * + * Original uuid implementation: copyright (C) Theodore Ts'o + * +-- +2.27.0 +