Skip to contentSkip to conversation

package/wireshark: bump to version 3.2.0

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 26, 2019 – Dec 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/wireshark: bump to version 3.2.0

- Remove patches (already in version)
- Add patch to fix static build with pcap by reverting an upstream commit. This patch has been sent upstream and there is already some comments on it. However, upstream does not seem to really care/test static builds. So, perhaps an easier road would to add a dynamic library dependency on wireshark instead of fixing things again and again each time wireshark is bumped...
- Add mandatory speexdsp dependency to avoid using internal one when building wireshark or sharkd:
https://github.com/wireshark/wireshark/commit/186f985793cceb7d7222955987df72ab5a82beeb
- Disable -Werror (it is now enabled by default)
- Add brotli optional dependency:
https://github.com/wireshark/wireshark/commit/9ce60b173bf17b7d20695d9dc1de050989019664

---
 .../0001-CMake-add-USE_STATIC-option.patch    |  70 ------------
 ...ke-Add-libpcap-imported-library-targ.patch | 104 ++++++++++++++++++
 ...pkg-config-to-find-pcap-dependencies.patch |  45 --------
 ...-config-to-find-libxml2-dependencies.patch |  48 --------
 package/wireshark/Config.in                   |   1 +
 package/wireshark/wireshark.hash              |   6 +-
 package/wireshark/wireshark.mk                |  13 ++-
 7 files changed, 119 insertions(+), 168 deletions(-)
 delete mode 100644 package/wireshark/0001-CMake-add-USE_STATIC-option.patch
 create mode 100644 package/wireshark/0001-CMake-revert-CMake-Add-libpcap-imported-library-targ.patch
 delete mode 100644 package/wireshark/0002-FindPCAP-use-pkg-config-to-find-pcap-dependencies.patch
 delete mode 100644 package/wireshark/0003-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch
package/wireshark/0001-CMake-add-USE_STATIC-option.patch deleted +0 -70
deleted file mode 100644
index ebfa723697..0000000000
@@ -1,70 +0,0 @@
-From 900b9f137910c0ad0fe95d7354af8315ffeb0b04 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Mon, 22 Apr 2019 18:39:52 +0200
-Subject: [PATCH] CMake: add USE_STATIC option
-
-USE_STATIC will:
- - always link statically with external libraries (such as glib2)
- - will not set rpath to avoid the following error:
-
-CMake Error at cmake_install.cmake:50 (file):
-  file RPATH_CHANGE could not write new RPATH:
-
-    /usr/lib
-
-  to the file:
-
-    /home/fabrice/br-test-pkg/br-arm-full-static/target/usr/bin/tshark
-
-  No valid ELF RPATH or RUNPATH entry exists in the file;
-
-Change-Id: I242dc1a091cc211ee891568a2dee5080c9974fba
-Ping-Bug: 15713
-Signed-off-by: Fabrice Fontaine <[email protected]>
-Reviewed-on: https://code.wireshark.org/review/32945
-Petri-Dish: Peter Wu <[email protected]>
-Tested-by: Petri Dish Buildbot
-Reviewed-by: Peter Wu <[email protected]>
-[Retrieved from:
-https://github.com/wireshark/wireshark/commit/900b9f137910c0ad0fe95d7354af8315ffeb0b04]
----
- CMakeLists.txt   | 6 +++++-
- CMakeOptions.txt | 1 +
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df62819651..e2fdafc227 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -185,7 +185,7 @@ set(PROJECT_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
- set(LIBRARY_INSTALL_RPATH "")
- set(EXECUTABLE_INSTALL_RPATH "")
- set(EXTCAP_INSTALL_RPATH "")
--if(NOT (WIN32 OR APPLE))
-+if(NOT (WIN32 OR APPLE OR USE_STATIC))
- 	# Try to set a RPATH for installed binaries if the library directory is
- 	# not already included in the default search list.
- 	list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" IS_SYSTEM_DIR)
-@@ -325,6 +325,10 @@ if(OSS_FUZZ)
- 		message(FATAL_ERROR "Cannot force libFuzzer when using oss-fuzz")
- 	endif()
- 	# Must not depend on external dependencies so statically link all libs.
-+	set(USE_STATIC ON)
-+endif()
-+
-+if(USE_STATIC)
- 	set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
- endif()
- 
-diff --git a/CMakeOptions.txt b/CMakeOptions.txt
-index b99e949c44..a605f7b49c 100644
---- a/CMakeOptions.txt
-+++ b/CMakeOptions.txt
-@@ -59,6 +59,7 @@ if(WIN32)
- 	option(ENABLE_AIRPCAP    "Enable AirPcap support" ON)
- endif()
- option(ENABLE_STATIC            "Build Wireshark libraries statically" OFF)
-+option(USE_STATIC               "Always link statically with external libraries" OFF)
- option(ENABLE_PLUGINS           "Build with plugins" ON)
- option(ENABLE_PLUGIN_IFDEMO     "Build with plugin interface demo" OFF)
- option(ENABLE_PCAP_NG_DEFAULT   "Enable pcapng as default file format" ON)
package/wireshark/0001-CMake-revert-CMake-Add-libpcap-imported-library-targ.patch new file +104 -0

104 lines not on this page · raw message

package/wireshark/0002-FindPCAP-use-pkg-config-to-find-pcap-dependencies.patch deleted +0 -45

45 lines not on this page · raw message

package/wireshark/0003-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch deleted +0 -48

48 lines not on this page · raw message

package/wireshark/Config.in +1 -0
index 416b334df6..a3ad808b86 100644
@@ -7,6 +7,7 @@ config BR2_PACKAGE_WIRESHARK
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_SPEEXDSP
 	help
 	  Network traffic sniffer and protocol decoder.
 
package/wireshark/wireshark.hash +3 -3
index 403def6460..5635f2525b 100644
@@ -1,6 +1,6 @@
-# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.0.5.txt
-sha1 82883e96ee247d3fcacb0cafa0bed9112824ee3a wireshark-3.0.5.tar.xz
-sha256 c551fce475c49cea317ccbf9d22404bc827dde9cee0ccdf6648bfed3ecd9f820 wireshark-3.0.5.tar.xz
+# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.0.txt
+sha1 6c7d9784809fb16b57ca557864f78509aaf4f82a wireshark-3.2.0.tar.xz
+sha256 4cfd33a19a454ff4002243e9d04d6afd64280a109a21ae652a192f2be2b1b66c wireshark-3.2.0.tar.xz
 
 # Locally calculated
 sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf  COPYING
package/wireshark/wireshark.mk +11 -2
index 1be6a4e81c..c365a9feec 100644
@@ -4,18 +4,20 @@
 #
 ################################################################################
 
-WIRESHARK_VERSION = 3.0.5
+WIRESHARK_VERSION = 3.2.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 = host-pkgconf host-python3 libgcrypt libpcap libglib2 \
+	speexdsp
 
 WIRESHARK_MAKE_ENV = \
 	$(TARGET_MAKE_ENV) \
 	PATH="$(@D)/bin:$(BR_PATH)"
 
 WIRESHARK_CONF_OPTS = \
+	-DDISABLE_WERROR=ON \
 	-DENABLE_PCAP=ON \
 	-DENABLE_SMI=OFF
 
@@ -47,6 +49,13 @@ else
 WIRESHARK_CONF_OPTS += -DENABLE_BCG729=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_BROTLI),y)
+WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=ON
+WIRESHARK_DEPENDENCIES += brotli
+else
+WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_C_ARES),y)
 WIRESHARK_CONF_OPTS += -DENABLE_CARES=ON
 WIRESHARK_DEPENDENCIES += c-ares
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 package/wireshark: bump to version 3.2.0

Hello Fabrice,

Quoted 7 lines · On Thu, 26 Dec 2019 23:37:57 +0100 Fabrice Fontaine…

- Remove patches (already in version)
- Add patch to fix static build with pcap by reverting an upstream commit. This patch has been sent upstream and there is already some comments on it. However, upstream does not seem to really care/test static builds. So, perhaps an easier road would to add a dynamic library dependency on wireshark instead of fixing things again and again each time wireshark is bumped...

It would be fine for me to make wireshark depends on !BR2_STATIC_LIBS.

Quoted 8 lines

- Add mandatory speexdsp dependency to avoid using internal one when building wireshark or sharkd:
https://github.com/wireshark/wireshark/commit/186f985793cceb7d7222955987df72ab5a82beeb
- Disable -Werror (it is now enabled by default)
- Add brotli optional dependency:
https://github.com/wireshark/wireshark/commit/9ce60b173bf17b7d20695d9dc1de050989019664

Quoted 13 lines
---
 .../0001-CMake-add-USE_STATIC-option.patch    |  70 ------------
 ...ke-Add-libpcap-imported-library-targ.patch | 104 ++++++++++++++++++
 ...pkg-config-to-find-pcap-dependencies.patch |  45 --------
 ...-config-to-find-libxml2-dependencies.patch |  48 --------
 package/wireshark/Config.in                   |   1 +
 package/wireshark/wireshark.hash              |   6 +-
 package/wireshark/wireshark.mk                |  13 ++-
 7 files changed, 119 insertions(+), 168 deletions(-)
 delete mode 100644 package/wireshark/0001-CMake-add-USE_STATIC-option.patch
 create mode 100644 package/wireshark/0001-CMake-revert-CMake-Add-libpcap-imported-library-targ.patch
 delete mode 100644 package/wireshark/0002-FindPCAP-use-pkg-config-to-find-pcap-dependencies.patch
 delete mode 100644 package/wireshark/0003-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com