Date: Fri, 5 Jan 2024 14:49:58 GMT From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 43bd3889870a - main - net/wireshark: Update to 4.2.2. Message-ID: <202401051449.405Enw1n070795@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=43bd3889870a55dc7c29ac42152656d14434c804 commit 43bd3889870a55dc7c29ac42152656d14434c804 Author: Joe Marcus Clarke <marcus@FreeBSD.org> AuthorDate: 2024-01-05 14:47:42 +0000 Commit: Joe Marcus Clarke <marcus@FreeBSD.org> CommitDate: 2024-01-05 14:49:52 +0000 net/wireshark: Update to 4.2.2. See https://www.wireshark.org/docs/relnotes/wireshark-4.2.2.html and https://www.wireshark.org/docs/relnotes/wireshark-4.2.1.html for changes in this release over 4.2.0. --- net/wireshark/Makefile | 2 +- net/wireshark/distinfo | 6 ++--- net/wireshark/files/patch-wsutil_ws__strptime.c | 33 ------------------------- net/wireshark/pkg-plist | 4 +-- 4 files changed, 6 insertions(+), 39 deletions(-) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index f0e7b4296469..17692669ccb8 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,5 +1,5 @@ PORTNAME= wireshark -DISTVERSION= 4.2.0 +DISTVERSION= 4.2.2 CATEGORIES= net MASTER_SITES= https://1.na.dl.wireshark.org/src/ \ https://1.eu.dl.wireshark.org/src/ \ diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 38360969ca21..64e7c740d7fb 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1700168149 -SHA256 (wireshark-4.2.0.tar.xz) = 0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b -SIZE (wireshark-4.2.0.tar.xz) = 44941948 +TIMESTAMP = 1704464098 +SHA256 (wireshark-4.2.2.tar.xz) = 9e3672be8c6caf9279a5a13582d6711ab699ae2a79323e92a99409c1ead98521 +SIZE (wireshark-4.2.2.tar.xz) = 44918888 diff --git a/net/wireshark/files/patch-wsutil_ws__strptime.c b/net/wireshark/files/patch-wsutil_ws__strptime.c deleted file mode 100644 index 4f6042e77541..000000000000 --- a/net/wireshark/files/patch-wsutil_ws__strptime.c +++ /dev/null @@ -1,33 +0,0 @@ ---- 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; diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 3b7006a5960f..290e167345dd 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -672,10 +672,10 @@ bin/tshark %%DEVELOPMENT%%lib/cmake/wireshark/WiresharkTargets.cmake lib/libwireshark.so lib/libwireshark.so.17 -lib/libwireshark.so.17.0.0 +lib/libwireshark.so.17.0.2 lib/libwiretap.so lib/libwiretap.so.14 -lib/libwiretap.so.14.0.0 +lib/libwiretap.so.14.1.0 lib/libwsutil.so lib/libwsutil.so.15 lib/libwsutil.so.15.0.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401051449.405Enw1n070795>