package/wireshark: bump to version 3.4.0
PATCH v2 1/1 package/wireshark: bump to version 3.4.0
- c-ares is mandatory since
https://github.com/wireshark/wireshark/commit/451a241e50bd34ba097bd09a5f9f673170779aaf
- Disable ilibc which is available and enabled by default since
https://github.com/wireshark/wireshark/commit/12a13a69264fdef4281e4b13c8c7d92a272cc99e
- LTO can be enabled since
https://github.com/wireshark/wireshark/commit/e6b5bd09766a1320c5540f78eb0e4ba03ce8f108
- opus is an optional dependency since
https://github.com/wireshark/wireshark/commit/6136c719da4ec9b96c01adb4b0fd7f01af171688
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
---
Changes v1 -> v2 (after review of Petr Vorel):
- c-ares is now mandatory
package/wireshark/Config.in | 1 + package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 31 ++++++++++++++++++++++--------- 3 files changed, 26 insertions(+), 12 deletions(-)
package/wireshark/Config.in +1 -0
@@ -5,6 +5,7 @@ config BR2_PACKAGE_WIRESHARK depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + select BR2_PACKAGE_C_ARES select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2
package/wireshark/wireshark.hash +3 -3
@@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.8.txt -sha1 5fdcbbe3a50cea38a8fa5f10b21f58cbef31793e wireshark-3.2.8.tar.xz -sha256 a8a595d08f38c6bd083886f6c199b9d4fb007e363031b263667c7da72323cc32 wireshark-3.2.8.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.0.txt +sha1 6fdf4f394c287f1e21b48c5293ec1a6e6b627996 wireshark-3.4.0.tar.xz +sha256 67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae wireshark-3.4.0.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING
package/wireshark/wireshark.mk +22 -9
@@ -4,12 +4,18 @@ # ################################################################################ -WIRESHARK_VERSION = 3.2.8 +WIRESHARK_VERSION = 3.4.0 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING -WIRESHARK_DEPENDENCIES = host-pkgconf host-python3 libgcrypt libpcap libglib2 \ +WIRESHARK_DEPENDENCIES = \ + c-ares \ + host-pkgconf \ + host-python3 \ + libgcrypt \ + libglib2 \ + libpcap \ speexdsp WIRESHARK_MAKE_ENV = \
@@ -18,6 +24,7 @@ WIRESHARK_MAKE_ENV = \ WIRESHARK_CONF_OPTS = \ -DDISABLE_WERROR=ON \ + -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF
@@ -35,6 +42,12 @@ endef WIRESHARK_PRE_BUILD_HOOKS += WIRESHARK_BUILD_LEMON_TOOL +ifeq ($(BR2_GCC_ENABLE_LTO),y) +WIRESHARK_CONF_OPTS += -DENABLE_LTO=ON +else +WIRESHARK_CONF_OPTS += -DENABLE_LTO=OFF +endif + ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y) WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools
@@ -56,13 +69,6 @@ else WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF endif -ifeq ($(BR2_PACKAGE_C_ARES),y) -WIRESHARK_CONF_OPTS += -DENABLE_CARES=ON -WIRESHARK_DEPENDENCIES += c-ares -else -WIRESHARK_CONF_OPTS += -DENABLE_CARES=OFF -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON WIRESHARK_DEPENDENCIES += gnutls
@@ -127,6 +133,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=OFF endif +ifeq ($(BR2_PACKAGE_OPUS),y) +WIRESHARK_CONF_OPTS += -DENABLE_OPUS=ON +WIRESHARK_DEPENDENCIES += opus +else +WIRESHARK_CONF_OPTS += -DENABLE_OPUS=OFF +endif + ifeq ($(BR2_PACKAGE_SBC),y) WIRESHARK_CONF_OPTS += -DENABLE_SBC=ON WIRESHARK_DEPENDENCIES += sbc
Signature · 1 line
2.28.0
PATCH v2 1/1 package/wireshark: bump to version 3.4.0
Quoted 9 lines
- c-ares is mandatory since
https://github.com/wireshark/wireshark/commit/451a241e50bd34ba097bd09a5f9f673170779aaf
- Disable ilibc which is available and enabled by default since
https://github.com/wireshark/wireshark/commit/12a13a69264fdef4281e4b13c8c7d92a272cc99e
- LTO can be enabled since
https://github.com/wireshark/wireshark/commit/e6b5bd09766a1320c5540f78eb0e4ba03ce8f108
- opus is an optional dependency since
https://github.com/wireshark/wireshark/commit/6136c719da4ec9b96c01adb4b0fd7f01af171688
Quoted 5 lines
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
---
Changes v1 -> v2 (after review of Petr Vorel):
- c-ares is now mandatory
I also found some problems with br-powerpc-e500mc-full
[ 92%] Linking C shared library ../run/libwireshark.sobr-test-pkg/br-powerpc-e500mc-full/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/8.3.0/crtbeginS.o: in function `__do_global_dtors_aux':
crtstuff.c:(.text+0x168): relocation truncated to fit: R_PPC_PLTREL24 against symbol __cxa_finalize' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_and_mask.c.o: in function ip_get_subnet_mask':
addr_and_mask.c:(.text+0x44): relocation truncated to fit: R_PPC_PLTREL24 against symbol `g_assertion_message_expr' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.so CMakeFiles/epan.dir/addr_and_mask.c.o: in function `tvb_get_ipv4_addr_with_prefix_len':
addr_and_mask.c:(.text+0xa0): relocation truncated to fit: R_PPC_PLTREL24 against symbol `tvb_memcpy' defined in .text section in CMakeFiles/epan.dir/tvbuff.c.oCMakeFiles/epan.dir/addr_and_mask.c.o: in function `tvb_get_ipv6_addr_with_prefix_len':
addr_and_mask.c:(.text+0x118): relocation truncated to fit: R_PPC_PLTREL24 against symbol `memset' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 addr_and_mask.c:(.text+0x12c): relocation truncated to fit: R_PPC_PLTREL24 against symbol `tvb_memcpy' defined in .text section in CMakeFiles/epan.dir/tvbuff.c.oCMakeFiles/epan.dir/addr_resolv.c.o: in function `ipv6_equal':
addr_resolv.c:(.text+0x5c): relocation truncated to fit: R_PPC_PLTREL24 against symbol memcmp' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_resolv.c.o: in function eth_addr_cmp':
addr_resolv.c:(.text+0x88): relocation truncated to fit: R_PPC_PLTREL24 against symbol memcmp' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_resolv.c.o: in function _serv_name_lookup':
addr_resolv.c:(.text+0xd8): relocation truncated to fit: R_PPC_PLTREL24 against symbol wmem_map_lookup' defined in .text section in wmem/CMakeFiles/wmem.dir/wmem_map.c.o CMakeFiles/epan.dir/addr_resolv.c.o: in function wka_name_lookup':
addr_resolv.c:(.text+0x1dc): relocation truncated to fit: R_PPC_PLTREL24 against symbol wmem_map_lookup' defined in .text section in wmem/CMakeFiles/wmem.dir/wmem_map.c.o CMakeFiles/epan.dir/addr_resolv.c.o: in function end_ethent':
addr_resolv.c:(.text+0x240): relocation truncated to fit: R_PPC_PLTREL24 against symbol fclose' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_resolv.c.o: in function end_ipxnetent':
addr_resolv.c:(.text+0x288): additional relocation overflows omitted from the output
collect2: error: ld returned 1 exit status
+ now common problems with br-riscv32 discussed in:
https://patchwork.ozlabs.org/project/buildroot/patch/20201101180154.14307-1-petr.vorel at gmail.com/#2566327
Kind regards,
Petr
PATCH v2 1/1 package/wireshark: bump to version 3.4.0
Hi Petr,
Le mar. 3 nov. 2020 ? 00:52, Petr Vorel <[email protected]> a ?crit :
Quoted 35 lines
Quoted 10 lines
- c-ares is mandatory since
https://github.com/wireshark/wireshark/commit/451a241e50bd34ba097bd09a5f9f673170779aaf
- Disable ilibc which is available and enabled by default since
https://github.com/wireshark/wireshark/commit/12a13a69264fdef4281e4b13c8c7d92a272cc99e
- LTO can be enabled since
https://github.com/wireshark/wireshark/commit/e6b5bd09766a1320c5540f78eb0e4ba03ce8f108
- opus is an optional dependency since
https://github.com/wireshark/wireshark/commit/6136c719da4ec9b96c01adb4b0fd7f01af171688Quoted 5 lines
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
---
Changes v1 -> v2 (after review of Petr Vorel):
- c-ares is now mandatoryReviewed-by Petr Vorel <[email protected]>Tested-by Petr Vorel <[email protected]>I also found some problems with br-powerpc-e500mc-full
[ 92%] Linking C shared library ../run/libwireshark.so
br-test-pkg/br-powerpc-e500mc-full/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/8.3.0/crtbeginS.o: in function `__do_global_dtors_aux':
crtstuff.c:(.text+0x168): relocation truncated to fit:R_PPC_PLTREL24against symbol__cxa_finalize' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_and_mask.c.o: in functionip_get_subnet_mask':
addr_and_mask.c:(.text+0x44): relocation truncated to fit:R_PPC_PLTREL24against symbol `g_assertion_message_expr' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.soCMakeFiles/epan.dir/addr_and_mask.c.o: in function `tvb_get_ipv4_addr_with_prefix_len':
addr_and_mask.c:(.text+0xa0): relocation truncated to fit:R_PPC_PLTREL24against symbol `tvb_memcpy' defined in .text section inCMakeFiles/epan.dir/tvbuff.c.oCMakeFiles/epan.dir/addr_and_mask.c.o: in function `tvb_get_ipv6_addr_with_prefix_len':
addr_and_mask.c:(.text+0x118): relocation truncated to fit:R_PPC_PLTREL24against symbol `memset' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 addr_and_mask.c:(.text+0x12c): relocation truncated to fit:R_PPC_PLTREL24against symbol `tvb_memcpy' defined in .text section inCMakeFiles/epan.dir/tvbuff.c.oCMakeFiles/epan.dir/addr_resolv.c.o: in function `ipv6_equal':
addr_resolv.c:(.text+0x5c): relocation truncated to fit:R_PPC_PLTREL24against symbolmemcmp' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_resolv.c.o: in functioneth_addr_cmp':
addr_resolv.c:(.text+0x88): relocation truncated to fit:R_PPC_PLTREL24against symbolmemcmp' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_resolv.c.o: in function_serv_name_lookup':
Quoted 8 lines
addr_resolv.c:(.text+0xd8): relocation truncated to fit:
R_PPC_PLTREL24against symbolwmem_map_lookup' defined in .text section in wmem/CMakeFiles/wmem.dir/wmem_map.c.o CMakeFiles/epan.dir/addr_resolv.c.o: in functionwka_name_lookup':
addr_resolv.c:(.text+0x1dc): relocation truncated to fit:R_PPC_PLTREL24against symbolwmem_map_lookup' defined in .text section in wmem/CMakeFiles/wmem.dir/wmem_map.c.o CMakeFiles/epan.dir/addr_resolv.c.o: in functionend_ethent':
addr_resolv.c:(.text+0x240): relocation truncated to fit:R_PPC_PLTREL24against symbolfclose' defined in .text section in br-test-pkg/br-powerpc-e500mc-full/host/powerpc-buildroot-linux-uclibc/sysroot/lib/libc.so.1 CMakeFiles/epan.dir/addr_resolv.c.o: in functionend_ipxnetent':
addr_resolv.c:(.text+0x288): additional relocation overflows omitted from the output
collect2: error: ld returned 1 exit status
wireshark fails to build on br-powerpc-e500mc-full since version 3.0.2: http://autobuild.buildroot.org/?subarch=e500mc&reason=wireshark%.
I don't know how to fix it but nothing new here.
Quoted 6 lines
+ now common problems with br-riscv32 discussed in:
https://patchwork.ozlabs.org/project/buildroot/patch/20201101180154.14307-1-petr.vorel at gmail.com/#2566327Kind regards,
Petr
Best Regards,
Fabrice
PATCH v2 1/1 package/wireshark: bump to version 3.4.0
In reply to Fabrice FontaineQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- c-ares is mandatory since
https://github.com/wireshark/wireshark/commit/451a241e50bd34ba097bd09a5f9f673170779aaf
- Disable ilibc which is available and enabled by default since
https://github.com/wireshark/wireshark/commit/12a13a69264fdef4281e4b13c8c7d92a272cc99e
- LTO can be enabled since
https://github.com/wireshark/wireshark/commit/e6b5bd09766a1320c5540f78eb0e4ba03ce8f108
- opus is an optional dependency since
https://github.com/wireshark/wireshark/commit/6136c719da4ec9b96c01adb4b0fd7f01af171688
Quoted 6 lines
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Petr Vorel):
- c-ares is now mandatory
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard