Bug#1063216: parted: NMU diff for 64-bit time_t transition

2024-02-29 Thread Benjamin Drung
Source: parted
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'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru parted-3.6/debian/.gitignore parted-3.6/debian/.gitignore
--- parted-3.6/debian/.gitignore2023-06-26 22:34:57.0 +
+++ parted-3.6/debian/.gitignore1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-/files
diff -Nru parted-3.6/debian/changelog parted-3.6/debian/changelog
--- parted-3.6/debian/changelog 2023-06-26 22:34:57.0 +
+++ parted-3.6/debian/changelog 2024-02-29 19:58:31.0 +
@@ -1,3 +1,10 @@
+parted (3.6-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063216
+
+ -- Benjamin Drung   Thu, 29 Feb 2024 19:58:31 +
+
 parted (3.6-3) unstable; urgency=medium
 
   * align-new-partitions-on-fresh-disks.patch:
diff -Nru parted-3.6/debian/control parted-3.6/debian/control
--- parted-3.6/debian/control   2023-06-26 22:34:57.0 +
+++ parted-3.6/debian/control   2024-02-29 19:58:31.0 +
@@ -7,7 +7,7 @@
 Vcs-Git: https://salsa.debian.org/parted-team/parted.git
 Vcs-Browser: https://salsa.debian.org/parted-team/parted
 Homepage: https://www.gnu.org/software/parted
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  libncurses-dev | libncurses5-dev,
  libreadline-dev | libreadline6-dev,
@@ -26,7 +26,7 @@
 
 Package: parted
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2t64 (= 
${binary:Version})
 Suggests: parted-doc
 Conflicts: parted-doc (<< 3.5-2~)
 Multi-Arch: foreign
@@ -60,13 +60,15 @@
 Depends: ${shlibs:Depends}, libparted2-udeb (= ${binary:Version}), 
${misc:Depends}
 Description: Manually partition a hard drive (parted)
 
-Package: libparted2
+Package: libparted2t64
+Replaces: libparted2
+Breaks: libparted2 (<< ${source:Version})
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, dmidecode [amd64 i386]
 Suggests: parted, libparted-dev, libparted-i18n (= ${source:Version})
-Provides: libparted
+Provides: ${t64:Provides}, libparted
 Multi-Arch: same
 Description: disk partition manipulator - shared library
  GNU Parted is a program that allows you to create, destroy, resize,
@@ -76,11 +78,14 @@
  .
  This package contains the shared library.
 
-Package: libparted-fs-resize0
+Package: libparted-fs-resize0t64
+Provides: ${t64:Provides}
+Replaces: libparted-fs-resize0
+Breaks: libparted-fs-resize0 (<< ${source:Version})
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2t64 (= 
${binary:Version})
 Suggests: libparted-dev
 Multi-Arch: same
 Description: disk partition manipulator - shared FS resizing library
@@ -123,7 +128,7 @@
 Package: libparted-i18n
 Architecture: all
 Section: localization
-Depends: libparted2, ${misc:Depends}
+Depends: libparted2t64, ${misc:Depends}
 Description: disk partition manipulator - i18n support
  GNU Parted is a program that allows you to create, destroy, resize,
  move, and copy disk partitions. This is useful for creating space
@@ -135,7 +140,7 @@
 Package: libparted-dev
 Architecture: any
 Section: libdevel
-Depends: libc6-dev, libparted2 (= ${binary:Version}), libparted-fs-resize0 (= 
${binary:Version}), libdevmapper-dev [linux-any], uuid-dev, libblkid-dev, 
${misc:Depends}
+Depends: libc6-dev, libparted2t64 (= ${binary:Version}), 
libparted-fs-resize0t64 (= ${binary:Version}), libdevmapper-dev [linux-any], 
uuid-dev, libblkid-dev, ${misc:Depends}
 Suggests: parted (= ${binary:Version}), parted-doc
 Multi-Arch: same
 Description: disk partition manipulator - development files
diff -Nru parted-3.6/debian/libparted-fs-resize0.install 
parted-3.6/debian/libparted-fs-resize0.install
--- parted-3.6/debian/libparted-fs-resize0.install  2023-06-26 
22:34:57.0 +
+++ parted-3.6/debian/libparted-fs-resize0.install  1970-01-01 
00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libparted-fs-resize.so.* 
lib/${DEB_HOST_MULTIARCH}
diff -Nru parted-3.6/debian/libparted-fs-resize0.maintscript 
parted-3.6/debian/libparted-fs-resize0.maintscript

Bug#1063216: parted: NMU diff for 64-bit time_t transition

2024-02-05 Thread Colin Watson
On Mon, Feb 05, 2024 at 03:08:55PM -0300, Lucas Kanashiro wrote:
> diff -Nru parted-3.6/debian/libparted-fs-resize0t64.maintscript 
> parted-3.6/debian/libparted-fs-resize0t64.maintscript
> --- parted-3.6/debian/libparted-fs-resize0t64.maintscript 1969-12-31 
> 21:00:00.0 -0300
> +++ parted-3.6/debian/libparted-fs-resize0t64.maintscript 2023-06-26 
> 19:34:57.0 -0300
> @@ -0,0 +1 @@
> +dir_to_symlink /usr/share/doc/libparted-fs-resize0 libparted2 3.5-2~

Does this need to be /usr/share/doc/libparted-fs-resize0t64 instead?
(Alternatively, maybe this .maintscript file can just be dropped, since
the new directory name won't need to be switched to a symlink.)

> diff -Nru parted-3.6/debian/rules parted-3.6/debian/rules
> --- parted-3.6/debian/rules   2023-06-26 19:34:57.0 -0300
> +++ parted-3.6/debian/rules   2024-02-05 14:58:17.0 -0300
> @@ -69,18 +69,18 @@
>   dh_install -pparted-udeb -plibparted2-udeb -plibparted-fs-resize0-udeb 
> --sourcedir=debian/tmp-udeb
>  
>  override_dh_installdocs-arch:
> - dh_installdocs --link-doc=libparted2
> + dh_installdocs --link-doc=libparted2t64
>  
>  override_dh_installdocs-indep:
> - dh_installdocs -pparted-doc --doc-main-package=libparted2
> + dh_installdocs -pparted-doc --doc-main-package=libparted2t64
>   dh_installdocs --remaining-packages
>  
>  override_dh_strip:
> - dh_strip -plibparted2 --ddeb-migration='libparted2-dbg (<< 3.2-11~)'
> - dh_strip -plibparted-fs-resize0 \
> + dh_strip -plibparted2t64 --ddeb-migration='libparted2-dbg (<< 3.2-11~)'
> + dh_strip -plibparted-fs-resize0t64 \
>   --ddeb-migration='libparted-fs-resize0-dbg (<< 3.2-11~)'

Is the --ddeb-migration option here still needed?  Presumably it won't
have any common files with the old -dbg package any more (the file names in
/usr/lib/debug/ change all the time, and the only other common file was
/usr/share/doc/libparted-fs-resize0-dbgsym).

In fact, since 3.2-11 was before oldoldstable, I'm just going to remove
this override_dh_strip rule entirely, as it isn't needed any more:

  
https://salsa.debian.org/parted-team/parted/-/commit/2ede9a43a0cb5e5abb52cd3c519769ad9d8d489d

Thanks,

-- 
Colin Watson (he/him)  [cjwat...@debian.org]



Bug#1063216: parted: NMU diff for 64-bit time_t transition

2024-02-05 Thread Lucas Kanashiro
Source: parted
Version: 3.6-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
parted 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 parted
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')
Architecture: amd64 (x86_64)

Kernel: Linux 6.2.0-39-generic (SMP w/32 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C.UTF-8, 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 parted-3.6/debian/.gitignore parted-3.6/debian/.gitignore
--- parted-3.6/debian/.gitignore2023-06-26 19:34:57.0 -0300
+++ parted-3.6/debian/.gitignore1969-12-31 21:00:00.0 -0300
@@ -1 +0,0 @@
-/files
diff -Nru parted-3.6/debian/changelog parted-3.6/debian/changelog
--- parted-3.6/debian/changelog 2023-06-26 19:34:57.0 -0300
+++ parted-3.6/debian/changelog 2024-02-05 14:58:17.0 -0300
@@ -1,3 +1,10 @@
+parted (3.6-3.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Lucas Kanashiro   Mon, 05 Feb 2024 14:58:17 -0300
+
 parted (3.6-3) unstable; urgency=medium
 
   * align-new-partitions-on-fresh-disks.patch:
diff -Nru parted-3.6/debian/control parted-3.6/debian/control
--- parted-3.6/debian/control   2023-06-26 19:34:57.0 -0300
+++ parted-3.6/debian/control   2024-02-05 14:58:17.0 -0300
@@ -26,7 +26,7 @@
 
 Package: parted
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2t64 (= 
${binary:Version})
 Suggests: parted-doc
 Conflicts: parted-doc (<< 3.5-2~)
 Multi-Arch: foreign
@@ -60,13 +60,15 @@
 Depends: ${shlibs:Depends}, libparted2-udeb (= ${binary:Version}), 
${misc:Depends}
 Description: Manually partition a hard drive (parted)
 
-Package: libparted2
+Package: libparted2t64
+Replaces: libparted2
+Breaks: libparted2 (<< ${source:Version})
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, dmidecode [amd64 i386]
 Suggests: parted, libparted-dev, libparted-i18n (= ${source:Version})
-Provides: libparted
+Provides: ${t64:Provides}, libparted
 Multi-Arch: same
 Description: disk partition manipulator - shared library
  GNU Parted is a program that allows you to create, destroy, resize,
@@ -76,11 +78,14 @@
  .
  This package contains the shared library.
 
-Package: libparted-fs-resize0
+Package: libparted-fs-resize0t64
+Provides: ${t64:Provides}
+Replaces: libparted-fs-resize0
+Breaks: libparted-fs-resize0 (<< ${source:Version})
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2t64 (= 
${binary:Version})
 Suggests: libparted-dev
 Multi-Arch: same
 Description: disk partition manipulator - shared FS resizing library
@@ -123,7 +128,7 @@
 Package: libparted-i18n
 Architecture: all
 Section: localization
-Depends: libparted2, ${misc:Depends}
+Depends: libparted2t64, ${misc:Depends}
 Description: disk partition manipulator - i18n support
  GNU Parted is a program that allows you to create, destroy, resize,
  move, and copy disk partitions. This is useful for