[Debian-ha-maintainers] Bug#1062337: heartbeat: NMU diff for 64-bit time_t transition

Wed Feb 28 08:28:10 GMT 2024

Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-15-generic (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru heartbeat-3.0.6/debian/changelog heartbeat-3.0.6/debian/changelog

--- heartbeat-3.0.6/debian/changelog	2023-12-21 16:32:05.000000000 +0000
+++ heartbeat-3.0.6/debian/changelog	2024-02-28 08:22:17.000000000 +0000
@@ -1,3 +1,10 @@
+heartbeat (1:3.0.6-14.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062337
+
+ -- Lukas M?rdian <slyon at debian.org>  Wed, 28 Feb 2024 08:22:17 +0000
+
 heartbeat (1:3.0.6-14) unstable; urgency=medium
 
   [ Helmut Grohne ]
diff -Nru heartbeat-3.0.6/debian/control heartbeat-3.0.6/debian/control
--- heartbeat-3.0.6/debian/control	2023-12-21 16:30:29.000000000 +0000
+++ heartbeat-3.0.6/debian/control	2024-02-28 08:22:17.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 Uploaders: Valentin Vidic <vvidic at debian.org>
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  autoconf,
  automake,
  bison,
@@ -96,7 +96,10 @@
  .
  This package contains Heartbeat-specific development files.
 
-Package: libheartbeat2
+Package: libheartbeat2t64
+Provides: ${t64:Provides}
+Replaces: libheartbeat2
+Breaks: libheartbeat2 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends:
@@ -117,7 +120,7 @@
 Section: libdevel
 Architecture: any
 Depends:
- libheartbeat2 (= ${binary:Version}),
+ libheartbeat2t64 (= ${binary:Version}),
  ${misc:Depends},
 Description: Subsystem for High-Availability Linux (development files)
  heartbeat is a messaging subsystem for high availability which implements
diff -Nru heartbeat-3.0.6/debian/libheartbeat2.install heartbeat-3.0.6/debian/libheartbeat2.install
--- heartbeat-3.0.6/debian/libheartbeat2.install	2017-08-26 15:11:48.000000000 +0000
+++ heartbeat-3.0.6/debian/libheartbeat2.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-usr/lib/libapphb.so.2
-usr/lib/libapphb.so.2.0.0
-usr/lib/libccmclient.so.1
-usr/lib/libccmclient.so.1.0.0
-usr/lib/libclm.so.1
-usr/lib/libclm.so.1.0.0
-usr/lib/libhbclient.so.1
-usr/lib/libhbclient.so.1.0.0
diff -Nru heartbeat-3.0.6/debian/libheartbeat2.lintian-overrides heartbeat-3.0.6/debian/libheartbeat2.lintian-overrides
--- heartbeat-3.0.6/debian/libheartbeat2.lintian-overrides	2017-08-26 15:11:48.000000000 +0000
+++ heartbeat-3.0.6/debian/libheartbeat2.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libheartbeat2 binary: package-name-doesnt-match-sonames
diff -Nru heartbeat-3.0.6/debian/libheartbeat2.symbols heartbeat-3.0.6/debian/libheartbeat2.symbols
--- heartbeat-3.0.6/debian/libheartbeat2.symbols	2018-12-09 13:35:32.000000000 +0000
+++ heartbeat-3.0.6/debian/libheartbeat2.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-libapphb.so.2 libheartbeat2 #MINVER#
-* Build-Depends-Package: libheartbeat2-dev
- apphb_hb at Base 1:3.0.6
- apphb_register at Base 1:3.0.6
- apphb_setinterval at Base 1:3.0.6
- apphb_setreboot at Base 1:3.0.6
- apphb_setwarn at Base 1:3.0.6
- apphb_unregister at Base 1:3.0.6
-libccmclient.so.1 libheartbeat2 #MINVER#
-* Build-Depends-Package: libheartbeat2-dev
- cookie_construct at Base 1:3.0.6
- cookie_get_data at Base 1:3.0.6
- cookie_get_func at Base 1:3.0.6
- cookie_ref at Base 1:3.0.6
- cookie_unref at Base 1:3.0.6
- oc_ev_activate at Base 1:3.0.6
- oc_ev_callback_done at Base 1:3.0.6
- oc_ev_handle_event at Base 1:3.0.6
- oc_ev_is_my_nodeid at Base 1:3.0.6
- oc_ev_memb_class at Base 1:3.0.6
- oc_ev_register at Base 1:3.0.6
- oc_ev_set_callback at Base 1:3.0.6
- oc_ev_special at Base 1:3.0.6
- oc_ev_unregister at Base 1:3.0.6
-libclm.so.1 libheartbeat2 #MINVER#
-* Build-Depends-Package: libheartbeat2-dev
- saClmClusterNodeGet at Base 1:3.0.6
- saClmClusterNodeGetAsync at Base 1:3.0.6
- saClmClusterTrackStart at Base 1:3.0.6
- saClmClusterTrackStop at Base 1:3.0.6
- saClmDispatch at Base 1:3.0.6
- saClmFinalize at Base 1:3.0.6
- saClmInitialize at Base 1:3.0.6
- saClmSelectionObjectGet at Base 1:3.0.6
-libhbclient.so.1 libheartbeat2 #MINVER#
-* Build-Depends-Package: libheartbeat2-dev
- BufLen at Base 1:3.0.6
- G_main_add_ll_cluster at Base 1:3.0.6
- add_order_seq at Base 1:3.0.6
- config at Base 1:3.0.6
- curproc at Base 1:3.0.6
- display_orderQ at Base 1:3.0.6
- ll_cluster_new at Base 1:3.0.6
- netstring_format at Base 1:3.0.6
- nosuchfunctionname at Base 1:3.0.6
- strlcat at Base 1:3.0.6
- strlcpy at Base 1:3.0.6
diff -Nru heartbeat-3.0.6/debian/libheartbeat2t64.install heartbeat-3.0.6/debian/libheartbeat2t64.install
--- heartbeat-3.0.6/debian/libheartbeat2t64.install	1970-01-01 00:00:00.000000000 +0000
+++ heartbeat-3.0.6/debian/libheartbeat2t64.install	2017-08-26 15:11:48.000000000 +0000
@@ -0,0 +1,8 @@
+usr/lib/libapphb.so.2
+usr/lib/libapphb.so.2.0.0
+usr/lib/libccmclient.so.1
+usr/lib/libccmclient.so.1.0.0
+usr/lib/libclm.so.1
+usr/lib/libclm.so.1.0.0
+usr/lib/libhbclient.so.1
+usr/lib/libhbclient.so.1.0.0
diff -Nru heartbeat-3.0.6/debian/libheartbeat2t64.lintian-overrides heartbeat-3.0.6/debian/libheartbeat2t64.lintian-overrides
--- heartbeat-3.0.6/debian/libheartbeat2t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ heartbeat-3.0.6/debian/libheartbeat2t64.lintian-overrides	2024-02-28 08:19:09.000000000 +0000
@@ -0,0 +1,2 @@
+libheartbeat2t64 binary: package-name-doesnt-match-sonames
+libheartbeat2t64: package-name-doesnt-match-sonames libheartbeat2
diff -Nru heartbeat-3.0.6/debian/libheartbeat2t64.symbols heartbeat-3.0.6/debian/libheartbeat2t64.symbols
--- heartbeat-3.0.6/debian/libheartbeat2t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ heartbeat-3.0.6/debian/libheartbeat2t64.symbols	2024-02-28 08:19:09.000000000 +0000
@@ -0,0 +1,47 @@
+libapphb.so.2 libheartbeat2t64 #MINVER#
+* Build-Depends-Package: libheartbeat2-dev
+ apphb_hb at Base 1:3.0.6
+ apphb_register at Base 1:3.0.6
+ apphb_setinterval at Base 1:3.0.6
+ apphb_setreboot at Base 1:3.0.6
+ apphb_setwarn at Base 1:3.0.6
+ apphb_unregister at Base 1:3.0.6
+libccmclient.so.1 libheartbeat2t64 #MINVER#
+* Build-Depends-Package: libheartbeat2-dev
+ cookie_construct at Base 1:3.0.6
+ cookie_get_data at Base 1:3.0.6
+ cookie_get_func at Base 1:3.0.6
+ cookie_ref at Base 1:3.0.6
+ cookie_unref at Base 1:3.0.6
+ oc_ev_activate at Base 1:3.0.6
+ oc_ev_callback_done at Base 1:3.0.6
+ oc_ev_handle_event at Base 1:3.0.6
+ oc_ev_is_my_nodeid at Base 1:3.0.6
+ oc_ev_memb_class at Base 1:3.0.6
+ oc_ev_register at Base 1:3.0.6
+ oc_ev_set_callback at Base 1:3.0.6
+ oc_ev_special at Base 1:3.0.6
+ oc_ev_unregister at Base 1:3.0.6
+libclm.so.1 libheartbeat2t64 #MINVER#
+* Build-Depends-Package: libheartbeat2-dev
+ saClmClusterNodeGet at Base 1:3.0.6
+ saClmClusterNodeGetAsync at Base 1:3.0.6
+ saClmClusterTrackStart at Base 1:3.0.6
+ saClmClusterTrackStop at Base 1:3.0.6
+ saClmDispatch at Base 1:3.0.6
+ saClmFinalize at Base 1:3.0.6
+ saClmInitialize at Base 1:3.0.6
+ saClmSelectionObjectGet at Base 1:3.0.6
+libhbclient.so.1 libheartbeat2t64 #MINVER#
+* Build-Depends-Package: libheartbeat2-dev
+ BufLen at Base 1:3.0.6
+ G_main_add_ll_cluster at Base 1:3.0.6
+ add_order_seq at Base 1:3.0.6
+ config at Base 1:3.0.6
+ curproc at Base 1:3.0.6
+ display_orderQ at Base 1:3.0.6
+ ll_cluster_new at Base 1:3.0.6
+ netstring_format at Base 1:3.0.6
+ nosuchfunctionname at Base 1:3.0.6
+ strlcat at Base 1:3.0.6
+ strlcpy at Base 1:3.0.6
