Hi,
On 2024-07-18 01:15, Reinhard Tartler wrote:
> Aurelien Jarno <aure...@debian.org> writes:
>
> > I have just uploaded a NMU to delayed/2 using the above strategy. Please
> > feel free to ask me to delay or cancel it. You will find the
> > corresponding debdiff attached.
>
> I've looked over the patch, it LGTM. Thank you for providing the patch!
>
> I understand it is going to land later today, that's awesome! If for
> some reason it should fall throught he cracks, please upload it directly
> to sid.
It appears that the fix was not fully correct and trigger an autopkgtest
regression on armhf and armel. I took the freedom to upload a fix,
please find the debdiff attached.
Regards
Aurelien
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://aurel32.net
diff -Nru gopacket-1.1.19/debian/changelog gopacket-1.1.19/debian/changelog
--- gopacket-1.1.19/debian/changelog 2024-07-16 22:14:26.000000000 +0200
+++ gopacket-1.1.19/debian/changelog 2024-07-19 23:22:16.000000000 +0200
@@ -1,3 +1,10 @@
+gopacket (1.1.19-6.2) unstable; urgency=medium
+
+ * Non maintainer upload.
+ * Better fix for compatibility with glibc 2.39.
+
+ -- Aurelien Jarno <aure...@debian.org> Fri, 19 Jul 2024 21:22:16 +0000
+
gopacket (1.1.19-6.1) unstable; urgency=medium
* Non maintainer upload.
diff -Nru
gopacket-1.1.19/debian/patches/0002-fix-time-type-with-__USE_TIME_BITS64.patch
gopacket-1.1.19/debian/patches/0002-fix-time-type-with-__USE_TIME_BITS64.patch
---
gopacket-1.1.19/debian/patches/0002-fix-time-type-with-__USE_TIME_BITS64.patch
2024-07-16 22:14:26.000000000 +0200
+++
gopacket-1.1.19/debian/patches/0002-fix-time-type-with-__USE_TIME_BITS64.patch
2024-07-19 23:21:35.000000000 +0200
@@ -1,20 +1,27 @@
From: Aurelien Jarno <aure...@debian.org>
-Date: Tue, 16 Jul 2024 19:28:53 +0200
+Date: Fri, 19 Jul 2024 23:21:31 +0200
Subject: fix time type with __USE_TIME_BITS64
---
- pcap/pcap_unix.go.orig | 3 ---
- 1 file changed, 3 deletions(-)
+ pcap/pcap_unix.go | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
--- a/pcap/pcap_unix.go
-+++ b/pcap/pcap_unix.go.orig
-@@ -111,9 +111,6 @@ int pcap_tstamp_type_name_to_val(const char* t) {
- #elif __ANDROID__
++++ b/pcap/pcap_unix.go
+@@ -112,8 +112,14 @@ int pcap_tstamp_type_name_to_val(const c
#define gopacket_time_secs_t __kernel_time_t
#define gopacket_time_usecs_t __kernel_suseconds_t
--#elif __GLIBC__
+ #elif __GLIBC__
-#define gopacket_time_secs_t __time_t
-#define gopacket_time_usecs_t __suseconds_t
++#define gopacket_time_secs_t time_t
++// Due to https://sourceware.org/bugzilla/show_bug.cgi?id=31510 we need a
special case of gopacket_time_usecs_t
++// Once fixed on the GNU libc side, the whole special __GLIBC__ case can be
removed.
++#if defined(__USE_TIME64_REDIRECTS) || (__TIMESIZE == 32 && __USE_TIME_BITS64)
++#define gopacket_time_usecs_t __suseconds64_t
++#else
++#define gopacket_time_usecs_t suseconds_t
++#endif
#else // Some form of linux/bsd/etc...
#include <sys/param.h>
#ifdef __OpenBSD__
