diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index 8b05599ecb..894e629b1a 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_WIRESHARK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_SPEEXDSP help diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index b17f4bcf17..63a3226c19 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.4.19.txt -sha1 46c2805407197048d90dc7eac9f0a4a19d13815a wireshark-4.4.19.tar.xz -sha256 0499dddc0aeea500bc65196714e1e01097742efbc479a2d67a9a8b5dd57d6d04 wireshark-4.4.19.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.6.9.txt +sha1 8287d01d50fa1269dcfd4e01c5dfd8d00ef652f4 wireshark-4.6.9.tar.xz +sha256 d062d416a1ab3a49975aafe3a671c882dde0562ccd71b078808ceb59d465fc0f wireshark-4.6.9.tar.xz # Locally calculated sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index c394f85beb..44f7595610 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.4.19 +WIRESHARK_VERSION = 4.6.9 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license @@ -18,6 +18,7 @@ WIRESHARK_DEPENDENCIES = \ libgcrypt \ libglib2 \ libpcap \ + libxml2 \ pcre2 \ speexdsp @@ -102,13 +103,6 @@ else WIRESHARK_CONF_OPTS += -DENABLE_LIBSSH=OFF endif -ifeq ($(BR2_PACKAGE_LIBXML2),y) -WIRESHARK_CONF_OPTS += -DENABLE_LIBXML2=ON -WIRESHARK_DEPENDENCIES += libxml2 -else -WIRESHARK_CONF_OPTS += -DENABLE_LIBXML2=OFF -endif - ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) WIRESHARK_CONF_OPTS += -DENABLE_LUA=ON WIRESHARK_DEPENDENCIES += lua