Merge cluster-glue from Debian unstable for noble

Bug #2040373 reported by Bryce Harrington
20
This bug affects 1 person
Affects Status Importance Assigned to Milestone
cluster-glue (Ubuntu)
Fix Released
Undecided
Athos Ribeiro

Bug Description

A merge of cluster-glue appears to be available presently.
Upstream: tbd
Debian: 1.0.12-22
Ubuntu: 1.0.12-21ubuntu2

If it turns out this needs a sync rather than a merge, please change the tag 'needs-merge' to 'needs-sync', and (optionally) update the title as desired.

### New Debian Changes ###

cluster-glue (1.0.12-22) unstable; urgency=medium

  [ Valentin Vidic ]
  * Drop lsb-base dependency
  * Update Standards-Version to 4.6.2
  * Update test to use /var/log/syslog
  * Update lintian-overrides

  [ Helmut Grohne ]
  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1052625)

 -- Valentin Vidic <email address hidden> Tue, 24 Oct 2023 20:23:52 +0200

cluster-glue (1.0.12-21) unstable; urgency=medium

  [ Lucas Kanashiro ]
  * d/t/logd: use journalctl to get logs if $LOG is not available

  [ Valentin Vidic ]
  * Update watch file url
  * Update build dependency on libltdl-dev (Closes: #1008889)
  * Add retries to logd autopkgtest
  * Update Standards-Version to 4.6.0
  * Update copyright file

 -- Valentin Vidic <email address hidden> Sun, 10 Apr 2022 16:17:14 +0200

cluster-glue (1.0.12-20) unstable; urgency=medium

  [ Helmut Grohne ]
  * Reduce Build-Depends (Closes: #979282)

  [ Ferenc Wágner ]
  * Update Standards-Version to 4.5.1 (no changes required)
  * Bump watch file format to 4
  * New patch: Current Pacemaker does not use ha_logd
  * Add Lintian override for the man page of the unusually placed ha_logd
  * New patch: Fix typo: bounary -> boundary
  * Drop override for tag not emitted since Lintian 2.92

 -- Ferenc Wágner <email address hidden> Wed, 20 Jan 2021 12:45:21 +0100

cluster-glue (1.0.12-19) unstable; urgency=medium

  * Fix failing logd autopkgtest
  * Disable logd startup by default
  * Use debhelper v13

 -- Valentin Vidic <email address hidden> Sat, 27 Jun 2020 12:59:36 +0200

cluster-glue (1.0.12-18) unstable; urgency=medium

  * The cibsecret man page symlink isn't useful
  * Add myself to Uploaders
  * Update packaging list email address
  * The dbgsym migration was completed in buster
  * Don't ship static or Libtool archives

 -- Ferenc Wágner <email address hidden> Sun, 21 Jun 2020 21:53:11 +0200

cluster-glue (1.0.12-17) unstable; urgency=medium

  * Drup upstart support to avoid using dbus-glib (Closes: #955882)

 -- Valentin Vidic <email address hidden> Sun, 05 Apr 2020 16:38:36 +0200

cluster-glue (1.0.12-16) unstable; urgency=medium

  * Enable Debian CI
  * Move /usr/sbin/cibsecret to /usr/lib/heartbeat/

 -- Valentin Vidic <email address hidden> Sun, 15 Mar 2020 20:51:29 +0100

cluster-glue (1.0.12-15) unstable; urgency=medium

  * Stop using xml2-config (Closes: #949087)
  * Update Standards-Version to 4.5.0

 -- Valentin Vidic <email address hidden> Sat, 15 Feb 2020 18:12:37 +0100

cluster-glue (1.0.12-14) unstable; urgency=medium

  * Try to fix flaky autopkgtest (Closes: #942334)
  * Use debhelper v12
  * Update Standards-Version to 4.4.1
  * Drop unused lintian override
  * Fix spelling error reported by lintian
  * Add Rules-Requires-Root: no
  * Add Pre-Depends for systemd
  * Add override for documentation outside of /usr/share/doc
  * Add override for spelling of EVERYTIME

 -- Valentin Vidic <email address hidden> Tue, 15 Oct 2019 19:22:27 +0200

cluster-glue (1.0.12-13) unstable; urgency=medium

  * Try to debug failing logd autopkgtest
  * Fix python3 scripts (Closes: #931114)
  * Update Standards-Version to 4.4.0
  * Move ha_logger manpage to section 8

### Old Ubuntu Delta ###

cluster-glue (1.0.12-21ubuntu2) lunar; urgency=medium

  * Rebuild to drop Python 3.10 extension

 -- Jeremy Bicha <email address hidden> 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 <email address hidden> Tue, 26 Jul 2022 12:08:53 -0300

Related branches

Bryce Harrington (bryce)
Changed in cluster-glue (Ubuntu):
milestone: none → ubuntu-23.11
Changed in cluster-glue (Ubuntu):
assignee: nobody → Athos Ribeiro (athos-ribeiro)
Changed in cluster-glue (Ubuntu):
milestone: ubuntu-23.11 → ubuntu-24.01
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

I am postponing this to January since there is nothing to merge yet.

Changed in cluster-glue (Ubuntu):
status: New → In Progress
status: In Progress → New
Changed in cluster-glue (Ubuntu):
status: New → In Progress
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

While performing this merge, I got the following lintian warnings:

W: cluster-glue source: patch-file-present-but-not-mentioned-in-series [debian/patches/ubuntu/lp1895355-433c6fbd-Medium-clplumbing-don-t-abort-on-bad-input.patch]
W: cluster-glue source: patch-file-present-but-not-mentioned-in-series [debian/patches/ubuntu/lp1895355-bc7b874f-fix-syslogmsgfmt-logging-inconsistency-for-stderr-st.patch]
W: cluster-glue source: patch-file-present-but-not-mentioned-in-series [debian/patches/ubuntu/lp1895355-eeacbaac-Low-ipc-fix-poll-function-parameter-type.patch]

These patches are all mentioned in the changelog as applied.

Going through the bug which originated these changes, I found the following comment stating that these patches are already present in the package: https://bugs.launchpad.net/ubuntu/+source/cluster-glue/+bug/1895355/comments/1

> the package already had:

> eeacbaac Low: ipc: fix poll function parameter type
> bc7b874f fix syslogmsgfmt logging inconsistency for stderr/stdout
> 433c6fbd Medium: clplumbing: don't abort on bad input

I then found:

debian/patches/ipc_param_type, which applies eeacbaac.

bc7b874f is already applied in the upstream tarball.
433c6fbd is already applied in the upstream tarball as well.

Therefore, in the last rebase in the merge process, I am removing those entries from the changelog and remobing the 3 related patch files from d/p/ubuntu. I am not adding a "New changes" entry with that information instead because there is nothing being introduced/removed from the binary package other than the (possibly misleading) changelog entries. The fixes removed from the changelog entry are well documented in the referenced LP bug for that changelog entry anyway.

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package cluster-glue - 1.0.12-22ubuntu1

---------------
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 <email address hidden> Tue, 02 Jan 2024 11:20:39 -0300

Changed in cluster-glue (Ubuntu):
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.