Bug#1062694: libuv1: NMU diff for 64-bit time_t transition

2024-02-24 Thread Steve Langasek
Please find attached an updated patch rebased on current unstable.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru libuv1-1.48.0/debian/changelog libuv1-1.48.0/debian/changelog
--- libuv1-1.48.0/debian/changelog  2024-02-14 17:47:19.0 +
+++ libuv1-1.48.0/debian/changelog  2024-02-24 08:57:16.0 +
@@ -1,3 +1,10 @@
+libuv1 (1.48.0-1.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Sat, 24 Feb 2024 08:57:16 +
+
 libuv1 (1.48.0-1) unstable; urgency=medium
 
   [ Dominique Dumont ]
diff -Nru libuv1-1.48.0/debian/changelog.orig 
libuv1-1.48.0/debian/changelog.orig
--- libuv1-1.48.0/debian/changelog.orig 1970-01-01 00:00:00.0 +
+++ libuv1-1.48.0/debian/changelog.orig 2024-02-24 08:56:28.0 +
@@ -0,0 +1,750 @@
+libuv1 (1.48.0-1) unstable; urgency=medium
+
+  [ Dominique Dumont ]
+  * new upstream version:
+* Fix CVE-2024-24806 (Closes: #1063484)
+  * copyright: update with cme
+  * refreshed patches
+  * rm patch lp2046442-linux-don-t-use-io_uring-...
+  * refreshed symbols file
+
+ -- Dominique Dumont   Wed, 14 Feb 2024 18:47:19 +0100
+
+libuv1 (1.46.0-3) unstable; urgency=medium
+
+  * add patch to fix build on kernel < 5.10.186.
+Thanks to Simon Choppin and Ubuntu fot the patch (Closes: 1058743)
+
+ -- Dominique Dumont   Sat, 30 Dec 2023 18:32:28 +0100
+
+libuv1 (1.46.0-2) unstable; urgency=medium
+
+  * re-release to unstable
+
+ -- Dominique Dumont   Sun, 15 Oct 2023 16:37:48 +0200
+
+libuv1 (1.46.0-1) experimental; urgency=medium
+
+  * new upstream release:
+  * control: declare compliance with policy 4.6.2
+  * control: drop kfreebsd (dropped upstream)
+  * fill-copyright-blanks:
+* specify license of a test file
+* drop removed files
+* specify CC-BY-4.0 license for doc files
+  * refreshed copyright with cme
+  * install LICENSE-extra file in libuv1-dev.docs
+  * refreshed patches
+  * update symbols file
+  * ship libuv.a instead of libuv_a.a
+  * update README.source.org
+
+ -- Dominique Dumont   Tue, 05 Sep 2023 18:34:19 +0200
+
+libuv1 (1.44.2-1) unstable; urgency=medium
+
+  * new upstream version
+  * copyright: updated with cme
+  * remove pristine-tar from build process
+  * update symbols file
+
+ -- Dominique Dumont   Thu, 28 Jul 2022 18:35:31 +0200
+
+libuv1 (1.44.1-2) unstable; urgency=medium
+
+  * update symbols file to fix hurd packaging
+
+ -- Dominique Dumont   Wed, 16 Mar 2022 19:16:11 +0100
+
+libuv1 (1.44.1-1) unstable; urgency=medium
+
+  * new upstream version
+  * update copyright with cme
+  * refresh patch
+  * update symbols file
+
+ -- Dominique Dumont   Sun, 13 Mar 2022 19:24:56 +0100
+
+libuv1 (1.43.0-1) unstable; urgency=medium
+
+  * new upstream version
+  * control:
+* declare compliance with policy 4.6.0
+* remove conflicts on ancient libuv0.10-dev package
+  * update copyright with cme
+  * do not install cmake files
+  * update symbols file
+  * README.source.org: add quilt pop -a instruction
+
+ -- Dominique Dumont   Sat, 15 Jan 2022 18:15:17 +0100
+
+libuv1 (1.42.0-1) unstable; urgency=medium
+
+  * new upstream version
+  * update fill.copyright.blanks
+  * update copyright with cme
+  * removed patch for CVE (applied upstream)
+  * refresh patch
+  * control:
+* declare compliance with policy 4.5.1
+* use debhelper 13
+* set Rules-Requires-Root to no
+  * watch: watch github and use v4
+  * rules: remove obsolete dbgsym-migration instructions
+  * update symbols file
+  * converted README.source to org-mode
+
+ -- Dominique Dumont   Sat, 11 Sep 2021 18:50:00 +0200
+
+libuv1 (1.40.0-2) unstable; urgency=medium
+
+  * add patch for CVE-2021-22918 (Closes: #990561)
+
+ -- Dominique Dumont   Sun, 04 Jul 2021 09:43:38 +0200
+
+libuv1 (1.40.0-1) unstable; urgency=medium
+
+  * new upstream version
+  * update copyright with cme
+  * refreshed patch
+  * update symbol file
+
+ -- Dominique Dumont   Sat, 31 Oct 2020 18:43:46 +0100
+
+libuv1 (1.39.0-1) unstable; urgency=medium
+
+  * new upstream version
+  * update copyright with cme
+  * refreshed patch
+  * update symbol file
+
+ -- Dominique Dumont   Sun, 13 Sep 2020 17:27:18 +0200
+
+libuv1 (1.38.0-3) unstable; urgency=medium
+
+  * rules: increase timeout of time sensitive tests for all arch
+
+ -- Dominique Dumont   Sun, 28 Jun 2020 15:27:10 +0200
+
+libuv1 (1.38.0-2) unstable; urgency=medium
+
+  * use cmake instead of autotools to build libuv.
+As a consequence:
+* control: add cmake build dep
+* archive lib is now libuv_a.a
+* remove all internal symbols from symbol file
+* rules is updated to not run tests in parallel
+  * remove autopkgtest 

Bug#1062694: libuv1: NMU diff for 64-bit time_t transition

2024-02-02 Thread Steve Langasek
Source: libuv1
Version: 1.46.0-3
Severity: serious
Tags: patch pending sid trixie
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

NOTICE: these changes must not be uploaded to unstable yet!

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
libuv1 as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for libuv1
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 
'experimental')
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)
diff -Nru libuv1-1.46.0/debian/changelog libuv1-1.46.0/debian/changelog
--- libuv1-1.46.0/debian/changelog  2023-12-30 17:32:28.0 +
+++ libuv1-1.46.0/debian/changelog  2024-02-02 18:16:37.0 +
@@ -1,3 +1,10 @@
+libuv1 (1.46.0-3.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Fri, 02 Feb 2024 18:16:37 +
+
 libuv1 (1.46.0-3) unstable; urgency=medium
 
   * add patch to fix build on kernel < 5.10.186.
diff -Nru libuv1-1.46.0/debian/control libuv1-1.46.0/debian/control
--- libuv1-1.46.0/debian/control2023-12-30 17:32:28.0 +
+++ libuv1-1.46.0/debian/control2024-02-02 18:16:37.0 +
@@ -19,7 +19,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
- libuv1 (= ${binary:Version})
+ libuv1t64 (= ${binary:Version})
 Conflicts: libuv-dev
 Replaces: libuv-dev
 Description: asynchronous event notification library - development files
@@ -38,7 +38,10 @@
  Install this package if you wish to develop your own programs using the
  libuv engine.
 
-Package: libuv1
+Package: libuv1t64
+Provides: ${t64:Provides}
+Replaces: libuv1
+Breaks: libuv1 (<< ${source:Version})
 Architecture: linux-any hurd-any
 Multi-Arch: same
 Depends: ${misc:Depends},
diff -Nru libuv1-1.46.0/debian/libuv1.install 
libuv1-1.46.0/debian/libuv1.install
--- libuv1-1.46.0/debian/libuv1.install 2023-12-30 17:32:28.0 +
+++ libuv1-1.46.0/debian/libuv1.install 1970-01-01 00:00:00.0 +
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-usr/lib/*/libuv.so.1* usr/lib/${DEB_HOST_MULTIARCH}/
diff -Nru libuv1-1.46.0/debian/libuv1.symbols 
libuv1-1.46.0/debian/libuv1.symbols
--- libuv1-1.46.0/debian/libuv1.symbols 2023-12-30 17:32:28.0 +
+++ libuv1-1.46.0/debian/libuv1.symbols 1970-01-01 00:00:00.0 +
@@ -1,413 +0,0 @@
-libuv.so.1 libuv1 #MINVER#
-* Build-Depends-Package: libuv1-dev
-#MISSING: 1.46.0-2# (regex|optional)"^uv__" 1.0
-#MISSING: 1.46.0-2# (arch=linux-any|optional)uv__accept4@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__accept@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__async_close@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__async_fork@Base 1.18.0
-#MISSING: 1.46.0-2# (optional)uv__async_stop@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__calloc@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__check_close@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__cloexec_fcntl@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__cloexec_ioctl@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__close@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__close_nocheckstdio@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__count_bufs@Base 1.11.0
-#MISSING: 1.46.0-2# (optional)uv__dup2_cloexec@Base 1.11.0
-#MISSING: 1.46.0-2#