tshark: Update to version 4.6.1

- Update from version 4.6.0 to 4.6.1
- Update of rootfile
- Changelog
    4.6.1
	Bug Fixes
	    wnpa-sec-2025-05 BPv7 dissector crash. Issue 20770.
	    wnpa-sec-2025-06 Kafka dissector crash. Issue 20823.
	The following bugs have been fixed:
	    L2CAP dissector doesn’t understand retransmission mode. Issue 2241.
	    DNS HIP dissector labels PK algorithm as HIT length. Issue 20768.
	    clang-cl error in "packet-zbee-direct.c" Issue 20776.
	    Writing to an LZ4-compressed output file might fail. Issue 20779.
	    endian.h conflics with libc for building plugins. Issue 20786.
	    TShark crash caused by Lua plugin. Issue 20794.
	    Wireshark stalls for a few seconds when selecting specific messages.
		Issue 20797.
	    TLS Abbreviated Handshake Using New Session Ticket. Issue 20802.
	    Custom websocket dissector does not run. Issue 20803.
	    WINREG QueryValue triggers dissector bug in packet-dcerpc.c. Issue 20813.
	    Lua: FileHandler causing crash when reading packets. Issue 20817.
	    Apply As Filter for field with FT_NONE and BASE_NONE for a single byte
		does not use the hex value. Issue 20818.
	    Layout preference Pane 3 problem with selecting Packet Diagram or None.
		Issue 20819.
	    TCP dissector creates invalid packet diagram. Issue 20820.
	    Too many nested VLAN tags when opening as File Format. Issue 20831.
	    Omnipeek files not working in 4.6.0. Issue 20842.
	    Support UTF-16 strings in the IsoBus dissector for the string operations.
		Issue 20845.
	    SNMP getBulkRequest request-id does not get filtered for correctly.
		Issue 20849.
	    Fuzz job issue: fuzz-2025-11-12-12064814316.pcap. Issue 20852.
	    UDP Port 853 (DoQ) should be decoded as QUIC. Issue 20856.
	Updated Protocol Support
		802.11 Radiotap, AC DR, ASN.1 BER, ASN.1 PER, BPv7, BT L2CAP, CFM,
		 Darwin, DNS, DTLS, EAPOL-MKA, HTTP, HTTP3, ISObus VT, KRB5, LTP,
		 NAS-EPS, NETDFS, NMEA 0183, P1, RPC_NETLOGON, RTSE, SGP.22, SGP.32,
		 SMB, SNMP, TCP, TECMP, TFTP, VLAN, WINREG, X509AF, X509SAT, and ZBD
	New and Updated Capture File Support
		Peektagged

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index bddb0bd2d5aa4f3a5a476ec36c794fbe3f7e951b..ec74f5030a77f201286fa2b1b0d03766914ece6a 100644 (file)
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -11,10 +11,10 @@ usr/bin/dumpcap
 usr/bin/tshark
 #usr/lib/libwireshark.so
 usr/lib/libwireshark.so.19
-usr/lib/libwireshark.so.19.0.0
+usr/lib/libwireshark.so.19.0.1
 #usr/lib/libwiretap.so
 usr/lib/libwiretap.so.16
-usr/lib/libwiretap.so.16.0.0
+usr/lib/libwiretap.so.16.0.1
 #usr/lib/libwsutil.so
 usr/lib/libwsutil.so.17
 usr/lib/libwsutil.so.17.0.0
@@ -72,8 +72,8 @@ usr/libexec/wireshark/extcap/wifidump
 #usr/share/doc/wireshark/randpktdump.html
 #usr/share/doc/wireshark/rawshark.html
 #usr/share/doc/wireshark/reordercap.html
-#usr/share/doc/wireshark/sshdig.html
 #usr/share/doc/wireshark/sdjournal.html
+#usr/share/doc/wireshark/sshdig.html
 #usr/share/doc/wireshark/sshdump.html
 #usr/share/doc/wireshark/strato.html
 #usr/share/doc/wireshark/stratoshark.html
@@ -98,8 +98,8 @@ usr/libexec/wireshark/extcap/wifidump
 #usr/share/man/man1/randpktdump.1
 #usr/share/man/man1/rawshark.1
 #usr/share/man/man1/reordercap.1
-#usr/share/man/man1/sshdig.1
 #usr/share/man/man1/sdjournal.1
+#usr/share/man/man1/sshdig.1
 #usr/share/man/man1/sshdump.1
 #usr/share/man/man1/strato.1
 #usr/share/man/man1/stratoshark.1

diff --git a/lfs/tshark b/lfs/tshark
index f01063087b0dcf2781c739e3e2b5dc835154be7c..6d566504ea7da7fa49c776e55675277a667073db 100644 (file)
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = A Network Traffic Analyser
 
-VER        = 4.6.0
+VER        = 4.6.1
 
 THISAPP    = wireshark-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tshark
 DEPS       = c-ares
-PAK_VER    = 29
+PAK_VER    = 30
 
 SERVICES   =
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = df4245158422dae95bb6a68d8093cf5d1456290f25a8b8f664e6f9bf7f70661fc881e100c48c616ca077621dbb0ff55a5b14c1e385e8b6d52a7dc2d7fd1acd0a
+$(DL_FILE)_BLAKE2 = 4ca4b482ec58003c78413e29b11d3b628c835ffc0a635150415a91d570952b958f80a3baf0da7fc952fd338697c06631d20dbb7a29a42a46a22bb1be32ab2265
 
 install : $(TARGET)
 
@@ -82,10 +82,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && mkdir build
        cd $(DIR_APP)/build && cmake .. \
-                               -DBUILD_wireshark=OFF \
-                               -DCMAKE_INSTALL_PREFIX=/usr \
-                               -DCMAKE_BUILD_TYPE=Release \
-                               -DBUILD_mmdbresolve=OFF
+                               -D BUILD_wireshark=OFF \
+                               -D CMAKE_INSTALL_PREFIX=/usr \
+                               -D CMAKE_BUILD_TYPE=Release \
+                               -D BUILD_mmdbresolve=OFF
        cd $(DIR_APP)/build && make $(MAKETUNING)
        cd $(DIR_APP)/build && make install
        @rm -rf $(DIR_APP)