Bug#1061958: fwknop: NMU diff for 64-bit time_t transition
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_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 fwknop-2.6.10/debian/changelog fwknop-2.6.10/debian/changelog
--- fwknop-2.6.10/debian/changelog 2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/changelog 2024-02-29 04:44:10.0 +
@@ -1,3 +1,15 @@
+fwknop (2.6.10-20.1) experimental; urgency=medium
+
+ [ Lukas Märdian ]
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+ * Account for additional t64 Breaks/Replaces (Closes #1062046).
+
+ [ Francois Marier ]
+ * Add "pcap capture not compiled in" to logcheck rules.
+
+ -- Michael Hudson-Doyle Thu, 29 Feb 2024 04:44:10 +
+
fwknop (2.6.10-20) unstable; urgency=medium
* Add debian/NEWS mentioning the required NFQ configuration change.
diff -Nru fwknop-2.6.10/debian/control fwknop-2.6.10/debian/control
--- fwknop-2.6.10/debian/control2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/control2024-02-29 04:44:10.0 +
@@ -1,7 +1,7 @@
Source: fwknop
Section: admin
Priority: optional
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
automake,
chrpath,
debhelper-compat (= 13),
@@ -34,7 +34,7 @@
Suggests:
libfko-doc,
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Description: FireWall KNock OPerator - development library
@@ -52,13 +52,16 @@
.
This package provides the development library and its headers.
-Package: libfko3
+Package: libfko3t64
+Provides: ${t64:Provides}
Section: libs
Architecture: linux-any
Multi-Arch: same
Breaks:
+ libfko3 (<< ${source:Version}),
libfko2,
Replaces:
+ libfko3,
libfko2,
Pre-Depends:
${misc:Pre-Depends},
@@ -105,7 +108,7 @@
Section: perl
Architecture: linux-any
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${perl:Depends},
${shlibs:Depends},
@@ -130,7 +133,7 @@
${misc:Pre-Depends},
Depends:
iptables,
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Suggests:
@@ -151,7 +154,7 @@
Package: fwknop-client
Architecture: linux-any
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Description: FireWall KNock OPerator client side - C version
diff -Nru fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server
fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server
--- fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server 2023-11-13
23:42:27.0 +
+++ fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server 2024-02-29
04:44:09.0 +
@@ -3,3 +3,4 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: Sniffing interface:
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: PCAP filter is: 'udp
port 62201'$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: Starting fwknopd main
event loop.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: pcap capture not
compiled in, forcing UDP server mode$
diff -Nru fwknop-2.6.10/debian/libfko3.dirs fwknop-2.6.10/debian/libfko3.dirs
--- fwknop-2.6.10/debian/libfko3.dirs 2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/libfko3.dirs 1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib
diff -Nru fwknop-2.6.10/debian/libfko3.install
fwknop-2.6.10/debian/libfko3.install
--- fwknop-2.6.10/debian/libfko3.install2023-11-13 23:42:27.0
+
+++ fwknop-2.6.10/debian/libfko3.install1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/*/libfko.so.*
diff -Nru fwknop-2.6.10/debian/libfko3.symbols
fwknop-2.6.10/debian/libfko3.symbols
--- fwknop-2.6.10/debian/libfko3.symbols2023-11-13 23:42:27.0
+
+++ fwknop-2.6.10/debian/libfko3.symbols1970-01-01 00:00:00.0
+
@@ -1,70 +0,0 @@
-libfko.so.3 libfko3 #MINVER#
- fko_base64_decode@Base 2.5
- fko_base64_encode@Base 2.5
- fko_decode_spa_data@Base 2.5
- fko_decrypt_spa_data@Base 2.5
- fko_destroy@Base 2.5
- fko_encode_spa_data@Base 2.5
- fko_encrypt_spa_data@Base 2.5
- fko_encryption_type@Base 2.5
- fko_errstr@Base 2.5
- fko_get_encoded_data@Base 2.5
- fko_get_gpg_exe@Base 2.5
- fko_get_gpg_home_dir@Base 2.5
- fko_get_gpg_ignore_verify_error@Base 2.5
-
Bug#1061958: fwknop: NMU diff for 64-bit time_t transition
Am 01.02.24 um 16:57 schrieb Lukas Märdian:
Am 30.01.24 um 19:36 schrieb Francois Marier:
On 2024-01-30 at 05:48:11, Lukas Märdian (sl...@debian.org) wrote:
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.
No objections from me.
If you'd like to create a merge request on
https://salsa.debian.org/debian/fwknop, then I can merge and then you can
upload to unstable at your convenience.
Please see https://salsa.debian.org/debian/fwknop/-/merge_requests/2
It also addresses the Breaks/Replaces issue reported by Helmut/dumat
in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1062046
I uploaded this as ~exp2 in to experimental.
Also adding it as a debdiff here.diff -Nru fwknop-2.6.10/debian/changelog fwknop-2.6.10/debian/changelog
--- fwknop-2.6.10/debian/changelog 2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/changelog 2024-01-30 13:47:30.0 +
@@ -1,3 +1,15 @@
+fwknop (2.6.10-20.1) experimental; urgency=medium
+
+ [ Lukas Märdian ]
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+ * Account for additional t64 Breaks/Replaces (Closes #1062046).
+
+ [ Francois Marier ]
+ * Add "pcap capture not compiled in" to logcheck rules.
+
+ -- Lukas Märdian Tue, 30 Jan 2024 13:47:30 +
+
fwknop (2.6.10-20) unstable; urgency=medium
* Add debian/NEWS mentioning the required NFQ configuration change.
diff -Nru fwknop-2.6.10/debian/control fwknop-2.6.10/debian/control
--- fwknop-2.6.10/debian/control2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/control2024-01-30 13:47:30.0 +
@@ -34,7 +34,7 @@
Suggests:
libfko-doc,
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Description: FireWall KNock OPerator - development library
@@ -52,13 +52,16 @@
.
This package provides the development library and its headers.
-Package: libfko3
+Package: libfko3t64
+Provides: ${t64:Provides}
Section: libs
Architecture: linux-any
Multi-Arch: same
Breaks:
+ libfko3 (<< ${source:Version}),
libfko2,
Replaces:
+ libfko3,
libfko2,
Pre-Depends:
${misc:Pre-Depends},
@@ -105,7 +108,7 @@
Section: perl
Architecture: linux-any
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${perl:Depends},
${shlibs:Depends},
@@ -130,7 +133,7 @@
${misc:Pre-Depends},
Depends:
iptables,
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Suggests:
@@ -151,7 +154,7 @@
Package: fwknop-client
Architecture: linux-any
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Description: FireWall KNock OPerator client side - C version
diff -Nru fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server
fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server
--- fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server 2023-11-13
23:42:27.0 +
+++ fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server 2024-01-30
13:47:30.0 +
@@ -3,3 +3,4 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: Sniffing interface:
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: PCAP filter is: 'udp
port 62201'$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: Starting fwknopd main
event loop.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ fwknopd\[[0-9]+\]: pcap capture not
compiled in, forcing UDP server mode$
diff -Nru fwknop-2.6.10/debian/libfko3.dirs fwknop-2.6.10/debian/libfko3.dirs
--- fwknop-2.6.10/debian/libfko3.dirs 2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/libfko3.dirs 1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib
diff -Nru fwknop-2.6.10/debian/libfko3.install
fwknop-2.6.10/debian/libfko3.install
--- fwknop-2.6.10/debian/libfko3.install2023-11-13 23:42:27.0
+
+++ fwknop-2.6.10/debian/libfko3.install1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/*/libfko.so.*
diff -Nru fwknop-2.6.10/debian/libfko3.symbols
fwknop-2.6.10/debian/libfko3.symbols
--- fwknop-2.6.10/debian/libfko3.symbols2023-11-13 23:42:27.0
+
+++ fwknop-2.6.10/debian/libfko3.symbols1970-01-01 00:00:00.0
+
@@ -1,70 +0,0 @@
-libfko.so.3 libfko3 #MINVER#
- fko_base64_decode@Base 2.5
- fko_base64_encode@Base 2.5
- fko_decode_spa_data@Base 2.5
- fko_decrypt_spa_data@Base 2.5
- fko_destroy@Base 2.5
- fko_encode_spa_data@Base 2.5
- fko_encrypt_spa_data@Base 2.5
- fko_encryption_type@Base 2.5
- fko_errstr@Base 2.5
- fko_get_encoded_data@Base 2.5
- fko_get_gpg_exe@Base
Bug#1061958: fwknop: NMU diff for 64-bit time_t transition
Am 30.01.24 um 19:36 schrieb Francois Marier: On 2024-01-30 at 05:48:11, Lukas Märdian (sl...@debian.org) wrote: 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. No objections from me. If you'd like to create a merge request on https://salsa.debian.org/debian/fwknop, then I can merge and then you can upload to unstable at your convenience. Please see https://salsa.debian.org/debian/fwknop/-/merge_requests/2 It also addresses the Breaks/Replaces issue reported by Helmut/dumat in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1062046 I uploaded this as ~exp2 in to experimental. Thanks, Lukas
Bug#1061958: fwknop: NMU diff for 64-bit time_t transition
On 2024-01-30 at 05:48:11, Lukas Märdian (sl...@debian.org) wrote: > 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. No objections from me. If you'd like to create a merge request on https://salsa.debian.org/debian/fwknop, then I can merge and then you can upload to unstable at your convenience. Francois signature.asc Description: PGP signature
Bug#1061958: fwknop: NMU diff for 64-bit time_t transition
Source: fwknop
Version: 2.6.10-20
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
fwknop 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 fwknop
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.5.0-14-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)
diff -Nru fwknop-2.6.10/debian/changelog fwknop-2.6.10/debian/changelog
--- fwknop-2.6.10/debian/changelog 2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/changelog 2024-01-30 13:47:30.0 +
@@ -1,3 +1,10 @@
+fwknop (2.6.10-20.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Lukas Märdian Tue, 30 Jan 2024 13:47:30 +
+
fwknop (2.6.10-20) unstable; urgency=medium
* Add debian/NEWS mentioning the required NFQ configuration change.
diff -Nru fwknop-2.6.10/debian/control fwknop-2.6.10/debian/control
--- fwknop-2.6.10/debian/control2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/control2024-01-30 13:47:30.0 +
@@ -34,7 +34,7 @@
Suggests:
libfko-doc,
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Description: FireWall KNock OPerator - development library
@@ -52,7 +52,8 @@
.
This package provides the development library and its headers.
-Package: libfko3
+Package: libfko3t64
+Provides: ${t64:Provides}
Section: libs
Architecture: linux-any
Multi-Arch: same
@@ -105,7 +106,7 @@
Section: perl
Architecture: linux-any
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${perl:Depends},
${shlibs:Depends},
@@ -130,7 +131,7 @@
${misc:Pre-Depends},
Depends:
iptables,
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Suggests:
@@ -151,7 +152,7 @@
Package: fwknop-client
Architecture: linux-any
Depends:
- libfko3 (= ${binary:Version}),
+ libfko3t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Description: FireWall KNock OPerator client side - C version
diff -Nru fwknop-2.6.10/debian/libfko3.dirs fwknop-2.6.10/debian/libfko3.dirs
--- fwknop-2.6.10/debian/libfko3.dirs 2023-11-13 23:42:27.0 +
+++ fwknop-2.6.10/debian/libfko3.dirs 1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib
diff -Nru fwknop-2.6.10/debian/libfko3.install
fwknop-2.6.10/debian/libfko3.install
--- fwknop-2.6.10/debian/libfko3.install2023-11-13 23:42:27.0
+
+++ fwknop-2.6.10/debian/libfko3.install1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/*/libfko.so.*
diff -Nru fwknop-2.6.10/debian/libfko3.symbols
fwknop-2.6.10/debian/libfko3.symbols
--- fwknop-2.6.10/debian/libfko3.symbols2023-11-13 23:42:27.0
+
+++ fwknop-2.6.10/debian/libfko3.symbols1970-01-01 00:00:00.0
+
@@ -1,70 +0,0 @@
-libfko.so.3 libfko3 #MINVER#
- fko_base64_decode@Base 2.5
- fko_base64_encode@Base 2.5
- fko_decode_spa_data@Base 2.5
- fko_decrypt_spa_data@Base 2.5
- fko_destroy@Base 2.5
- fko_encode_spa_data@Base 2.5
- fko_encrypt_spa_data@Base 2.5
- fko_encryption_type@Base 2.5
- fko_errstr@Base 2.5
-
