git: c5b2897d1a05 - main - net/wireshark: Update to 4.2.0

From: Joe Marcus Clarke <marcus_at_FreeBSD.org>
Date: Fri, 17 Nov 2023 19:53:25 UTC
The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c5b2897d1a05eb81e1f4f688c23ddb10fddf0a6b

commit c5b2897d1a05eb81e1f4f688c23ddb10fddf0a6b
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2023-11-17 19:53:06 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2023-11-17 19:53:06 +0000

    net/wireshark: Update to 4.2.0
    
    See https://www.wireshark.org/docs/relnotes/wireshark-4.2.0.html for a
    list of changes in this release.
    
    Of note to FreeBSD users, wireshark now uses Qt6 (rather than 5), and
    development files (e.g., headers), while installed by default can be
    disabled by unchecking the DEVELOPMENT option.
---
 net/wireshark/files/patch-wsutil_ws__strptime.c | 33 +++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/net/wireshark/files/patch-wsutil_ws__strptime.c b/net/wireshark/files/patch-wsutil_ws__strptime.c
new file mode 100644
index 000000000000..4f6042e77541
--- /dev/null
+++ b/net/wireshark/files/patch-wsutil_ws__strptime.c
@@ -0,0 +1,33 @@
+--- wsutil/ws_strptime.c.orig	2023-11-17 16:54:52 UTC
++++ wsutil/ws_strptime.c
+@@ -197,9 +197,12 @@ ws_strptime(const char *buf, const char *fmt, struct t
+ 	    day_offset = -1, week_offset = 0, offs, mandatory;
+ 	const char *new_fmt;
+ 	long tm_gmtoff;
++	struct tm *gtm;
++	const time_t zero_secs = 0;
+ 	const char *tm_zone;
+ 
+ 	bp = (const unsigned char *)buf;
++	gtm = localtime(&zero_secs);
+ 
+ 	while (bp != NULL && (c = *fmt++) != '\0') {
+ 		/* Clear `alternate' modifier prior to new conversion. */
+@@ -570,7 +573,7 @@ namedzone:
+ 				}
+ 				/* 'J' is local time */
+ 				if (delim(bp[1]) && *bp == 'J') {
+-					tm_gmtoff = -timezone;
++					tm_gmtoff = gtm->tm_gmtoff;
+ 					tm_zone = NULL; /* XXX */
+ 					SET_ZONEP(zonep, tm_gmtoff, tm_zone);
+ 					bp++;
+@@ -605,7 +608,7 @@ namedzone:
+ 						 NULL, 2);
+ 				if (ep != NULL) {
+ 					tm->tm_isdst = i;
+-					tm_gmtoff = -timezone;
++					tm_gmtoff = gtm->tm_gmtoff;
+ 					tm_zone = tzname[i];
+ 					SET_ZONEP(zonep, tm_gmtoff, tm_zone);
+ 					bp = ep;