diff options
Diffstat (limited to '')
21 files changed, 338 insertions, 399 deletions
diff --git a/debian/changelog b/debian/changelog index 20795e98..080fa9e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +wireshark (4.4.0-1) unstable; urgency=medium + + * Upload to unstable (Closes :#1080298) + + -- Balint Reczey <balint@balintreczey.hu> Fri, 06 Sep 2024 10:59:54 +0200 + +wireshark (4.4.0-0exp2) experimental; urgency=medium + + * Cherry-pick upstream commit to fix prefix in wireshark.pc + + -- Balint Reczey <balint@balintreczey.hu> Thu, 05 Sep 2024 00:06:58 +0200 + +wireshark (4.4.0-0exp1) experimental; urgency=medium + + * debian/rules: Ignore test results only on big endian architectures. + Wireshark's Lua integration is fixed upstream to work correctly on ARM, + thus tests are passing there. + A few crypto related tests are still failing on big endian architectures. + (Closes: #1076536) + * New major upstream release + * Update symbols files + * debian/rules: Use Lua 5.4 and fall back to building with Lua 5.3 when 5.4 + is not available + * debian/rules: Fix fixing links in documentation + * Ignore Lintian warning library-not-linked-against-libc for ipaddr.so plugin + * debian/rules: Run tests with LC_ALL=C.UTF-8. + This lets tests pass with some interesting locales. + + -- Balint Reczey <balint@balintreczey.hu> Sat, 31 Aug 2024 13:19:16 +0200 + wireshark (4.2.6-1) unstable; urgency=medium * Build depend on libssh-dev instead of libssh-gcrypt-dev on latest @@ -47,7 +77,7 @@ wireshark (4.2.4-1) unstable; urgency=medium * New upstream version 4.2.4: - security fixes (Closes: #1068111): - T.38 dissector crash (CVE-2024-2955) - * Update symbols for libwireshark17t64 + * Update symbols for libwireshark18 * libwireshark-dev: Ship missing dfilter-loc.h. Also check if dfilter.h is usable, too, in debian/headers-check.c. (Closes: #1068410) diff --git a/debian/control b/debian/control index 2c5362b0..bd7dec13 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: wireshark Maintainer: Balint Reczey <balint@balintreczey.hu> Section: net Priority: optional -Build-Depends: dpkg-dev (>= 1.22.5), - qt6-5compat-dev, +Build-Depends: qt6-5compat-dev, qt6-base-dev, qt6-base-dev-tools, qt6-multimedia-dev, @@ -30,7 +29,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), libgnutls28-dev, libgcrypt-dev, libkrb5-dev, - liblua5.2-dev, + liblua5.4-dev | liblua5.3-dev, libsmi2-dev, libmaxminddb-dev, libopencore-amrnb-dev, @@ -66,8 +65,8 @@ Package: wireshark-common Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libwireshark17t64 (>= ${binary:Version}), - libwiretap14t64 (>= ${binary:Version}), + libwireshark18 (>= ${binary:Version}), + libwiretap15 (>= ${binary:Version}), debconf, libcap2-bin [linux-any] Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version}) @@ -147,27 +146,21 @@ Description: network traffic analyzer - documentation This package contains Wireshark User's guide, Wireshark Developer's Guide and the Lua Reference. -Package: libwireshark17t64 -Provides: ${t64:Provides} -Replaces: libwireshark17 -Breaks: libwireshark17 (<< ${source:Version}) +Package: libwireshark18 Architecture: any Multi-Arch: same Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}), - libwsutil15t64 (>= ${source:Version}) + libwsutil16 (>= ${source:Version}) Suggests: wireshark-doc (>= ${source:Version}) Pre-Depends: ${misc:Pre-Depends} Description: network packet dissection library -- shared library The libwireshark library provides the network packet dissection services developed by the Wireshark project. -Package: libwsutil15t64 -Provides: ${t64:Provides} -Replaces: libwsutil15 -Breaks: libwsutil15 (<< ${source:Version}) +Package: libwsutil16 Architecture: any Multi-Arch: same Section: libs @@ -182,7 +175,7 @@ Package: libwsutil-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - libwsutil15t64 (= ${binary:Version}) + libwsutil16 (= ${binary:Version}) Breaks: libwireshark-dev (<< 3.7.0~) Replaces: libwireshark-dev (<< 3.7.0~) Description: network packet dissection utilities library -- development files @@ -215,7 +208,7 @@ Section: libdevel Depends: ${misc:Depends}, libwsutil-dev, libwiretap-dev, - libwireshark17t64 (= ${binary:Version}) + libwireshark18 (= ${binary:Version}) Description: network packet dissection library -- development files The "libwireshark" library provides the network packet dissection services developed by the Wireshark project. @@ -223,10 +216,7 @@ Description: network packet dissection library -- development files This package contains the static library and the C header files that are needed for applications to use libwireshark services. -Package: libwiretap14t64 -Provides: ${t64:Provides} -Replaces: libwiretap14 -Breaks: libwiretap14 (<< ${source:Version}) +Package: libwiretap15 Architecture: any Multi-Arch: same Section: libs @@ -263,7 +253,7 @@ Package: libwiretap-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - libwiretap14t64 (= ${binary:Version}) + libwiretap15 (= ${binary:Version}) Description: network packet capture library -- development files Wiretap, part of the Wireshark project, is a library that allows one to read and write several packet capture file formats. diff --git a/debian/control.in b/debian/control.in index 4de467c2..65864f42 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,7 @@ Build-Depends: @QT_BUILD_DEPS@, libgnutls28-dev, libgcrypt-dev, libkrb5-dev, - liblua5.2-dev, + liblua5.4-dev | liblua5.3-dev, libsmi2-dev, libmaxminddb-dev, libopencore-amrnb-dev, @@ -61,8 +61,8 @@ Package: wireshark-common Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libwireshark17 (>= ${binary:Version}), - libwiretap14 (>= ${binary:Version}), + libwireshark18 (>= ${binary:Version}), + libwiretap15 (>= ${binary:Version}), debconf, libcap2-bin [linux-any] Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version}) @@ -142,21 +142,21 @@ Description: network traffic analyzer - documentation This package contains Wireshark User's guide, Wireshark Developer's Guide and the Lua Reference. -Package: libwireshark17 +Package: libwireshark18 Architecture: any Multi-Arch: same Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}), - libwsutil15 (>= ${source:Version}) + libwsutil16 (>= ${source:Version}) Suggests: wireshark-doc (>= ${source:Version}) Pre-Depends: ${misc:Pre-Depends} Description: network packet dissection library -- shared library The libwireshark library provides the network packet dissection services developed by the Wireshark project. -Package: libwsutil15 +Package: libwsutil16 Architecture: any Multi-Arch: same Section: libs @@ -171,7 +171,7 @@ Package: libwsutil-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - libwsutil15 (= ${binary:Version}) + libwsutil16 (= ${binary:Version}) Breaks: libwireshark-dev (<< 3.7.0~) Replaces: libwireshark-dev (<< 3.7.0~) Description: network packet dissection utilities library -- development files @@ -204,7 +204,7 @@ Section: libdevel Depends: ${misc:Depends}, libwsutil-dev, libwiretap-dev, - libwireshark17 (= ${binary:Version}) + libwireshark18 (= ${binary:Version}) Description: network packet dissection library -- development files The "libwireshark" library provides the network packet dissection services developed by the Wireshark project. @@ -212,7 +212,7 @@ Description: network packet dissection library -- development files This package contains the static library and the C header files that are needed for applications to use libwireshark services. -Package: libwiretap14 +Package: libwiretap15 Architecture: any Multi-Arch: same Section: libs @@ -249,7 +249,7 @@ Package: libwiretap-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, - libwiretap14 (= ${binary:Version}) + libwiretap15 (= ${binary:Version}) Description: network packet capture library -- development files Wiretap, part of the Wireshark project, is a library that allows one to read and write several packet capture file formats. diff --git a/debian/control.t64.in b/debian/control.t64.in deleted file mode 100644 index 811f467b..00000000 --- a/debian/control.t64.in +++ /dev/null @@ -1,289 +0,0 @@ -Source: wireshark -Maintainer: Balint Reczey <balint@balintreczey.hu> -Section: net -Priority: optional -Build-Depends: dpkg-dev (>= 1.22.5), - @QT_BUILD_DEPS@, - libpcap0.8-dev, - flex, - libz-dev, - debhelper (>= 12), - po-debconf, - python3, - python3-ply, - python3-pytest <!nocheck>, - python3-pytest-xdist <!nocheck>, - libc-ares-dev, - xsltproc, - dh-python, - docbook-xsl, - docbook-xml, - libxml2-utils, - libcap2-dev | libcap-dev, - lsb-release, - libparse-yapp-perl, - libglib2.0-dev, - libgnutls28-dev, - libgcrypt-dev, - libkrb5-dev, - liblua5.2-dev, - libsmi2-dev, - libmaxminddb-dev, - libopencore-amrnb-dev, - libopus-dev, - libsystemd-dev, - libnl-genl-3-dev [linux-any], - libnl-route-3-dev [linux-any], - asciidoctor, - cmake (>= 3.5), - libsbc-dev, - libnghttp2-dev, - libnghttp3-dev, - @LIBSSH_DEV@, - liblz4-dev, - libsnappy-dev, - libzstd-dev, - libspandsp-dev, - libxml2-dev, - libbrotli-dev, - libspeexdsp-dev, - libminizip-dev, - libbcg729-dev, - libxkbcommon-dev -Build-Conflicts: libsnmp4.2-dev, - libsnmp-dev -Standards-Version: 4.6.0.1 -Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/debian/wireshark -Vcs-Git: https://salsa.debian.org/debian/wireshark.git -b debian/master -Homepage: https://www.wireshark.org/ - -Package: wireshark-common -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libwireshark17t64 (>= ${binary:Version}), - libwiretap14t64 (>= ${binary:Version}), - debconf, - libcap2-bin [linux-any] -Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version}) -Breaks: wireshark (<< 2.0.0~), - wireshark-gtk (<< 3.0.0), - wireshark-qt (<< 2.0.0~rc3+g841d5e1) -Replaces: wireshark (<< 2.0.0~), - wireshark-qt (<< 2.0.0~rc3+g841d5e1) -Description: network traffic analyzer - common files - Wireshark is a network "sniffer" - a tool that captures and analyzes - packets off the wire. Wireshark can decode too many protocols to list - here. - . - This package provides files common to both wireshark and tshark - (the console version). - -Package: wireshark -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - wireshark-common (= ${binary:Version}), - @QT_DEPS@ -Recommends: @QT_RECOMMENDS@ -Conflicts: wireshark-qt (<< 4.4~), - wireshark-gtk (<< 3.0.0~) -Replaces: wireshark-qt (<< 4.4~), - wireshark-gtk (<< 3.0.0~) -Description: network traffic analyzer - graphical interface - Wireshark is a network "sniffer" - a tool that captures and analyzes - packets off the wire. Wireshark can decode too many protocols to list - here. - -Package: tshark -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - wireshark-common (= ${binary:Version}) -Description: network traffic analyzer - console version - Wireshark is a network "sniffer" - a tool that captures and analyzes - packets off the wire. Wireshark can decode too many protocols to list - here. - . - This package provides the console version of wireshark, named - "tshark". - -Package: wireshark-dev -Architecture: any -Section: devel -Depends: ${misc:Depends}, - ${shlibs:Depends}, - omniidl, - libpcap0.8-dev, - libglib2.0-dev, - ${python3:Depends}, - python3-ply, - snacc, - libwireshark-dev, - libwiretap-dev -Description: network traffic analyzer - development tools - Wireshark is a network "sniffer" - a tool that captures and analyzes - packets off the wire. Wireshark can decode too many protocols to list - here. - . - This package provides idl2wrs and other files necessary for developing - new packet dissectors. - -Package: wireshark-doc -Architecture: all -Multi-Arch: foreign -Section: doc -Depends: ${misc:Depends} -Description: network traffic analyzer - documentation - Wireshark is a network "sniffer" - a tool that captures and analyzes - packets off the wire. Wireshark can decode too many protocols to list - here. - . - This package contains Wireshark User's guide, Wireshark Developer's Guide - and the Lua Reference. - -Package: libwireshark17t64 -Provides: ${t64:Provides} -Replaces: libwireshark17 -Breaks: libwireshark17 (<< ${source:Version}) -Architecture: any -Multi-Arch: same -Section: libs -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libwireshark-data (>= ${source:Version}), - libwsutil15t64 (>= ${source:Version}) -Suggests: wireshark-doc (>= ${source:Version}) -Pre-Depends: ${misc:Pre-Depends} -Description: network packet dissection library -- shared library - The libwireshark library provides the network packet dissection services - developed by the Wireshark project. - -Package: libwsutil15t64 -Provides: ${t64:Provides} -Replaces: libwsutil15 -Breaks: libwsutil15 (<< ${source:Version}) -Architecture: any -Multi-Arch: same -Section: libs -Depends: ${shlibs:Depends}, - ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} -Description: network packet dissection utilities library -- shared library - The libwsutil library provides utility functions for Wireshark and related - binaries and shared libraries. - -Package: libwsutil-dev -Architecture: any -Section: libdevel -Depends: ${misc:Depends}, - libwsutil15t64 (= ${binary:Version}) -Breaks: libwireshark-dev (<< 3.7.0~) -Replaces: libwireshark-dev (<< 3.7.0~) -Description: network packet dissection utilities library -- development files - The libwsutil library provides utility functions for Wireshark and related - binaries and shared libraries. - . - This package contains the static library and the C header files that are - needed for applications to use the libwsutil library. - -Package: libwireshark-data -Architecture: all -Multi-Arch: foreign -Section: libs -Depends: ${misc:Depends} -Suggests: geoipupdate, - geoip-database, - geoip-database-extra, - libjs-leaflet, - libjs-leaflet.markercluster, - snmp-mibs-downloader -Description: network packet dissection library -- data files - The libwireshark library provides the network packet dissection services - developed by the Wireshark project. - . - This package contains the platform independent files. - -Package: libwireshark-dev -Architecture: any -Section: libdevel -Depends: ${misc:Depends}, - libwsutil-dev, - libwiretap-dev, - libwireshark17t64 (= ${binary:Version}) -Description: network packet dissection library -- development files - The "libwireshark" library provides the network packet dissection services - developed by the Wireshark project. - . - This package contains the static library and the C header files that are - needed for applications to use libwireshark services. - -Package: libwiretap14t64 -Provides: ${t64:Provides} -Replaces: libwiretap14 -Breaks: libwiretap14 (<< ${source:Version}) -Architecture: any -Multi-Arch: same -Section: libs -Depends: ${shlibs:Depends}, - ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} -Description: network packet capture library -- shared library - Wiretap, part of the Wireshark project, is a library that allows one to - read and write several packet capture file formats. - . - Supported formats are: - * Libpcap - * Sniffer - * LANalyzer - * Network Monitor - * "snoop" - * "iptrace" - * Sniffer Basic (NetXRay)/Windows Sniffer Pro - * RADCOM WAN/LAN Analyzers - * Lucent/Ascend access products - * HP-UX nettl - * Toshiba ISDN Router - * ISDN4BSD "i4btrace" utility - * Cisco Secure Intrusion Detection System iplogging facility - * pppd logs (pppdump-format files) - * VMS TCPTRACE - * DBS Etherwatch (text format) - * Catapult DCT2000 (.out files) - . - Wiretap's shortcomings are: no filter capability and no support for packet - capture. - -Package: libwiretap-dev -Architecture: any -Section: libdevel -Depends: ${misc:Depends}, - libwiretap14t64 (= ${binary:Version}) -Description: network packet capture library -- development files - Wiretap, part of the Wireshark project, is a library that allows one to - read and write several packet capture file formats. - . - Supported formats are: - * Libpcap - * Sniffer - * LANalyzer - * Network Monitor - * "snoop" - * "iptrace" - * Sniffer Basic (NetXRay)/Windows Sniffer Pro - * RADCOM WAN/LAN Analyzers - * Lucent/Ascend access products - * HP-UX nettl - * Toshiba ISDN Router - * ISDN4BSD "i4btrace" utility - * Cisco Secure Intrusion Detection System iplogging facility - * pppd logs (pppdump-format files) - * VMS TCPTRACE - * DBS Etherwatch (text format) - * Catapult DCT2000 (.out files) - . - Wiretap's shortcomings are: no filter capability and no support for packet - capture. - . - This package contains the static library and the C header files. diff --git a/debian/libwireshark17t64.lintian-overrides b/debian/libwireshark17t64.lintian-overrides deleted file mode 100644 index 57929b6f..00000000 --- a/debian/libwireshark17t64.lintian-overrides +++ /dev/null @@ -1,11 +0,0 @@ -# ieee-data is not a library, just data processed at build time -libwireshark17t64: embedded-library - -# small plugins -libwireshark17t64: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/g7*.so] -libwireshark17t64: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/l16mono.so] - -# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers) -libwireshark17t64: spelling-error-in-binary Nam Name [usr/lib/*/libwireshark.so.*] -libwireshark17t64: spelling-error-in-binary Dont Don't [usr/lib/*/libwireshark.so.*] -libwireshark17t64: package-name-doesnt-match-sonames libwireshark17 diff --git a/debian/libwireshark17t64.install b/debian/libwireshark18.install index b31df7d9..b31df7d9 100644 --- a/debian/libwireshark17t64.install +++ b/debian/libwireshark18.install diff --git a/debian/libwireshark18.lintian-overrides b/debian/libwireshark18.lintian-overrides new file mode 100644 index 00000000..54c7a560 --- /dev/null +++ b/debian/libwireshark18.lintian-overrides @@ -0,0 +1,12 @@ +# ieee-data is not a library, just data processed at build time +libwireshark18: embedded-library + +# small plugins +libwireshark18: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/g7*.so] +libwireshark18: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/ipaddr.so] +libwireshark18: library-not-linked-against-libc [usr/lib/*/wireshark/plugins/*/codecs/l16mono.so] + +# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers) +libwireshark18: spelling-error-in-binary Nam Name [usr/lib/*/libwireshark.so.*] +libwireshark18: spelling-error-in-binary Dont Don't [usr/lib/*/libwireshark.so.*] +libwireshark18: package-name-doesnt-match-sonames libwireshark18 diff --git a/debian/libwireshark17t64.symbols b/debian/libwireshark18.symbols index 968d6a11..c8c85303 100644 --- a/debian/libwireshark17t64.symbols +++ b/debian/libwireshark18.symbols @@ -1,4 +1,4 @@ -libwireshark.so.17 libwireshark17t64 #MINVER# +libwireshark.so.18 libwireshark18 #MINVER# AdmissionRejectReason_vals@Base 1.9.1 BandRejectReason_vals@Base 1.9.1 CommandCode_vals_ext@Base 1.9.1 @@ -22,8 +22,11 @@ libwireshark.so.17 libwireshark17t64 #MINVER# add_ber_encoded_label@Base 3.7.0 add_conversation_filter_protocol@Base 3.7.0 add_conversation_table_data@Base 2.5.0 + add_conversation_table_data_extended@Base 4.4.0 + add_conversation_table_data_ipv4_subnet@Base 4.4.0 add_conversation_table_data_with_conv_id@Base 2.5.0 add_endpoint_table_data@Base 4.0.0 + add_endpoint_table_data_ipv4_subnet@Base 4.4.0 add_hostlist_table_data@Base 2.5.0 add_hosts_file@Base 1.9.1 add_ip_name_from_string@Base 1.9.1 @@ -183,7 +186,10 @@ libwireshark.so.17 libwireshark17t64 #MINVER# conversation_key_port2@Base 2.5.0 conversation_new@Base 1.9.1 conversation_new_by_id@Base 2.5.0 + conversation_new_deinterlaced@Base 4.4.0 + conversation_new_deinterlacer@Base 4.4.0 conversation_new_full@Base 3.7.1 + conversation_new_strat@Base 4.4.0 conversation_pt_to_conversation_type@Base 4.0.0 conversation_pt_to_endpoint_type@Base 2.5.0 conversation_set_addr2@Base 2.6.3 @@ -230,6 +236,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# dcerpc_get_proto_name@Base 1.9.1 dcerpc_get_proto_sub_dissector@Base 1.9.1 dcerpc_get_transport_salt@Base 1.9.1 + dcerpc_init_from_handle@Base 4.4.0 dcerpc_init_uuid@Base 1.9.1 dcerpc_set_transport_salt@Base 1.12.0~rc1 dcerpc_uuids@Base 1.9.1 @@ -281,22 +288,46 @@ libwireshark.so.17 libwireshark17t64 #MINVER# decrement_dissection_depth@Base 4.2.4 delete_itu_tcap_subdissector@Base 1.9.1 deregister_depend_dissector@Base 2.1.0 + deregister_dfilter_translator@Base 4.4.0 destroy_print_stream@Base 1.12.0~rc1 + df_cell_append@Base 4.4.0 + df_cell_array@Base 4.4.0 + df_cell_clear@Base 4.4.0 + df_cell_init@Base 4.4.0 + df_cell_is_empty@Base 4.4.0 + df_cell_is_null@Base 4.4.0 + df_cell_iter_init@Base 4.4.0 + df_cell_iter_next@Base 4.4.0 + df_cell_ref@Base 4.4.0 + df_cell_size@Base 4.4.0 df_error_free@Base 4.1.0 + df_func_deregister@Base 4.4.0 + df_func_lookup@Base 4.4.0 + df_func_name_list@Base 4.4.0 + df_func_register@Base 4.4.0 + df_semcheck_param@Base 4.4.0 dfilter_apply_edt@Base 1.9.1 dfilter_compile_full@Base 4.1.0 dfilter_deprecated_tokens@Base 1.9.1 dfilter_dump@Base 1.9.1 dfilter_expand@Base 3.7.0 + dfilter_fail@Base 4.4.0 + dfilter_fail_throw@Base 4.4.0 dfilter_free@Base 1.9.1 + dfilter_get_syntax_tree@Base 4.4.0 dfilter_get_warnings@Base 4.1.0 dfilter_load_field_references@Base 3.7.0 dfilter_load_field_references_edt@Base 4.1.0 dfilter_log_full@Base 3.7.0 - dfilter_macro_get_uat@Base 1.9.1 + dfilter_macro_reload@Base 4.4.0 + dfilter_macro_table_count@Base 4.4.0 + dfilter_macro_table_iter_init@Base 4.4.0 + dfilter_macro_table_iter_next@Base 4.4.0 + dfilter_plugins_register@Base 4.4.0 dfilter_requires_columns@Base 4.1.0 dfilter_syntax_tree@Base 3.7.0 dfilter_text@Base 3.7.0 + dfilter_vfail@Base 4.4.0 disable_name_resolution@Base 1.99.9 dissect_IDispatch_GetIDsOfNames_resp@Base 1.9.1 dissect_IDispatch_GetIDsOfNames_rqst@Base 1.9.1 @@ -394,10 +425,10 @@ libwireshark.so.17 libwireshark17t64 #MINVER# dissect_ndr_uint64@Base 1.99.8 dissect_ndr_uint8@Base 1.9.1 dissect_ndr_uuid_t@Base 1.9.1 - dissect_nt_64bit_time@Base 1.9.1 - dissect_nt_64bit_time_ex@Base 1.99.0 - dissect_nt_64bit_time_opt@Base 1.99.1 dissect_nt_sid@Base 1.9.1 + dissect_nttime@Base 4.4.0 + dissect_nttime_hyper@Base 4.4.0 + dissect_nttime_hyper_1sec@Base 4.4.0 dissect_oer_IA5String@Base 3.1.0 dissect_oer_bit_string@Base 2.9.0 dissect_oer_boolean@Base 3.1.0 @@ -486,6 +517,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# dissect_thrift_t_i8@Base 3.5.0 dissect_thrift_t_list@Base 3.5.0 dissect_thrift_t_map@Base 3.5.0 + dissect_thrift_t_raw_data@Base 4.4.0 dissect_thrift_t_set@Base 3.5.0 dissect_thrift_t_stop@Base 2.5.0 dissect_thrift_t_string@Base 3.5.0 @@ -494,6 +526,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# dissect_thrift_t_uuid@Base 3.7.1 dissect_tpkt_encap@Base 1.9.1 dissect_unknown_ber@Base 1.9.1 + dissect_x509af_Certificate@Base 4.4.0 dissect_xdlc_control@Base 1.9.1 dissect_zcl_attr_data@Base 2.5.2 dissector_add_custom_table_handle@Base 1.99.8 @@ -513,6 +546,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# dissector_change_uint@Base 1.9.1 dissector_conversation_init@Base 1.99.0 dissector_delete_all@Base 1.12.0~rc1 + dissector_delete_guid@Base 4.4.0 dissector_delete_string@Base 1.9.1 dissector_delete_uint@Base 1.9.1 dissector_delete_uint_range@Base 1.12.0~rc1 @@ -530,6 +564,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# dissector_get_uint_handle@Base 1.9.1 dissector_handle_get_description@Base 4.0.0 dissector_handle_get_dissector_name@Base 1.12.0~rc1 + dissector_handle_get_pref_suffix@Base 4.4.0 dissector_handle_get_protocol_index@Base 1.9.1 dissector_handle_get_protocol_long_name@Base 4.0.0 dissector_handle_get_protocol_short_name@Base 4.0.0 @@ -692,14 +727,20 @@ libwireshark.so.17 libwireshark17t64 #MINVER# fifo_string_cache_free@Base 4.1.0 fifo_string_cache_init@Base 4.1.0 fifo_string_cache_insert@Base 4.1.0 + fill_dummy_ip4@Base 4.4.0 filter_expression_iterate_expressions@Base 2.5.0 filter_expression_new@Base 1.9.1 find_and_mark_frame_depended_upon@Base 1.12.0~rc1 find_capture_dissector@Base 2.3.0 find_conversation@Base 1.9.1 find_conversation_by_id@Base 2.5.0 + find_conversation_deinterlaced@Base 4.4.0 + find_conversation_deinterlacer@Base 4.4.0 + find_conversation_deinterlacer_pinfo@Base 4.4.0 find_conversation_full@Base 3.7.1 find_conversation_pinfo@Base 2.5.0 + find_conversation_pinfo_ro@Base 4.4.0 + find_conversation_strat@Base 4.4.0 find_depend_dissector_list@Base 2.1.0 find_dissector@Base 1.9.1 find_dissector_add_dependency@Base 2.1.0 @@ -751,13 +792,21 @@ libwireshark.so.17 libwireshark17t64 #MINVER# free_srt_table@Base 1.99.8 free_srt_table_data@Base 1.99.8 free_stat_tables@Base 1.99.9 + ftype_can_add@Base 4.4.0 + ftype_can_bitwise_and@Base 4.4.0 ftype_can_cmp@Base 3.7.0 ftype_can_contains@Base 1.9.1 + ftype_can_divide@Base 4.4.0 ftype_can_eq@Base 1.9.1 ftype_can_is_negative@Base 3.7.0 ftype_can_is_zero@Base 3.7.0 + ftype_can_length@Base 4.4.0 ftype_can_matches@Base 1.9.1 + ftype_can_modulo@Base 4.4.0 + ftype_can_multiply@Base 4.4.0 ftype_can_slice@Base 1.9.1 + ftype_can_subtract@Base 4.4.0 + ftype_can_unary_minus@Base 4.4.0 ftype_can_val_to_sinteger64@Base 3.7.2 ftype_can_val_to_sinteger@Base 3.7.2 ftype_can_val_to_uinteger64@Base 3.7.2 @@ -775,12 +824,23 @@ libwireshark.so.17 libwireshark17t64 #MINVER# funnel_register_packet_menu@Base 4.1.0 funnel_reload_menus@Base 1.99.9 funnel_set_funnel_ops@Base 1.9.1 + fvalue_add@Base 4.4.0 + fvalue_bitwise_and@Base 4.4.0 + fvalue_cleanup@Base 4.4.0 + fvalue_contains@Base 4.4.0 + fvalue_divide@Base 4.4.0 + fvalue_dup@Base 4.4.0 + fvalue_eq@Base 4.4.0 + fvalue_equal@Base 4.4.0 + fvalue_free@Base 4.4.0 fvalue_from_literal@Base 3.7.0 + fvalue_ge@Base 4.4.0 fvalue_get_bytes@Base 4.0.0 fvalue_get_bytes_data@Base 4.1.0 fvalue_get_bytes_size@Base 4.1.0 fvalue_get_floating@Base 1.9.1 fvalue_get_guid@Base 4.0.0 + fvalue_get_ipv4@Base 4.4.0 fvalue_get_ipv6@Base 4.1.0 fvalue_get_protocol@Base 4.0.0 fvalue_get_sinteger64@Base 1.99.3 @@ -790,12 +850,49 @@ libwireshark.so.17 libwireshark17t64 #MINVER# fvalue_get_time@Base 4.0.0 fvalue_get_uinteger64@Base 1.99.3 fvalue_get_uinteger@Base 1.9.1 + fvalue_gt@Base 4.4.0 + fvalue_hash@Base 4.4.0 + fvalue_init@Base 4.4.0 + fvalue_is_negative@Base 4.4.0 + fvalue_is_zero@Base 4.4.0 + fvalue_le@Base 4.4.0 + fvalue_length2@Base 4.4.0 + fvalue_lt@Base 4.4.0 + fvalue_matches@Base 4.4.0 + fvalue_modulo@Base 4.4.0 + fvalue_multiply@Base 4.4.0 + fvalue_ne@Base 4.4.0 + fvalue_new@Base 4.4.0 + fvalue_set_ax25@Base 4.4.0 + fvalue_set_byte_array@Base 4.4.0 + fvalue_set_bytes@Base 4.4.0 + fvalue_set_bytes_data@Base 4.4.0 + fvalue_set_ether@Base 4.4.0 + fvalue_set_fcwwn@Base 4.4.0 + fvalue_set_floating@Base 4.4.0 + fvalue_set_guid@Base 4.4.0 + fvalue_set_ipv4@Base 4.4.0 + fvalue_set_ipv6@Base 4.4.0 + fvalue_set_protocol@Base 4.4.0 + fvalue_set_sinteger64@Base 4.4.0 + fvalue_set_sinteger@Base 4.4.0 + fvalue_set_strbuf@Base 4.4.0 + fvalue_set_string@Base 4.4.0 + fvalue_set_time@Base 4.4.0 + fvalue_set_uinteger64@Base 4.4.0 + fvalue_set_uinteger@Base 4.4.0 + fvalue_set_vines@Base 4.4.0 + fvalue_slice@Base 4.4.0 + fvalue_subtract@Base 4.4.0 + fvalue_to_double@Base 4.4.0 fvalue_to_sinteger64@Base 3.7.2 fvalue_to_sinteger@Base 3.7.2 fvalue_to_string_repr@Base 1.9.1 fvalue_to_uinteger64@Base 3.7.2 fvalue_to_uinteger@Base 3.7.2 fvalue_type_ftenum@Base 1.12.0~rc1 + fvalue_type_name@Base 4.4.0 + fvalue_unary_minus@Base 4.4.0 gbl_resolv_flags@Base 1.9.1 gcamel_StatSRT@Base 1.9.1 gcp_cmd_type@Base 1.9.1 @@ -836,6 +933,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# get_column_format@Base 1.9.1 get_column_format_from_str@Base 1.9.1 get_column_format_matches@Base 1.9.1 + get_column_longest_string@Base 4.4.0 get_column_resolved@Base 1.9.1 get_column_text@Base 3.7.2 get_column_title@Base 1.9.1 @@ -855,6 +953,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# get_data_source_tvb_by_name@Base 2.3.0 get_dccp_stream_count@Base 3.5.0 get_dect_standard_8bits_string@Base 4.1.0 + get_dfilter_translator_list@Base 4.4.0 get_dissector_names@Base 1.12.0~rc1 get_dissector_table_param@Base 1.99.2 get_dissector_table_selector_type@Base 1.9.1 @@ -868,6 +967,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# get_eo_proto_id@Base 2.3.0 get_eo_reset_func@Base 2.3.0 get_eo_tap_listener_name@Base 2.3.0 + get_eth_conversation_data@Base 4.4.0 get_eth_hashtable@Base 1.12.0~rc1 get_ether_name@Base 1.9.1 get_etsi_ts_102_221_annex_a_string@Base 3.3.1 @@ -888,14 +988,20 @@ libwireshark.so.17 libwireshark17t64 #MINVER# get_hash_ether_hexaddr@Base 1.99.3 get_hash_ether_resolved_name@Base 1.99.3 get_hash_ether_status@Base 1.99.3 + get_hash_ether_used@Base 4.4.0 get_hash_manuf_resolved_name@Base 1.99.3 + get_hash_manuf_used@Base 4.4.0 + get_hash_wka_resolved_name@Base 4.4.0 + get_hash_wka_used@Base 4.4.0 get_host_ipaddr6@Base 1.9.1 get_host_ipaddr@Base 1.9.1 get_hostlist_filter@Base 1.99.0 get_hostlist_packet_func@Base 1.99.0 get_hostname6@Base 1.9.1 get_hostname@Base 1.9.1 + get_ip_conversation_data@Base 4.4.0 get_ipv4_hash_table@Base 1.12.0~rc1 + get_ipv6_conversation_data@Base 4.4.0 get_ipv6_hash_table@Base 1.12.0~rc1 get_ipxnet_hash_table@Base 1.12.0~rc1 get_iso_646_string@Base 3.1.0 @@ -925,6 +1031,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# get_t61_string@Base 2.3.0 get_tap_names@Base 1.12.0~rc1 get_tcp_conversation_data@Base 1.99.0 + get_tcp_conversation_data_idempotent@Base 4.4.0 get_tcp_stream_count@Base 1.12.0~rc1 get_token_len@Base 1.9.1 get_ts_23_038_7bits_string_packed@Base 3.3.1 @@ -962,6 +1069,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# guid_to_str@Base 1.99.2 guid_to_str_buf@Base 3.5.1 guids_add_guid@Base 1.9.1 + guids_delete_guid@Base 4.4.0 guids_get_guid_name@Base 1.9.1 guids_init@Base 1.9.1 guids_resolve_guid_to_str@Base 1.9.1 @@ -978,6 +1086,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# have_tap_listener@Base 1.12.0~rc1 heur_dissector_add@Base 1.9.1 heur_dissector_delete@Base 1.9.1 + heur_dissector_list_get_description@Base 4.4.0 heur_dissector_table_foreach@Base 1.99.2 hex_str_to_bytes@Base 1.9.1 hex_str_to_bytes_encoding@Base 1.12.0~rc1 @@ -1036,6 +1145,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# mtp3_standard_vals@Base 1.9.1 ncp_nds_verb_vals@Base 2.1.0 new_frame_data_sequence@Base 1.12.0~rc1 + new_ipv4@Base 4.4.0 new_page@Base 1.12.0~rc1 next_tvb_add_handle@Base 1.9.1 next_tvb_add_string@Base 1.9.1 @@ -1076,6 +1186,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# output_fields_list_options@Base 1.12.0~rc1 output_fields_new@Base 1.12.0~rc1 output_fields_num_fields@Base 1.12.0~rc1 + output_fields_prime_edt@Base 4.4.0 output_fields_set_option@Base 1.12.0~rc1 output_fields_valid@Base 1.99.0 p_add_proto_data@Base 1.9.1 @@ -1104,6 +1215,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# pref_unstash@Base 2.3.0 prefs@Base 1.9.1 prefs_add_decode_as_value@Base 2.3.0 + prefs_add_list_value@Base 4.4.0 prefs_apply@Base 1.9.1 prefs_apply_all@Base 1.9.1 prefs_capture_device_monitor_mode@Base 1.9.1 @@ -1118,6 +1230,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# prefs_get_enum_radiobuttons@Base 2.3.0 prefs_get_enum_value@Base 2.3.0 prefs_get_enumvals@Base 2.3.0 + prefs_get_list_value@Base 4.4.0 prefs_get_max_value@Base 2.3.0 prefs_get_module_effect_flags@Base 2.5.0 prefs_get_name@Base 2.3.0 @@ -1147,10 +1260,12 @@ libwireshark.so.17 libwireshark17t64 #MINVER# prefs_pref_type_name@Base 1.9.1 prefs_range_add_value@Base 2.3.0 prefs_range_remove_value@Base 2.3.0 + prefs_read_module@Base 4.4.0 prefs_register_bool_preference@Base 1.9.1 prefs_register_codec@Base 2.5.0 prefs_register_custom_preference_TCP_Analysis@Base 4.1.0 prefs_register_directory_preference@Base 1.9.1 + prefs_register_dissector_preference@Base 4.4.0 prefs_register_enum_preference@Base 1.9.1 prefs_register_filename_preference@Base 1.9.1 prefs_register_module_alias@Base 2.9.0 @@ -1377,6 +1492,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# proto_tree_add_item_ret_uint64@Base 2.3.0 proto_tree_add_item_ret_uint@Base 1.99.6 proto_tree_add_item_ret_varint@Base 2.5.0 + proto_tree_add_mac48_detail@Base 4.4.0 proto_tree_add_none_format@Base 1.9.1 proto_tree_add_oid@Base 3.1.1 proto_tree_add_oid_format@Base 3.1.1 @@ -1478,6 +1594,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# register_decode_as@Base 1.12.0~rc1 register_decode_as_next_proto@Base 2.5.0 register_depend_dissector@Base 2.1.0 + register_dfilter_translator@Base 4.4.0 register_dissector@Base 2.1.0 register_dissector_table@Base 1.9.1 register_dissector_table_alias@Base 2.9.0 @@ -1491,6 +1608,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# register_giop_user@Base 1.9.1 register_giop_user_module@Base 1.9.1 register_heur_dissector_list@Base 1.9.1 + register_heur_dissector_list_with_description@Base 4.4.0 register_init_routine@Base 1.9.1 register_log_conversation_filter@Base 3.7.0 register_per_oid_dissector@Base 2.1.0 @@ -1573,6 +1691,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# sctp_port_to_display@Base 1.99.2 sctpppid_val_ext@Base 3.5.0 secrets_get_available_keys@Base 2.9.1 + secrets_register_type@Base 4.4.0 secrets_rsa_decrypt@Base 2.9.0 secrets_verify_key@Base 2.9.1 secrets_wtap_callback@Base 2.9.0 @@ -1671,12 +1790,33 @@ libwireshark.so.17 libwireshark17t64 #MINVER# stats_tree_range_node_with_pname@Base 1.9.1 stats_tree_register@Base 1.9.1 stats_tree_register_plugin@Base 1.9.1 - stats_tree_register_with_group@Base 1.9.1 stats_tree_reinit@Base 1.9.1 stats_tree_reset@Base 1.9.1 + stats_tree_set_first_column_name@Base 4.4.0 + stats_tree_set_group@Base 4.4.0 stats_tree_sort_compare@Base 1.12.0~rc1 stats_tree_tick_pivot@Base 1.9.1 stats_tree_tick_range@Base 1.9.1 + stnode_clear@Base 4.4.0 + stnode_data@Base 4.4.0 + stnode_dup@Base 4.4.0 + stnode_free@Base 4.4.0 + stnode_get_flags@Base 4.4.0 + stnode_init@Base 4.4.0 + stnode_location@Base 4.4.0 + stnode_mutate@Base 4.4.0 + stnode_new@Base 4.4.0 + stnode_new_empty@Base 4.4.0 + stnode_op_name@Base 4.4.0 + stnode_replace@Base 4.4.0 + stnode_set_flags@Base 4.4.0 + stnode_set_location@Base 4.4.0 + stnode_steal_data@Base 4.4.0 + stnode_string@Base 4.4.0 + stnode_token@Base 4.4.0 + stnode_tostr@Base 4.4.0 + stnode_type_id@Base 4.4.0 + stnode_type_name@Base 4.4.0 str_to_ip6@Base 2.1.0 str_to_ip@Base 2.1.0 str_to_str@Base 1.9.1 @@ -1688,6 +1828,9 @@ libwireshark.so.17 libwireshark17t64 #MINVER# stream_process_reassembled@Base 1.9.1 streaming_reassembly_info_new@Base 4.1.0 string_to_name_resolve@Base 1.9.1 + sttype_field_hfinfo@Base 4.4.0 + sttype_name@Base 4.4.0 + sttype_oper_get@Base 4.4.0 sua_co_class_type_acro_values@Base 1.9.1 t30_facsimile_control_field_vals_ext@Base 1.12.0~rc1 t30_facsimile_control_field_vals_short_ext@Base 1.12.0~rc1 @@ -1708,6 +1851,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tfs_accepted_not_accepted@Base 1.9.1 tfs_ack_nack@Base 1.9.1 tfs_acknowledged_not_acknowledged@Base 1.99.2 + tfs_activate_do_not_activate@Base 4.4.0 tfs_activated_deactivated@Base 2.5.1 tfs_active_inactive@Base 1.9.1 tfs_add_drop@Base 3.3.0 @@ -1717,7 +1861,6 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tfs_applicable_not_applicable@Base 3.5.0 tfs_asynchronous_synchronous@Base 1.99.1 tfs_available_not_available@Base 1.9.1 - tfs_c2s_s2c@Base 2.5.0 tfs_capable_not_capable@Base 1.9.1 tfs_changed_not_changed@Base 2.9.1 tfs_client_server@Base 2.1.0 @@ -1727,12 +1870,12 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tfs_constructed_primitive@Base 1.99.8 tfs_critical_not_critical@Base 1.12.0~rc1 tfs_current_not_yet@Base 4.1.0 + tfs_data_pdu_control_pdu@Base 4.4.0 tfs_defined_not_defined@Base 1.99.8 tfs_detected_not_detected@Base 1.9.1 tfs_disabled_enabled@Base 1.9.1 tfs_do_not_clear_clear@Base 1.12.0~rc1 tfs_down_up@Base 2.5.0 - tfs_downlink_uplink@Base 2.5.0 tfs_enabled_disabled@Base 1.9.1 tfs_encrypt_do_not_encrypt@Base 2.1.0 tfs_enforced_not_enforced@Base 1.12.0~rc1 @@ -1758,6 +1901,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tfs_not_restricted_restricted@Base 4.1.0 tfs_not_supported_supported@Base 2.9.1 tfs_odd_even@Base 1.9.1 + tfs_off_on@Base 4.4.0 tfs_ok_error@Base 1.9.1 tfs_on_off@Base 1.9.1 tfs_open_closed@Base 2.5.0 @@ -1774,7 +1918,6 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tfs_required_not_required@Base 1.99.0 tfs_response_command@Base 2.1.0 tfs_response_request@Base 1.99.8 - tfs_restricted_allowed@Base 1.9.1 tfs_restricted_not_restricted@Base 2.5.0 tfs_s2c_c2s@Base 2.5.0 tfs_segmentation_no_segmentation@Base 2.1.0 @@ -1782,6 +1925,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tfs_server_client@Base 2.1.0 tfs_set_notset@Base 1.9.1 tfs_shared_independent@Base 1.9.1 + tfs_should_be_traced_should_not_be_traced@Base 4.4.0 tfs_success_fail@Base 1.9.1 tfs_supported_not_supported@Base 1.9.1 tfs_up_down@Base 2.5.0 @@ -1803,6 +1947,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tls_set_appdata_dissector@Base 3.1.1 tmp_color_filters_used@Base 2.1.0 trans2_cmd_vals_ext@Base 1.9.1 + translate_dfilter@Base 4.4.0 tree_expanded@Base 1.12.0~rc1 tree_expanded_set@Base 1.12.0~rc1 try_bytesprefix_to_str@Base 2.3.0 @@ -1842,9 +1987,12 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tvb_captured_length_remaining@Base 1.12.0~rc1 tvb_child_uncompress@Base 1.12.0~rc1 tvb_child_uncompress_brotli@Base 3.1.0 + tvb_child_uncompress_hpack_huff@Base 4.4.0 tvb_child_uncompress_lz77@Base 3.1.0 tvb_child_uncompress_lz77huff@Base 3.1.0 tvb_child_uncompress_lznt1@Base 3.1.0 + tvb_child_uncompress_snappy@Base 4.4.0 + tvb_child_uncompress_zlib@Base 4.4.0 tvb_child_uncompress_zstd@Base 4.1.0 tvb_clone@Base 1.12.0~rc1 tvb_clone_offset_len@Base 1.12.0~rc1 @@ -1854,11 +2002,11 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tvb_ensure_bytes_exist@Base 1.9.1 tvb_ensure_captured_length_remaining@Base 1.12.0~rc1 tvb_ensure_reported_length_remaining@Base 3.5.0 - tvb_find_guint16@Base 2.3.0 - tvb_find_guint8@Base 1.9.1 tvb_find_line_end@Base 1.9.1 tvb_find_line_end_unquoted@Base 1.9.1 tvb_find_tvb@Base 1.9.1 + tvb_find_uint16@Base 4.4.0 + tvb_find_uint8@Base 4.4.0 tvb_fix_reported_length@Base 4.0.0 tvb_format_text@Base 1.9.1 tvb_format_text_wsp@Base 1.9.1 @@ -1876,25 +2024,18 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tvb_get_ds_tvb@Base 1.9.1 tvb_get_ether_name@Base 1.99.3 tvb_get_etsi_ts_102_221_annex_a_string@Base 3.3.1 - tvb_get_gint16@Base 2.9.0 - tvb_get_gint24@Base 2.9.0 - tvb_get_gint32@Base 2.9.0 - tvb_get_gint40@Base 1.99.2 - tvb_get_gint48@Base 1.99.2 - tvb_get_gint56@Base 1.99.2 - tvb_get_gint64@Base 2.9.0 - tvb_get_gint8@Base 2.9.0 tvb_get_guid@Base 1.9.1 - tvb_get_guint16@Base 1.99.2 - tvb_get_guint24@Base 1.99.2 - tvb_get_guint32@Base 1.99.2 - tvb_get_guint40@Base 1.99.2 - tvb_get_guint48@Base 1.99.2 - tvb_get_guint56@Base 1.99.2 - tvb_get_guint64@Base 1.99.2 - tvb_get_guint8@Base 1.9.1 + tvb_get_hpack_huffman_strbuf@Base 4.4.0 tvb_get_ieee_double@Base 1.99.2 tvb_get_ieee_float@Base 1.99.2 + tvb_get_int16@Base 4.4.0 + tvb_get_int24@Base 4.4.0 + tvb_get_int32@Base 4.4.0 + tvb_get_int40@Base 4.4.0 + tvb_get_int48@Base 4.4.0 + tvb_get_int56@Base 4.4.0 + tvb_get_int64@Base 4.4.0 + tvb_get_int8@Base 4.4.0 tvb_get_ipv4@Base 1.9.1 tvb_get_ipv6@Base 1.9.1 tvb_get_letoh24@Base 1.9.1 @@ -1944,6 +2085,14 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tvb_get_token_len@Base 2.9.0 tvb_get_ts_23_038_7bits_string_packed@Base 3.3.1 tvb_get_ts_23_038_7bits_string_unpacked@Base 3.3.1 + tvb_get_uint16@Base 4.4.0 + tvb_get_uint24@Base 4.4.0 + tvb_get_uint32@Base 4.4.0 + tvb_get_uint40@Base 4.4.0 + tvb_get_uint48@Base 4.4.0 + tvb_get_uint56@Base 4.4.0 + tvb_get_uint64@Base 4.4.0 + tvb_get_uint8@Base 4.4.0 tvb_get_varint@Base 2.5.0 tvb_memcpy@Base 1.9.1 tvb_memdup@Base 1.9.1 @@ -1978,10 +2127,12 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tvb_uncompress_lz77@Base 3.1.0 tvb_uncompress_lz77huff@Base 3.1.0 tvb_uncompress_lznt1@Base 3.1.0 + tvb_uncompress_snappy@Base 4.4.0 + tvb_uncompress_zlib@Base 4.4.0 tvb_uncompress_zstd@Base 4.1.0 tvb_unicode_strsize@Base 1.9.1 tvb_utf_8_isprint@Base 3.7.0 - tvb_ws_mempbrk_pattern_guint8@Base 1.99.3 + tvb_ws_mempbrk_pattern_uint8@Base 4.4.0 tvbparse_casestring@Base 1.9.1 tvbparse_char@Base 1.9.1 tvbparse_chars@Base 1.9.1 @@ -2005,6 +2156,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# tvbparse_until@Base 1.9.1 uat_add_record@Base 1.9.1 uat_clear@Base 1.9.1 + uat_destroy@Base 4.4.0 uat_fld_chk_bool@Base 2.5.0 uat_fld_chk_color@Base 2.5.0 uat_fld_chk_enum@Base 1.9.1 @@ -2031,6 +2183,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# uat_move_index@Base 2.5.0 uat_new@Base 1.9.1 uat_remove_record_idx@Base 1.9.1 + uat_remove_record_range@Base 4.4.0 uat_save@Base 1.9.1 uat_set_default_values@Base 3.6.0 uat_swap@Base 1.9.1 @@ -2052,6 +2205,7 @@ libwireshark.so.17 libwireshark17t64 #MINVER# units_centimeter_centimeters@Base 4.1.0 units_centimeters@Base 4.1.0 units_cm_s@Base 4.1.0 + units_cycle_cycles@Base 4.4.0 units_day_days@Base 2.3.0 units_dbhz@Base 4.1.0 units_dbi@Base 2.3.0 @@ -2156,6 +2310,8 @@ libwireshark.so.17 libwireshark17t64 #MINVER# write_psml_finale@Base 1.12.0~rc1 write_psml_preamble@Base 1.12.0~rc1 ws_find_media_type_parameter@Base 2.2.0 + ws_iana_ipv4_special_block_lookup@Base 4.4.0 + ws_iana_ipv6_special_block_lookup@Base 4.4.0 ws_label_strcat@Base 4.1.0 ws_label_strcpy@Base 4.1.0 ws_manuf_block_str@Base 4.1.0 @@ -2163,6 +2319,8 @@ libwireshark.so.17 libwireshark17t64 #MINVER# ws_manuf_dump@Base 4.1.0 ws_manuf_iter_init@Base 4.1.0 ws_manuf_iter_next@Base 4.1.0 + ws_manuf_lookup@Base 4.4.0 + ws_manuf_lookup_oui24@Base 4.4.0 ws_manuf_lookup_str@Base 4.1.0 wscbor_chunk_free@Base 3.5.1 wscbor_chunk_mark_errors@Base 3.5.1 @@ -2183,11 +2341,11 @@ libwireshark.so.17 libwireshark17t64 #MINVER# wscbor_require_uint64@Base 3.5.1 wscbor_skip_if_errors@Base 3.5.1 wscbor_skip_next_item@Base 3.5.1 - wslua_count_plugins@Base 1.12.0~rc1 - wslua_plugin_type_name@Base 2.5.0 - wslua_plugins_dump_all@Base 1.12.0~rc1 - wslua_plugins_get_descriptions@Base 1.12.0~rc1 - wslua_reload_plugins@Base 1.99.9 + wslua_count_plugins@Base 4.4.0 + wslua_plugin_type_name@Base 4.4.0 + wslua_plugins_dump_all@Base 4.4.0 + wslua_plugins_get_descriptions@Base 4.4.0 + wslua_reload_plugins@Base 4.4.0 wsp_vals_pdu_type_ext@Base 1.9.1 wsp_vals_status_ext@Base 1.9.1 xml_escape@Base 1.9.1 diff --git a/debian/libwiretap14t64.lintian-overrides b/debian/libwiretap14t64.lintian-overrides deleted file mode 100644 index be2513a8..00000000 --- a/debian/libwiretap14t64.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libwiretap14t64: package-name-doesnt-match-sonames libwiretap14 diff --git a/debian/libwiretap14t64.docs b/debian/libwiretap15.docs index 0c482717..0c482717 100644 --- a/debian/libwiretap14t64.docs +++ b/debian/libwiretap15.docs diff --git a/debian/libwiretap14t64.install b/debian/libwiretap15.install index f9d702aa..f9d702aa 100644 --- a/debian/libwiretap14t64.install +++ b/debian/libwiretap15.install diff --git a/debian/libwiretap15.lintian-overrides b/debian/libwiretap15.lintian-overrides new file mode 100644 index 00000000..d96d49c5 --- /dev/null +++ b/debian/libwiretap15.lintian-overrides @@ -0,0 +1 @@ +libwiretap15: package-name-doesnt-match-sonames libwiretap15 diff --git a/debian/libwiretap14t64.symbols b/debian/libwiretap15.symbols index 4d25d71b..284bffac 100644 --- a/debian/libwiretap14t64.symbols +++ b/debian/libwiretap15.symbols @@ -1,4 +1,4 @@ -libwiretap.so.14 libwiretap14t64 #MINVER# +libwiretap.so.15 libwiretap15 #MINVER# file_eof@Base 1.9.1 file_error@Base 1.9.1 file_getc@Base 1.9.1 @@ -28,6 +28,7 @@ libwiretap.so.14 libwiretap14t64 #MINVER# pcapng_process_uint8_option@Base 3.5.0 register_pcapng_block_type_handler@Base 1.99.0 register_pcapng_option_handler@Base 1.99.2 + secrets_type_description@Base 4.4.0 wtap_add_generated_idb@Base 3.3.0 wtap_addrinfo_list_empty@Base 2.5.0 wtap_block_add_bytes_option@Base 3.5.0 @@ -97,6 +98,7 @@ libwiretap.so.14 libwiretap14t64 #MINVER# wtap_buffer_append_epdu_string@Base 4.1.1 wtap_buffer_append_epdu_tag@Base 4.1.0 wtap_buffer_append_epdu_uint@Base 4.1.0 + wtap_can_write_compression_type@Base 4.4.0 wtap_cleanup@Base 2.3.0 wtap_cleareof@Base 1.9.1 wtap_close@Base 1.9.1 @@ -133,15 +135,19 @@ libwiretap.so.14 libwiretap14t64 #MINVER# wtap_encap_description@Base 2.9.1 wtap_encap_name@Base 2.9.1 wtap_encap_requires_phdr@Base 1.9.1 + wtap_extension_to_compression_type@Base 4.4.0 wtap_fdclose@Base 1.9.1 wtap_fdreopen@Base 1.9.1 wtap_file_add_decryption_secrets@Base 4.1.0 wtap_file_discard_decryption_secrets@Base 4.1.0 wtap_file_encap@Base 1.9.1 + wtap_file_get_dsb@Base 4.4.0 wtap_file_get_idb_info@Base 1.9.1 wtap_file_get_nrb@Base 2.1.2 + wtap_file_get_num_dsbs@Base 4.4.0 wtap_file_get_num_shbs@Base 3.3.0 wtap_file_get_shb@Base 1.99.9 + wtap_file_get_shb_global_interface_id@Base 4.4.0 wtap_file_size@Base 1.9.1 wtap_file_tsprec@Base 1.99.0 wtap_file_type_subtype@Base 1.12.0~rc1 @@ -155,6 +161,7 @@ libwiretap.so.14 libwiretap14t64 #MINVER# wtap_get_all_capture_file_extensions_list@Base 2.3.0 wtap_get_all_compression_type_extensions_list@Base 2.9.0 wtap_get_all_file_extensions_list@Base 2.6.2 + wtap_get_all_output_compression_type_names_list@Base 4.4.0 wtap_get_bytes_dumped@Base 1.9.1 wtap_get_compression_type@Base 2.9.0 wtap_get_debug_if_descr@Base 1.99.9 @@ -171,6 +178,7 @@ libwiretap.so.14 libwiretap14t64 #MINVER# wtap_inspect_enums@Base 4.1.0 wtap_inspect_enums_bsearch@Base 4.1.0 wtap_inspect_enums_count@Base 4.1.0 + wtap_name_to_compression_type@Base 4.4.0 wtap_name_to_encap@Base 4.1.0 wtap_name_to_file_type_subtype@Base 3.5.0 wtap_open_offline@Base 1.9.1 diff --git a/debian/libwsutil15t64.lintian-overrides b/debian/libwsutil15t64.lintian-overrides deleted file mode 100644 index b12a3910..00000000 --- a/debian/libwsutil15t64.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libwsutil15t64: package-name-doesnt-match-sonames libwsutil15 diff --git a/debian/libwsutil15t64.install b/debian/libwsutil16.install index e9f07612..e9f07612 100644 --- a/debian/libwsutil15t64.install +++ b/debian/libwsutil16.install diff --git a/debian/libwsutil16.lintian-overrides b/debian/libwsutil16.lintian-overrides new file mode 100644 index 00000000..49ad0dc3 --- /dev/null +++ b/debian/libwsutil16.lintian-overrides @@ -0,0 +1 @@ +libwsutil16: package-name-doesnt-match-sonames libwsutil16 diff --git a/debian/libwsutil15t64.symbols b/debian/libwsutil16.symbols index be224ba7..56cc6797 100644 --- a/debian/libwsutil15t64.symbols +++ b/debian/libwsutil16.symbols @@ -1,9 +1,8 @@ -libwsutil.so.15 libwsutil15t64 #MINVER# +libwsutil.so.16 libwsutil16 #MINVER# Dot11DecryptWepDecrypt@Base 2.5.0 EBCDIC_to_ASCII1@Base 4.1.0 EBCDIC_to_ASCII@Base 4.1.0 Eax_Decrypt@Base 1.12.0~rc1 - add_to_filter_list@Base 4.1.0 adler32_bytes@Base 1.12.0~rc1 adler32_str@Base 1.12.0~rc1 alaw2linear@Base 1.12.0~rc1 @@ -85,6 +84,8 @@ libwsutil.so.15 libwsutil15t64 #MINVER# file_open_error_message@Base 1.12.0~rc1 file_write_error_message@Base 1.12.0~rc1 files_identical@Base 1.12.0~rc1 + filetime_1sec_to_nstime@Base 4.4.0 + filetime_ns_to_nstime@Base 4.4.0 filetime_to_nstime@Base 2.0.0 find_codec@Base 3.1.0 find_last_pathname_separator@Base 1.12.0~rc1 @@ -96,12 +97,13 @@ libwsutil.so.15 libwsutil15t64 #MINVER# format_text_chr@Base 4.1.0 format_text_string@Base 4.1.0 format_text_wsp@Base 4.1.0 + format_units@Base 4.4.0 free_features@Base 3.7.0 - free_filter_lists@Base 4.1.0 free_progdirs@Base 2.3.0 gather_pcre2_compile_info@Base 4.1.0 gather_pcre2_runtime_info@Base 4.1.0 gather_zlib_compile_info@Base 4.1.0 + gather_zlib_ng_compile_info@Base 4.4.0 gather_zlib_runtime_info@Base 4.1.0 get_appname_and_version@Base 4.1.0 get_basename@Base 1.12.0~rc1 @@ -111,6 +113,7 @@ libwsutil.so.15 libwsutil15t64 #MINVER# get_cpu_info@Base 2.3.0 get_cur_groupname@Base 1.10.0 get_cur_username@Base 1.10.0 + get_current_working_dir@Base 4.4.0 get_datafile_dir@Base 1.12.0~rc1 get_datafile_path@Base 1.12.0~rc1 get_dirname@Base 1.12.0~rc1 @@ -119,14 +122,14 @@ libwsutil.so.15 libwsutil15t64 #MINVER# get_executable_path@Base 4.1.0 get_extcap_dir@Base 1.99.0 get_extcap_pers_dir@Base 4.1.0 - get_filter_list_first@Base 4.1.0 get_friendly_program_name@Base 3.5.0 get_global_profiles_dir@Base 1.12.0~rc1 - get_guint32@Base 4.1.0 get_license_info@Base 4.1.0 get_license_info_short@Base 4.1.0 + get_lr_vcs_version_info@Base 4.4.0 get_natural_int@Base 4.1.0 - get_nonzero_guint32@Base 4.1.0 + get_nonzero_uint32@Base 4.4.0 + get_nonzero_uint64@Base 4.4.0 get_os_version_info@Base 1.99.0 get_persconffile_path@Base 1.12.0~rc1 get_persdatafile_dir@Base 1.12.0~rc1 @@ -143,17 +146,17 @@ libwsutil.so.15 libwsutil15t64 #MINVER# get_resource_usage@Base 2.3.0 get_runtime_version_info@Base 4.1.0 get_systemfile_dir@Base 1.12.0~rc1 + get_uint32@Base 4.4.0 + get_uint64@Base 4.4.0 get_ws_vcs_version_info@Base 4.1.0 get_ws_vcs_version_info_short@Base 4.1.0 get_ws_version_number@Base 4.1.0 - guint32_to_str_buf@Base 3.5.1 - guint64_to_str_buf@Base 3.5.1 - guint8_to_hex@Base 3.5.1 has_global_profiles@Base 1.12.0~rc1 hex64_to_str_back_len@Base 3.5.1 hex_dump_buffer@Base 4.1.0 hex_to_str_back_len@Base 3.5.1 hkdf_expand@Base 2.5.1 + ieee80211_chan_band_to_mhz@Base 4.4.0 ieee80211_chan_to_mhz@Base 1.99.7 ieee80211_mhz_to_chan@Base 1.99.7 ieee80211_mhz_to_str@Base 1.99.7 @@ -163,6 +166,10 @@ libwsutil.so.15 libwsutil15t64 #MINVER# int_to_str_back@Base 3.5.1 ip6_to_str@Base 3.5.1 ip6_to_str_buf@Base 3.5.1 + ip_addr_to_str@Base 4.4.0 + ip_addr_to_str_buf@Base 4.4.0 + ip_num_to_str@Base 4.4.0 + ip_num_to_str_buf@Base 4.4.0 ip_to_str@Base 3.5.1 ip_to_str_buf@Base 3.5.1 ipxnet_to_str_punct@Base 3.5.1 @@ -189,6 +196,7 @@ libwsutil.so.15 libwsutil15t64 #MINVER# json_get_array@Base 3.5.0 json_get_array_index@Base 3.5.0 json_get_array_len@Base 3.5.0 + json_get_boolean@Base 4.4.0 json_get_double@Base 3.1.0 json_get_object@Base 3.1.0 json_get_string@Base 3.1.0 @@ -205,7 +213,6 @@ libwsutil.so.15 libwsutil15t64 #MINVER# mpa_padding@Base 1.10.0 mpa_samples@Base 1.10.0 mpa_version@Base 1.10.0 - nsfiletime_to_nstime@Base 2.0.0 nstime_cmp@Base 1.12.0~rc1 nstime_copy@Base 1.12.0~rc1 nstime_delta@Base 1.12.0~rc1 @@ -235,10 +242,8 @@ libwsutil.so.15 libwsutil15t64 #MINVER# profile_store_persconffiles@Base 1.12.0~rc1 qword_to_hex@Base 3.5.1 qword_to_hex_punct@Base 3.5.1 - read_filter_list@Base 4.1.0 register_codec@Base 3.1.0 relinquish_special_privs_perm@Base 1.10.0 - remove_from_filter_list@Base 4.1.0 rename_persconffile_profile@Base 1.12.0~rc1 report_cfile_close_failure@Base 3.5.0 report_cfile_dump_open_failure@Base 3.5.0 @@ -257,7 +262,6 @@ libwsutil.so.15 libwsutil15t64 #MINVER# rsa_privkey_to_sexp@Base 2.5.0 running_in_build_directory@Base 1.12.0~rc1 running_with_special_privs@Base 1.10.0 - save_filter_list@Base 4.1.0 set_persconffile_dir@Base 1.12.0~rc1 set_persdatafile_dir@Base 1.12.0~rc1 set_profile_name@Base 1.12.0~rc1 @@ -270,11 +274,15 @@ libwsutil.so.15 libwsutil15t64 #MINVER# started_with_special_privs@Base 1.10.0 test_for_directory@Base 1.12.0~rc1 test_for_fifo@Base 1.12.0~rc1 + test_for_regular_file@Base 4.4.0 tm_is_valid@Base 3.5.0 - type_util_gdouble_to_guint64@Base 1.10.0 - type_util_guint64_to_gdouble@Base 1.10.0 + type_util_double_to_uint64@Base 4.4.0 + type_util_uint64_to_double@Base 4.4.0 + uint32_to_str_buf@Base 4.4.0 uint64_to_str_back@Base 3.5.1 uint64_to_str_back_len@Base 3.5.1 + uint64_to_str_buf@Base 4.4.0 + uint8_to_hex@Base 4.4.0 uint_to_str_back@Base 3.5.1 uint_to_str_back_len@Base 3.5.1 ulaw2linear@Base 1.12.0~rc1 @@ -320,6 +328,7 @@ libwsutil.so.15 libwsutil15t64 #MINVER# wmem_itree_new@Base 3.5.0 wmem_leave_scope@Base 3.5.0 wmem_list_append@Base 3.5.0 + wmem_list_append_sorted@Base 4.4.0 wmem_list_count@Base 3.5.0 wmem_list_find@Base 3.5.0 wmem_list_find_custom@Base 3.5.0 @@ -436,9 +445,16 @@ libwsutil.so.15 libwsutil15t64 #MINVER# ws_clock_get_realtime@Base 3.7.0 ws_cmac_buffer@Base 3.1.0 ws_enums_bsearch@Base 4.1.0 + ws_escape_csv@Base 4.4.0 ws_escape_null@Base 4.0.0 ws_escape_string@Base 3.7.0 ws_escape_string_len@Base 4.0.0 + ws_filter_list_add@Base 4.4.0 + ws_filter_list_find@Base 4.4.0 + ws_filter_list_free@Base 4.4.0 + ws_filter_list_read@Base 4.4.0 + ws_filter_list_remove@Base 4.4.0 + ws_filter_list_write@Base 4.4.0 ws_getopt@Base 3.5.1 ws_getopt_long@Base 3.5.1 ws_getopt_long_only@Base 3.5.1 @@ -455,6 +471,10 @@ libwsutil.so.15 libwsutil15t64 #MINVER# ws_inet_pton6@Base 2.1.2 ws_init_sockets@Base 3.1.0 ws_init_version_info@Base 4.1.0 + ws_ipv4_addr_and_mask_contains@Base 4.4.0 + ws_ipv4_addr_and_mask_init@Base 4.4.0 + ws_ipv4_get_subnet_mask@Base 4.4.0 + ws_ipv6_addr_and_prefix_contains@Base 4.4.0 ws_localtime_r@Base 4.1.1 ws_log@Base 3.5.0 ws_log_add_custom_file@Base 3.5.0 @@ -490,6 +510,8 @@ libwsutil.so.15 libwsutil15t64 #MINVER# ws_memmem@Base 3.7.0 ws_mempbrk_compile@Base 1.99.4 ws_mempbrk_exec@Base 1.99.4 + ws_memrchr@Base 4.4.0 + ws_memrpbrk_exec@Base 4.4.0 ws_optarg@Base 3.5.1 ws_opterr@Base 3.5.1 ws_optind@Base 3.5.1 diff --git a/debian/patches/0001-Resources-Make-our-.pc-file-static-again.patch b/debian/patches/0001-Resources-Make-our-.pc-file-static-again.patch new file mode 100644 index 00000000..d0991afe --- /dev/null +++ b/debian/patches/0001-Resources-Make-our-.pc-file-static-again.patch @@ -0,0 +1,28 @@ +From 81b2647233ced75165e37de2ef5bee4659c9d3a9 Mon Sep 17 00:00:00 2001 +From: AndersBroman <a.broman58@gmail.com> +Date: Wed, 4 Sep 2024 15:47:41 +0000 +Subject: [PATCH] Resources: Make our .pc file static again + +Partially revert 107550c9c0 and make the pkgconfig prefix static. + + +(cherry picked from commit a9d17a13afa15c7ffe5afc6db817208bc2887a13) + +Co-authored-by: Gerald Combs <gerald@wireshark.org> +--- + resources/wireshark.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resources/wireshark.pc.in b/resources/wireshark.pc.in +index 212d4ec311..a3fead0dc4 100644 +--- a/resources/wireshark.pc.in ++++ b/resources/wireshark.pc.in +@@ -1,4 +1,4 @@ +-prefix=${pcfiledir}/../.. ++prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-- +2.43.0 + diff --git a/debian/patches/series b/debian/patches/series index 162876e7..d04723a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +0001-Resources-Make-our-.pc-file-static-again.patch 09_idl2wrs.patch 0004-Use-packaged-JS-and-CSS-resources-instead-of-pulling.patch diff --git a/debian/rules b/debian/rules index 58e50c04..55e8b9d2 100755 --- a/debian/rules +++ b/debian/rules @@ -59,7 +59,7 @@ override_dh_auto_build-indep: dh_auto_build -i $(MAKE) -C $(CURDIR)/obj-* user_guide_html developer_guide_html # fix links in documentation - sed -i "s|$(CURDIR)/docbook|..|" obj-*/docbook/ws*g_html_chunked/*.html + sed -i "s|$(CURDIR)/doc|..|" obj-*/doc/ws*g_html_chunked/*.html override_dh_dwz: # run dh_dwz only with debhelper (>= 12.6) to work around https://bugs.debian.org/939164 @@ -92,27 +92,17 @@ override_dh_fixperms-arch: override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) -C obj-* test-programs -ifneq (,$(filter armel armhf hppa mips mipsel s390x,$(DEB_HOST_ARCH))) +ifneq (,$(filter hppa m68k powerpc ppc64 sparc64 s390x,$(DEB_HOST_ARCH))) # reported as https://gitlab.com/wireshark/wireshark/-/issues/15945 - -dh_auto_test + -env LC_ALL=C.UTF-8 dh_auto_test else - dh_auto_test + env LC_ALL=C.UTF-8 dh_auto_test endif endif override_dh_clean: dh_clean -- debian/control # regenerate debian/control -ifneq ($(filter noble oracular unstable sid testing trixie UNRELEASED,$(DEB_DISTRIBUTION)),) - sed "$(CONTROL_IN_SED_CMD)" debian/control.t64.in > debian/control -else sed "$(CONTROL_IN_SED_CMD)" debian/control.in > debian/control - # also revert t64-related changes in backports - for f in debian/lib*t64*; do \ - [ -f $$f ] || continue; \ - sed -i 's/\([0-9]\)t64/\1/g' $$f; \ - echo $$f | sed 's/t64//' | xargs mv $$f; \ - done -endif # ignore #653916 @echo 'blhc: ignore-line-regexp: .*CMakeCXXCompilerABI.cpp .*' diff --git a/debian/wireshark-doc.docs b/debian/wireshark-doc.docs index c95d3d9d..f085787e 100644 --- a/debian/wireshark-doc.docs +++ b/debian/wireshark-doc.docs @@ -1,2 +1,2 @@ -obj-*/docbook/wsdg_html_chunked -obj-*/docbook/wsug_html_chunked +obj-*/doc/wsdg_html_chunked +obj-*/doc/wsug_html_chunked |