[Pkg-xmpp-devel] Bug#1062732: libxeddsa: NMU diff for 64-bit time_t transition

[Steve Langasek]

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-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.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 libxeddsa-2.0.0+20221109.06a02c8/debian/changelog libxeddsa-2.0.0+20221109.06a02c8/debian/changelog
--- libxeddsa-2.0.0+20221109.06a02c8/debian/changelog	2022-12-04 07:12:13.000000000 +0000
+++ libxeddsa-2.0.0+20221109.06a02c8/debian/changelog	2024-03-01 07:17:19.000000000 +0000
@@ -1,3 +1,10 @@
+libxeddsa (2.0.0+20221109.06a02c8-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062732
+
+ -- Steve Langasek <vorlon at debian.org>  Fri, 01 Mar 2024 07:17:19 +0000
+
 libxeddsa (2.0.0+20221109.06a02c8-2) unstable; urgency=medium
 
   * Use a map file
diff -Nru libxeddsa-2.0.0+20221109.06a02c8/debian/control libxeddsa-2.0.0+20221109.06a02c8/debian/control
--- libxeddsa-2.0.0+20221109.06a02c8/debian/control	2022-11-24 02:13:51.000000000 +0000
+++ libxeddsa-2.0.0+20221109.06a02c8/debian/control	2024-03-01 07:17:19.000000000 +0000
@@ -3,7 +3,7 @@
 Uploaders: Martin <debacle at debian.org>
 Section: libs
 Priority: optional
-Build-Depends: cmake,
+Build-Depends: dpkg-dev (>= 1.22.5), cmake,
 	       debhelper-compat (= 13),
 	       doxygen,
 	       libsodium-dev,
@@ -22,7 +22,7 @@
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libxeddsa2 (= ${binary:Version}),
+Depends: libxeddsa2t64 (= ${binary:Version}),
          ${misc:Depends},
 	 ${sphinxdoc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
@@ -38,7 +38,10 @@
  .
  This package contains the development files.
 
-Package: libxeddsa2
+Package: libxeddsa2t64
+Provides: ${t64:Provides}
+Replaces: libxeddsa2
+Breaks: libxeddsa2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff -Nru libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.install libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.install
--- libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.install	2022-11-23 23:27:13.000000000 +0000
+++ libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin/dynamic/libxeddsa.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff -Nru libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.symbols libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.symbols
--- libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.symbols	2022-12-04 07:12:13.000000000 +0000
+++ libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-libxeddsa.so.2 libxeddsa2 #MINVER#
- XEDDSA_VERSION_MAJOR at Base 2.0.0
- XEDDSA_VERSION_MINOR at Base 2.0.0
- XEDDSA_VERSION_REVISION at Base 2.0.0
- curve25519_pub_to_ed25519_pub at Base 2.0.0
- ed25519_priv_sign at Base 2.0.0
- ed25519_pub_to_curve25519_pub at Base 2.0.0
- ed25519_seed_sign at Base 2.0.0
- ed25519_verify at Base 2.0.0
- priv_force_sign at Base 2.0.0
- priv_to_curve25519_pub at Base 2.0.0
- priv_to_ed25519_pub at Base 2.0.0
- seed_to_ed25519_pub at Base 2.0.0
- seed_to_priv at Base 2.0.0
- x25519 at Base 2.0.0
- xeddsa_init at Base 2.0.0
diff -Nru libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.install libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.install
--- libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.install	1970-01-01 00:00:00.000000000 +0000
+++ libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.install	2022-11-23 23:27:13.000000000 +0000
@@ -0,0 +1 @@
+bin/dynamic/libxeddsa.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff -Nru libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.lintian-overrides libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.lintian-overrides
--- libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.lintian-overrides	2024-03-01 07:16:54.000000000 +0000
@@ -0,0 +1 @@
+libxeddsa2t64: package-name-doesnt-match-sonames libxeddsa2
diff -Nru libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.symbols libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.symbols
--- libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.symbols	1970-01-01 00:00:00.000000000 +0000
+++ libxeddsa-2.0.0+20221109.06a02c8/debian/libxeddsa2t64.symbols	2024-03-01 07:16:54.000000000 +0000
@@ -0,0 +1,16 @@
+libxeddsa.so.2 libxeddsa2t64 #MINVER#
+ XEDDSA_VERSION_MAJOR at Base 2.0.0
+ XEDDSA_VERSION_MINOR at Base 2.0.0
+ XEDDSA_VERSION_REVISION at Base 2.0.0
+ curve25519_pub_to_ed25519_pub at Base 2.0.0
+ ed25519_priv_sign at Base 2.0.0
+ ed25519_pub_to_curve25519_pub at Base 2.0.0
+ ed25519_seed_sign at Base 2.0.0
+ ed25519_verify at Base 2.0.0
+ priv_force_sign at Base 2.0.0
+ priv_to_curve25519_pub at Base 2.0.0
+ priv_to_ed25519_pub at Base 2.0.0
+ seed_to_ed25519_pub at Base 2.0.0
+ seed_to_priv at Base 2.0.0
+ x25519 at Base 2.0.0
+ xeddsa_init at Base 2.0.0