Date: Thu, 20 Nov 2025 15:48:02 -0500 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: "Sergey A. Osokin" <osa@freebsd.org>, Cy Schubert <Cy.Schubert@cschubert.com> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: fb243f528ad1 - main - net/wireshark: Update to 4.6.1 Message-ID: <6e9185fe-a4d4-48c8-a11b-2767e925e158@FreeBSD.org> In-Reply-To: <aR9vNVZMqtDVUO8U@FreeBSD.org> References: <691f37d0.39ea2.482d6c2d@gitrepo.freebsd.org> <20251120164354.DD10D22E@slippy.cwsent.com> <aR9vNVZMqtDVUO8U@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
I was baffled as to why I didn't see these changes, only to realize my OPTIONS seed had changed for some other testing I was doing. Should be fixed now. Joe On 11/20/25 14:42, Sergey A. Osokin wrote: > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=291114 > > On Thu, Nov 20, 2025 at 08:43:54AM -0800, Cy Schubert wrote: >> This fails to build here. >> >> ====> Compressing man pages (compress-man) >> ====> Checking for pkg-plist issues (check-plist) >> ===> Parsing plist >> ===> Checking for items in STAGEDIR missing from pkg-plist >> Error: Orphaned: include/wireshark/c128/bits.h >> Error: Orphaned: include/wireshark/c128/endian.h >> Error: Orphaned: include/wireshark/c128/integer.h >> Error: Orphaned: include/wireshark/c128/types.h >> ===> Checking for items in pkg-plist which are not in STAGEDIR >> Error: Missing: include/wireshark/bits.h >> Error: Missing: include/wireshark/endian.h >> Error: Missing: include/wireshark/integer.h >> Error: Missing: include/wireshark/types.h >> ===> Error: Plist issues found. >> *** Error code 1 >> >> Stop. >> make: stopped making "check-orphans package" in /usr/ports/net/wireshark >> stinky# >> >> >> -- >> Cheers, >> Cy Schubert <Cy.Schubert@cschubert.com> >> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org >> NTP: <cy@nwtime.org> Web: https://nwtime.org >> >> e**(i*pi)+1=0 >> >> >> >> In message <691f37d0.39ea2.482d6c2d@gitrepo.freebsd.org>, Joe Marcus Clarke >> wri >> tes: >>> The branch main has been updated by marcus: >>> >>> URL: https://cgit.FreeBSD.org/ports/commit/?id=fb243f528ad1f297398ed0731f313d >>> 248424b1fd >>> >>> commit fb243f528ad1f297398ed0731f313d248424b1fd >>> Author: Joe Marcus Clarke <marcus@FreeBSD.org> >>> AuthorDate: 2025-11-20 15:43:48 +0000 >>> Commit: Joe Marcus Clarke <marcus@FreeBSD.org> >>> CommitDate: 2025-11-20 15:43:48 +0000 >>> >>> net/wireshark: Update to 4.6.1 >>> >>> See https://www.wireshark.org/docs/relnotes/wireshark-4.6.1.html for the >>> list of changes in this release. >>> --- >>> net/wireshark/Makefile | 2 +- >>> net/wireshark/distinfo | 6 +++--- >>> net/wireshark/files/patch-epan_dissectors_packet-kerberos.c | 11 ----------- >>> net/wireshark/pkg-plist | 4 ++-- >>> 4 files changed, 6 insertions(+), 17 deletions(-) >>> >>> diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile >>> index cd5ae9eb186f..60bc533c8ee5 100644 >>> --- a/net/wireshark/Makefile >>> +++ b/net/wireshark/Makefile >>> @@ -1,5 +1,5 @@ >>> PORTNAME= wireshark >>> -DISTVERSION= 4.6.0 >>> +DISTVERSION= 4.6.1 >>> 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 75b7f51e9ede..c93eba219678 100644 >>> --- a/net/wireshark/distinfo >>> +++ b/net/wireshark/distinfo >>> @@ -1,3 +1,3 @@ >>> -TIMESTAMP = 1760129032 >>> -SHA256 (wireshark-4.6.0.tar.xz) = ab016463062bb635285b9678dd45ddd84c65938911 >>> fd40b3cca9a903a08ad8d9 >>> -SIZE (wireshark-4.6.0.tar.xz) = 50726944 >>> +TIMESTAMP = 1763648117 >>> +SHA256 (wireshark-4.6.1.tar.xz) = 5f43055db213e16aed6a064a8b4fdb56092106f18c >>> 19e8890482c058b0a1dd85 >>> +SIZE (wireshark-4.6.1.tar.xz) = 50596888 >>> diff --git a/net/wireshark/files/patch-epan_dissectors_packet-kerberos.c b/ne >>> t/wireshark/files/patch-epan_dissectors_packet-kerberos.c >>> deleted file mode 100644 >>> index 13c7bfbd0ac6..000000000000 >>> --- a/net/wireshark/files/patch-epan_dissectors_packet-kerberos.c >>> +++ /dev/null >>> @@ -1,11 +0,0 @@ >>> ---- epan/dissectors/packet-kerberos.c.orig 2025-10-16 15:54:37 UTC >>> -+++ epan/dissectors/packet-kerberos.c >>> -@@ -3401,7 +3401,7 @@ read_keytab_file(const char *filename) >>> - >>> - /* generate origin string, describing where this key ca >>> me from */ >>> - for(i=0;i<key.principal->name.name_string.len;i++){ >>> -- wmem_strbuf_append_printf(str_principal, "%s%s" >>> ,(i?"/":""),key.principal->name.name_string.val[i])); >>> -+ wmem_strbuf_append_printf(str_principal, "%s%s" >>> ,(i?"/":""),key.principal->name.name_string.val[i]); >>> - } >>> - wmem_strbuf_append_printf(str_principal, "@%s",key.prin >>> cipal->realm); >>> - new_key->key_origin = (char*)wmem_strbuf_get_str(str_pr >>> incipal); >>> diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist >>> index 3523d98eea36..d182193e4ec1 100644 >>> --- a/net/wireshark/pkg-plist >>> +++ b/net/wireshark/pkg-plist >>> @@ -697,10 +697,10 @@ bin/tshark >>> %%DEVELOPMENT%%lib/cmake/wireshark/WiresharkTargets.cmake >>> lib/libwireshark.so >>> lib/libwireshark.so.19 >>> -lib/libwireshark.so.19.0.0 >>> +lib/libwireshark.so.19.0.1 >>> lib/libwiretap.so >>> lib/libwiretap.so.16 >>> -lib/libwiretap.so.16.0.0 >>> +lib/libwiretap.so.16.0.1 >>> lib/libwsutil.so >>> lib/libwsutil.so.17 >>> lib/libwsutil.so.17.0.0 >>> >> >>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6e9185fe-a4d4-48c8-a11b-2767e925e158>