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.000000000 +0000
+++ fwknop-2.6.10/debian/changelog 2024-02-29 04:44:10.000000000 +0000
@@ -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 <mwhud...@debian.org> Thu, 29 Feb 2024 04:44:10 +0000
+
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/control 2023-11-13 23:42:27.000000000 +0000
+++ fwknop-2.6.10/debian/control 2024-02-29 04:44:10.000000000 +0000
@@ -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.000000000 +0000
+++ fwknop-2.6.10/debian/fwknop-server.logcheck.ignore.server 2024-02-29
04:44:09.000000000 +0000
@@ -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.000000000 +0000
+++ fwknop-2.6.10/debian/libfko3.dirs 1970-01-01 00:00:00.000000000 +0000
@@ -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.install 2023-11-13 23:42:27.000000000
+0000
+++ fwknop-2.6.10/debian/libfko3.install 1970-01-01 00:00:00.000000000
+0000
@@ -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.symbols 2023-11-13 23:42:27.000000000
+0000
+++ fwknop-2.6.10/debian/libfko3.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -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
- fko_get_gpg_recipient@Base 2.5
- fko_get_gpg_signature_fpr@Base 2.5
- fko_get_gpg_signature_id@Base 2.5
- fko_get_gpg_signature_status@Base 2.5
- fko_get_gpg_signature_summary@Base 2.5
- fko_get_gpg_signature_verify@Base 2.5
- fko_get_gpg_signer@Base 2.5
- fko_get_rand_value@Base 2.5
- fko_get_raw_spa_digest@Base 2.5
- fko_get_raw_spa_digest_type@Base 2.5
- fko_get_spa_client_timeout@Base 2.5
- fko_get_spa_data@Base 2.5
- fko_get_spa_digest@Base 2.5
- fko_get_spa_digest_type@Base 2.5
- fko_get_spa_encryption_mode@Base 2.5
- fko_get_spa_encryption_type@Base 2.5
- fko_get_spa_hmac@Base 2.5
- fko_get_spa_hmac_type@Base 2.5
- fko_get_spa_message@Base 2.5
- fko_get_spa_message_type@Base 2.5
- fko_get_spa_nat_access@Base 2.5
- fko_get_spa_server_auth@Base 2.5
- fko_get_timestamp@Base 2.5
- fko_get_username@Base 2.5
- fko_get_version@Base 2.5
- fko_gpg_errstr@Base 2.5
- fko_gpg_signature_fpr_match@Base 2.5
- fko_gpg_signature_id_match@Base 2.5
- fko_key_gen@Base 2.5
- fko_new@Base 2.5
- fko_new_with_data@Base 2.5
- fko_set_gpg_exe@Base 2.5
- fko_set_gpg_home_dir@Base 2.5
- fko_set_gpg_ignore_verify_error@Base 2.5
- fko_set_gpg_recipient@Base 2.5
- fko_set_gpg_signature_verify@Base 2.5
- fko_set_gpg_signer@Base 2.5
- fko_set_rand_value@Base 2.5
- fko_set_raw_spa_digest@Base 2.5
- fko_set_raw_spa_digest_type@Base 2.5
- fko_set_spa_client_timeout@Base 2.5
- fko_set_spa_data@Base 2.5
- fko_set_spa_digest@Base 2.5
- fko_set_spa_digest_type@Base 2.5
- fko_set_spa_encryption_mode@Base 2.5
- fko_set_spa_encryption_type@Base 2.5
- fko_set_spa_hmac@Base 2.5
- fko_set_spa_hmac_type@Base 2.5
- fko_set_spa_message@Base 2.5
- fko_set_spa_message_type@Base 2.5
- fko_set_spa_nat_access@Base 2.5
- fko_set_spa_server_auth@Base 2.5
- fko_set_timestamp@Base 2.5
- fko_set_username@Base 2.5
- fko_spa_data_final@Base 2.5
- fko_verify_hmac@Base 2.5
diff -Nru fwknop-2.6.10/debian/libfko3t64.dirs
fwknop-2.6.10/debian/libfko3t64.dirs
--- fwknop-2.6.10/debian/libfko3t64.dirs 1970-01-01 00:00:00.000000000
+0000
+++ fwknop-2.6.10/debian/libfko3t64.dirs 2024-02-29 04:44:09.000000000
+0000
@@ -0,0 +1 @@
+usr/lib
diff -Nru fwknop-2.6.10/debian/libfko3t64.install
fwknop-2.6.10/debian/libfko3t64.install
--- fwknop-2.6.10/debian/libfko3t64.install 1970-01-01 00:00:00.000000000
+0000
+++ fwknop-2.6.10/debian/libfko3t64.install 2024-02-29 04:44:09.000000000
+0000
@@ -0,0 +1 @@
+usr/lib/*/libfko.so.*
diff -Nru fwknop-2.6.10/debian/libfko3t64.lintian-overrides
fwknop-2.6.10/debian/libfko3t64.lintian-overrides
--- fwknop-2.6.10/debian/libfko3t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ fwknop-2.6.10/debian/libfko3t64.lintian-overrides 2024-02-29
04:44:09.000000000 +0000
@@ -0,0 +1 @@
+libfko3t64: package-name-doesnt-match-sonames libfko3
diff -Nru fwknop-2.6.10/debian/libfko3t64.symbols
fwknop-2.6.10/debian/libfko3t64.symbols
--- fwknop-2.6.10/debian/libfko3t64.symbols 1970-01-01 00:00:00.000000000
+0000
+++ fwknop-2.6.10/debian/libfko3t64.symbols 2024-02-29 04:44:09.000000000
+0000
@@ -0,0 +1,70 @@
+libfko.so.3 libfko3t64 #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
+ fko_get_gpg_recipient@Base 2.5
+ fko_get_gpg_signature_fpr@Base 2.5
+ fko_get_gpg_signature_id@Base 2.5
+ fko_get_gpg_signature_status@Base 2.5
+ fko_get_gpg_signature_summary@Base 2.5
+ fko_get_gpg_signature_verify@Base 2.5
+ fko_get_gpg_signer@Base 2.5
+ fko_get_rand_value@Base 2.5
+ fko_get_raw_spa_digest@Base 2.5
+ fko_get_raw_spa_digest_type@Base 2.5
+ fko_get_spa_client_timeout@Base 2.5
+ fko_get_spa_data@Base 2.5
+ fko_get_spa_digest@Base 2.5
+ fko_get_spa_digest_type@Base 2.5
+ fko_get_spa_encryption_mode@Base 2.5
+ fko_get_spa_encryption_type@Base 2.5
+ fko_get_spa_hmac@Base 2.5
+ fko_get_spa_hmac_type@Base 2.5
+ fko_get_spa_message@Base 2.5
+ fko_get_spa_message_type@Base 2.5
+ fko_get_spa_nat_access@Base 2.5
+ fko_get_spa_server_auth@Base 2.5
+ fko_get_timestamp@Base 2.5
+ fko_get_username@Base 2.5
+ fko_get_version@Base 2.5
+ fko_gpg_errstr@Base 2.5
+ fko_gpg_signature_fpr_match@Base 2.5
+ fko_gpg_signature_id_match@Base 2.5
+ fko_key_gen@Base 2.5
+ fko_new@Base 2.5
+ fko_new_with_data@Base 2.5
+ fko_set_gpg_exe@Base 2.5
+ fko_set_gpg_home_dir@Base 2.5
+ fko_set_gpg_ignore_verify_error@Base 2.5
+ fko_set_gpg_recipient@Base 2.5
+ fko_set_gpg_signature_verify@Base 2.5
+ fko_set_gpg_signer@Base 2.5
+ fko_set_rand_value@Base 2.5
+ fko_set_raw_spa_digest@Base 2.5
+ fko_set_raw_spa_digest_type@Base 2.5
+ fko_set_spa_client_timeout@Base 2.5
+ fko_set_spa_data@Base 2.5
+ fko_set_spa_digest@Base 2.5
+ fko_set_spa_digest_type@Base 2.5
+ fko_set_spa_encryption_mode@Base 2.5
+ fko_set_spa_encryption_type@Base 2.5
+ fko_set_spa_hmac@Base 2.5
+ fko_set_spa_hmac_type@Base 2.5
+ fko_set_spa_message@Base 2.5
+ fko_set_spa_message_type@Base 2.5
+ fko_set_spa_nat_access@Base 2.5
+ fko_set_spa_server_auth@Base 2.5
+ fko_set_timestamp@Base 2.5
+ fko_set_username@Base 2.5
+ fko_spa_data_final@Base 2.5
+ fko_verify_hmac@Base 2.5
