tags 1016129 + patch buster bullseye bookworm sid
thanks
Upstream discussion managed to find the precise fix for pcap 1.10
compatibility that’s missing in Debian’s version:
https://github.com/fgont/ipv6toolkit/issues/78#issuecomment-1197453179
debdiff (±version) attached. Would you prefer for me to NMU, do a
maintainer-agreed regular upload (as -2), or handle this yourself,
Octavio?
Tagging bullseye *and* buster because this must be fixed in these
releases as well:
• the bullseye package, as-is, is broken, so this is an RC fix there
• buster “as-is” works but if libpcap0.8 is upgraded, either via
buster-backports or by mixing buster and bullseye packages, it’ll
break (and we cannot retrofit a matching Breaks to libpcap0.8 in
bullseye any more now it’s released) so buster’s will either need
the patch applied or a versioned depends on libpcap0.8 (<< 1.10)
Will you communicate with the SRM or do you wish for me to handle that?
Thanks in advance,
//mirabilos
--
[17:15:07] Lukas Degener: Kleines Asterix-Latinum für Softwaretechniker:
veni, vidi, fixi(t) ;-)diff -Nru ipv6toolkit-2.0+ds.1/debian/changelog
ipv6toolkit-2.0+ds.1/debian/changelog
--- ipv6toolkit-2.0+ds.1/debian/changelog 2020-08-05 06:21:55.000000000
+0200
+++ ipv6toolkit-2.0+ds.1/debian/changelog 2022-07-31 21:43:23.000000000
+0200
@@ -1,3 +1,10 @@
+ipv6toolkit (2.0+ds.1-1.1~~) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for pcap 1.10 compatibility (Closes: #1016129)
+
+ -- Thorsten Glaser <t...@mirbsd.de> Sun, 31 Jul 2022 21:43:23 +0200
+
ipv6toolkit (2.0+ds.1-1) unstable; urgency=medium
* Refreshed patches using gbp pq export. Added:
diff -Nru
ipv6toolkit-2.0+ds.1/debian/patches/03b0fdd42cf36c0070472afbb9b81a9ca62e1109.patch
ipv6toolkit-2.0+ds.1/debian/patches/03b0fdd42cf36c0070472afbb9b81a9ca62e1109.patch
---
ipv6toolkit-2.0+ds.1/debian/patches/03b0fdd42cf36c0070472afbb9b81a9ca62e1109.patch
1970-01-01 01:00:00.000000000 +0100
+++
ipv6toolkit-2.0+ds.1/debian/patches/03b0fdd42cf36c0070472afbb9b81a9ca62e1109.patch
2022-07-31 21:43:17.000000000 +0200
@@ -0,0 +1,25 @@
+Applied-Upstream: commit:03b0fdd42cf36c0070472afbb9b81a9ca62e1109
+From: Fernando Gont <fg...@si6networks.com>
+Subject: Set pcap timeout to 1 for all platforms.
+Author: Leonard Marschke (lmm-git)
+
+--- a/tools/libipv6.h
++++ b/tools/libipv6.h
+@@ -123,12 +123,17 @@ struct filters{
+ #define PCAP_NETMASK_UNKNOWN 0xffffffff
+ #endif
+
++/* XXX:
++At some point we were setting the timeout differently for different
platforms. Should double-check, but doesn't seem to make sense.
++
+ #if defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) ||
defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(sun) ||
defined(__sun)
+ #define PCAP_TIMEOUT 1
+ #else
+ #define PCAP_TIMEOUT 0
+ #endif
++*/
+
++#define PCAP_TIMEOUT 1
+
+ #define PCAP_IPV6_FILTER "ip6"
+ #define PCAP_TCPV6_FILTER "ip6 and tcp"
diff -Nru ipv6toolkit-2.0+ds.1/debian/patches/series
ipv6toolkit-2.0+ds.1/debian/patches/series
--- ipv6toolkit-2.0+ds.1/debian/patches/series 2020-08-05 06:21:55.000000000
+0200
+++ ipv6toolkit-2.0+ds.1/debian/patches/series 2022-07-31 21:42:09.000000000
+0200
@@ -5,3 +5,4 @@
0005-Silence-compiler-warnings.patch
0006-Silence-misleading-indentation-warnings.patch
0007-strncpy-len-must-include-the-terminating-nul-byte.patch
+03b0fdd42cf36c0070472afbb9b81a9ca62e1109.patch
