Bug#1061913: ctpl: NMU diff for 64-bit time_t transition

2024-02-27 Thread mwhudson
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
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)
diff -Nru ctpl-0.3.4+dfsg/debian/changelog ctpl-0.3.4+dfsg/debian/changelog
--- ctpl-0.3.4+dfsg/debian/changelog2022-09-27 07:56:13.0 +
+++ ctpl-0.3.4+dfsg/debian/changelog2024-02-27 23:13:05.0 +
@@ -1,3 +1,10 @@
+ctpl (0.3.4+dfsg-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1061913
+
+ -- Michael Hudson-Doyle   Tue, 27 Feb 2024 23:13:05 +
+
 ctpl (0.3.4+dfsg-4) unstable; urgency=medium
 
   * Reupload as source-only package to unblock migration to testing
diff -Nru ctpl-0.3.4+dfsg/debian/control ctpl-0.3.4+dfsg/debian/control
--- ctpl-0.3.4+dfsg/debian/control  2022-09-27 07:56:13.0 +
+++ ctpl-0.3.4+dfsg/debian/control  2024-02-27 23:13:05.0 +
@@ -3,7 +3,7 @@
 Maintainer: Geany Packaging Team 
 Uploaders: Jonathan Michalon ,
  Evgeni Golov , Chow Loong Jin 
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
libtool (>= 2.2),
libglib2.0-dev (>= 2.24),
libglib2.0-doc (>= 2.24),
@@ -21,7 +21,7 @@
 Multi-Arch: same
 Depends: ${misc:Depends},
  libglib2.0-dev,
- libctpl2 (= ${binary:Version})
+ libctpl2t64 (= ${binary:Version})
 Suggests: libctpl-doc
 Description: template engine written in C, development files
  CTPL is a C template engine library allowing fast and easy computation of
@@ -33,7 +33,10 @@
  This package contains the header files which are needed for developing
  CTPL applications.
 
-Package: libctpl2
+Package: libctpl2t64
+Provides: ${t64:Provides}
+Replaces: libctpl2
+Breaks: libctpl2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${shlibs:Pre-Depends}, ${misc:Pre-Depends}
@@ -77,7 +80,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libctpl2 (= ${binary:Version})
+ libctpl2t64 (= ${binary:Version})
 Description: command-line template parsing utility
  CTPL is a C template engine library allowing fast and easy computation of
  templates with precise control over the parsing environment.
diff -Nru ctpl-0.3.4+dfsg/debian/libctpl2.install 
ctpl-0.3.4+dfsg/debian/libctpl2.install
--- ctpl-0.3.4+dfsg/debian/libctpl2.install 2022-09-27 07:56:13.0 
+
+++ ctpl-0.3.4+dfsg/debian/libctpl2.install 1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru ctpl-0.3.4+dfsg/debian/libctpl2.symbols 
ctpl-0.3.4+dfsg/debian/libctpl2.symbols
--- ctpl-0.3.4+dfsg/debian/libctpl2.symbols 2022-09-27 07:56:13.0 
+
+++ ctpl-0.3.4+dfsg/debian/libctpl2.symbols 1970-01-01 00:00:00.0 
+
@@ -1,115 +0,0 @@
-libctpl.so.2 libctpl2 #MINVER#
- ctpl_check_version@Base 0.3
- ctpl_environ_add_from_path@Base 0.3
- ctpl_environ_add_from_stream@Base 0.3
- ctpl_environ_add_from_string@Base 0.3
- ctpl_environ_error_quark@Base 0.3
- ctpl_environ_foreach@Base 0.3
- ctpl_environ_lookup@Base 0.3
- ctpl_environ_merge@Base 0.3
- ctpl_environ_new@Base 0.3
- ctpl_environ_pop@Base 0.3
- ctpl_environ_push@Base 0.3
- ctpl_environ_push_float@Base 0.3
- ctpl_environ_push_int@Base 0.3
- ctpl_environ_push_string@Base 0.3
- ctpl_environ_ref@Base 0.3
- ctpl_environ_unref@Base 0.3
- ctpl_eval_bool@Base 0.3
- ctpl_eval_error_quark@Base 0.3
- ctpl_eval_value@Base 0.3
- ctpl_gettext@Base 0.3.4
- ctpl_input_stream_eof@Base 0.3
- ctpl_input_stream_eof_fast@Base 0.3
- ctpl_input_stream_get_c@Base 0.3
- ctpl_input_stream_get_line@Base 0.3
- ctpl_input_stream_get_line_position@Base 0.3
- ctpl_input_stream_get_name@Base 0.3
- ctpl_input_stream_get_stream@Base 0.3
- ctpl_input_stream_new@Base 0.3
- ctpl_input_stream_new_for_gfile@Base 0.3
- ctpl_input_stream_new_for_memory@Base 0.3
- ctpl_input_stream_new_for_path@Base 0.3
- ctpl_input_stream_new_for_uri@Base 0.3
- ctpl_input_stream_peek@Base 0.3
- ctpl_input_stream_peek_c@Base 0.3
- ctpl_input_stream_peek_symbol_full@Base 0.3
- ctpl_input_stream_peek_word@Base 0.3
- ctpl_input_stream_read@Base 0.3
- ctpl_input_stream_read_float@Base 0.3
- ctpl_input_stream_read_int@Base 0.3
- ctpl_input_stream_read_number@Base 0.3
- ctpl_input_stream_read_string_literal@Base 0.3
- 

Bug#1061913: ctpl: NMU diff for 64-bit time_t transition

2024-01-31 Thread mwhudson
Source: ctpl
Followup-For: Bug #1061913

Apologies, thanks to operator error (i.e. I messed up) the diff attached to
this bug is not the one that was uploaded to experimental. Please see the patch
attached to this message.


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

Kernel: Linux 6.5.0-15-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, 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)
diff -Nru ctpl-0.3.4+dfsg/debian/changelog ctpl-0.3.4+dfsg/debian/changelog
--- ctpl-0.3.4+dfsg/debian/changelog2022-09-27 07:56:13.0 +
+++ ctpl-0.3.4+dfsg/debian/changelog2024-01-30 10:08:03.0 +
@@ -1,3 +1,10 @@
+ctpl (0.3.4+dfsg-4.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle   Tue, 30 Jan 2024 10:08:03 +
+
 ctpl (0.3.4+dfsg-4) unstable; urgency=medium
 
   * Reupload as source-only package to unblock migration to testing
diff -Nru ctpl-0.3.4+dfsg/debian/control ctpl-0.3.4+dfsg/debian/control
--- ctpl-0.3.4+dfsg/debian/control  2022-09-27 07:56:13.0 +
+++ ctpl-0.3.4+dfsg/debian/control  2024-01-30 10:08:03.0 +
@@ -21,7 +21,7 @@
 Multi-Arch: same
 Depends: ${misc:Depends},
  libglib2.0-dev,
- libctpl2 (= ${binary:Version})
+ libctpl2t64 (= ${binary:Version})
 Suggests: libctpl-doc
 Description: template engine written in C, development files
  CTPL is a C template engine library allowing fast and easy computation of
@@ -33,7 +33,10 @@
  This package contains the header files which are needed for developing
  CTPL applications.
 
-Package: libctpl2
+Package: libctpl2t64
+Provides: ${t64:Provides}
+Replaces: libctpl2
+Breaks: libctpl2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${shlibs:Pre-Depends}, ${misc:Pre-Depends}
@@ -77,7 +80,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libctpl2 (= ${binary:Version})
+ libctpl2t64 (= ${binary:Version})
 Description: command-line template parsing utility
  CTPL is a C template engine library allowing fast and easy computation of
  templates with precise control over the parsing environment.
diff -Nru ctpl-0.3.4+dfsg/debian/libctpl2.install 
ctpl-0.3.4+dfsg/debian/libctpl2.install
--- ctpl-0.3.4+dfsg/debian/libctpl2.install 2022-09-27 07:56:13.0 
+
+++ ctpl-0.3.4+dfsg/debian/libctpl2.install 1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru ctpl-0.3.4+dfsg/debian/libctpl2.symbols 
ctpl-0.3.4+dfsg/debian/libctpl2.symbols
--- ctpl-0.3.4+dfsg/debian/libctpl2.symbols 2022-09-27 07:56:13.0 
+
+++ ctpl-0.3.4+dfsg/debian/libctpl2.symbols 1970-01-01 00:00:00.0 
+
@@ -1,115 +0,0 @@
-libctpl.so.2 libctpl2 #MINVER#
- ctpl_check_version@Base 0.3
- ctpl_environ_add_from_path@Base 0.3
- ctpl_environ_add_from_stream@Base 0.3
- ctpl_environ_add_from_string@Base 0.3
- ctpl_environ_error_quark@Base 0.3
- ctpl_environ_foreach@Base 0.3
- ctpl_environ_lookup@Base 0.3
- ctpl_environ_merge@Base 0.3
- ctpl_environ_new@Base 0.3
- ctpl_environ_pop@Base 0.3
- ctpl_environ_push@Base 0.3
- ctpl_environ_push_float@Base 0.3
- ctpl_environ_push_int@Base 0.3
- ctpl_environ_push_string@Base 0.3
- ctpl_environ_ref@Base 0.3
- ctpl_environ_unref@Base 0.3
- ctpl_eval_bool@Base 0.3
- ctpl_eval_error_quark@Base 0.3
- ctpl_eval_value@Base 0.3
- ctpl_gettext@Base 0.3.4
- ctpl_input_stream_eof@Base 0.3
- ctpl_input_stream_eof_fast@Base 0.3
- ctpl_input_stream_get_c@Base 0.3
- ctpl_input_stream_get_line@Base 0.3
- ctpl_input_stream_get_line_position@Base 0.3
- ctpl_input_stream_get_name@Base 0.3
- ctpl_input_stream_get_stream@Base 0.3
- ctpl_input_stream_new@Base 0.3
- ctpl_input_stream_new_for_gfile@Base 0.3
- ctpl_input_stream_new_for_memory@Base 0.3
- ctpl_input_stream_new_for_path@Base 0.3
- ctpl_input_stream_new_for_uri@Base 0.3
- ctpl_input_stream_peek@Base 0.3
- ctpl_input_stream_peek_c@Base 0.3
- ctpl_input_stream_peek_symbol_full@Base 0.3
- ctpl_input_stream_peek_word@Base 0.3
- ctpl_input_stream_read@Base 0.3
- ctpl_input_stream_read_float@Base 0.3
- ctpl_input_stream_read_int@Base 0.3
- ctpl_input_stream_read_number@Base 0.3
- ctpl_input_stream_read_string_literal@Base 0.3
- ctpl_input_stream_read_symbol_full@Base 0.3
- ctpl_input_stream_read_word@Base 0.3
- ctpl_input_stream_ref@Base 0.3
- ctpl_input_stream_set_error@Base 0.3
- ctpl_input_stream_skip@Base 0.3
- ctpl_input_stream_skip_blank@Base 0.3
- ctpl_input_stream_skip_word@Base 0.3
- ctpl_input_stream_unref@Base 0.3
- ctpl_io_error_quark@Base 0.3
- ctpl_lexer_error_quark@Base 0.3
- ctpl_lexer_expr_error_quark@Base 0.3
- 

Bug#1061913: ctpl: NMU diff for 64-bit time_t transition

2024-01-29 Thread mwhudson
Source: ctpl
Version: 0.3.4+dfsg-4
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

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
ctpl 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 ctpl
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'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-15-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, 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)
diff -Nru ctpl-0.3.4+dfsg/debian/changelog ctpl-0.3.4+dfsg/debian/changelog
--- ctpl-0.3.4+dfsg/debian/changelog2022-09-27 07:56:13.0 +
+++ ctpl-0.3.4+dfsg/debian/changelog2024-01-30 01:26:59.0 +
@@ -1,3 +1,10 @@
+ctpl (0.3.4+dfsg-4.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle   Tue, 30 Jan 2024 01:26:59 +
+
 ctpl (0.3.4+dfsg-4) unstable; urgency=medium
 
   * Reupload as source-only package to unblock migration to testing
diff -Nru ctpl-0.3.4+dfsg/debian/control ctpl-0.3.4+dfsg/debian/control
--- ctpl-0.3.4+dfsg/debian/control  2022-09-27 07:56:13.0 +
+++ ctpl-0.3.4+dfsg/debian/control  2024-01-30 01:26:59.0 +
@@ -33,7 +33,10 @@
  This package contains the header files which are needed for developing
  CTPL applications.
 
-Package: libctpl2
+Package: libctpl2t64
+Provides: ${t64:Provides}
+Replaces: libctpl2
+Breaks: libctpl2 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${shlibs:Pre-Depends}, ${misc:Pre-Depends}
diff -Nru ctpl-0.3.4+dfsg/debian/libctpl2.install 
ctpl-0.3.4+dfsg/debian/libctpl2.install
--- ctpl-0.3.4+dfsg/debian/libctpl2.install 2022-09-27 07:56:13.0 
+
+++ ctpl-0.3.4+dfsg/debian/libctpl2.install 1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff -Nru ctpl-0.3.4+dfsg/debian/libctpl2.symbols 
ctpl-0.3.4+dfsg/debian/libctpl2.symbols
--- ctpl-0.3.4+dfsg/debian/libctpl2.symbols 2022-09-27 07:56:13.0 
+
+++ ctpl-0.3.4+dfsg/debian/libctpl2.symbols 1970-01-01 00:00:00.0 
+
@@ -1,115 +0,0 @@
-libctpl.so.2 libctpl2 #MINVER#
- ctpl_check_version@Base 0.3
- ctpl_environ_add_from_path@Base 0.3
- ctpl_environ_add_from_stream@Base 0.3
- ctpl_environ_add_from_string@Base 0.3
- ctpl_environ_error_quark@Base 0.3
- ctpl_environ_foreach@Base 0.3
- ctpl_environ_lookup@Base 0.3
- ctpl_environ_merge@Base 0.3
- ctpl_environ_new@Base 0.3
- ctpl_environ_pop@Base 0.3
- ctpl_environ_push@Base 0.3
- ctpl_environ_push_float@Base 0.3
- ctpl_environ_push_int@Base 0.3
- ctpl_environ_push_string@Base 0.3
- ctpl_environ_ref@Base 0.3
- ctpl_environ_unref@Base 0.3
- ctpl_eval_bool@Base 0.3
- ctpl_eval_error_quark@Base 0.3
- ctpl_eval_value@Base 0.3
- ctpl_gettext@Base 0.3.4
- ctpl_input_stream_eof@Base 0.3
- ctpl_input_stream_eof_fast@Base 0.3
- ctpl_input_stream_get_c@Base 0.3
- ctpl_input_stream_get_line@Base 0.3
- ctpl_input_stream_get_line_position@Base 0.3
- ctpl_input_stream_get_name@Base 0.3
- ctpl_input_stream_get_stream@Base 0.3
- ctpl_input_stream_new@Base 0.3
- ctpl_input_stream_new_for_gfile@Base 0.3
- ctpl_input_stream_new_for_memory@Base 0.3
- ctpl_input_stream_new_for_path@Base 0.3
- ctpl_input_stream_new_for_uri@Base 0.3
- ctpl_input_stream_peek@Base 0.3
- ctpl_input_stream_peek_c@Base 0.3
-