From nobody Fri Jan 5 14:49:58 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T65w65Llmz57GVk; Fri, 5 Jan 2024 14:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T65w63L0zz4hZV; Fri, 5 Jan 2024 14:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704466198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OsRgN2g83BzNXliSnG/WV/Z2zufLVp6yj2nfMQz/hsU=; b=WW3HiB3Yyzv85xAJsyfx6t8BI26kegQev7M3QuBvYQIrFCE5NPMxvdKe61mHqkCqhvkeAp CkDvTKAF4NttqwUtfhfdkuS7l6qSdITaw3W7088sQS8tn81WLiEaaOJQ9HoU+gM088b4GI nXtzwzOgnhoef7iGpWjPc4yxJHePRscNRh8AfjvrevY7RsX0PbmHMowgv2KWKfX/DGX/Hs MQ+wJ9fEysHbHCcb1bAG7WBVRcusB76y77r6phkEZRoq+Y6XBS8vHfLilUQf8jkNOhORvf aDE3CmJuUylueSBt2uX7YuRX1nW1GyXsqUEHi/RaemfvDAYJ9RNpKJRDttPRcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704466198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OsRgN2g83BzNXliSnG/WV/Z2zufLVp6yj2nfMQz/hsU=; b=Gt9ojuspojWQ0p+eYy8HIIE4pc2VLaWPu+1+cDtn20X9bo5FSgKHIjl4i+H6gpMIoBIA6c zGG9lYUDSnxX8pDrCiPdkWFvZuKS+/nj9jXxV5C7BvlMqqHnjxmo1MIJpBBXl1k4Ac37e1 cprUEK4o3ru8kNMcX3/knGL3k9EayPn3JiAg2Y3YqTh3wF+T7FBJRxlmddA6yk8x66wYMn ehYS6XJ78mTAyM6QDJrPIQodHAeM2k7gsVKMdHfknsJ+zdqPdjyj/Hvq2GCPE4CX0/qBDE dDSlIyhnmWziWVFSIW+/fssaBevsH5CNboenfhAWQMlASRN31fYMduRTsOGf4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704466198; a=rsa-sha256; cv=none; b=leWXWLAVdqXn6XH9NjEKTUxhI8dMHpmtfu9p9M/J/k4Dgrs/zig9IZJcuDVULbgGAbmtL7 UVaqZ904eqQ3Glf5oV43YCHjPrFTEPKAljWbZd5Y8edFaI5TvNeTT4tg23JRXi/anCBqPh ATQAsYH76CxO/g0A/ECBs0aPmb0XLIPqrF3mDN9cFz0Ydex44fTwlOLh/XCNWDs1bX43Vt bogO+sFqnREvbKw1pVLXVAuZdNH7acaubkkuT6O1oCjdlGa3Kdm1k+sJKUoP/gn3YV/3fe nuFLCwmf0JYnTZrZGXL3K/AxyWkf1AGRzC4+jPaa30p4/a0Dsa94XJpdowTCtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T65w62QCYz12Dc; Fri, 5 Jan 2024 14:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 405EnwvB070798; Fri, 5 Jan 2024 14:49:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405Enw1n070795; Fri, 5 Jan 2024 14:49:58 GMT (envelope-from git) Date: Fri, 5 Jan 2024 14:49:58 GMT Message-Id: <202401051449.405Enw1n070795@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 43bd3889870a - main - net/wireshark: Update to 4.2.2. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43bd3889870a55dc7c29ac42152656d14434c804 Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=43bd3889870a55dc7c29ac42152656d14434c804 commit 43bd3889870a55dc7c29ac42152656d14434c804 Author: Joe Marcus Clarke AuthorDate: 2024-01-05 14:47:42 +0000 Commit: Joe Marcus Clarke 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