summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-networking/recipes-support/wireshark
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-03-06 00:23:11 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-03-15 14:02:06 +0300
commit97771a30474a164ca08efd09209692a1fb8a4574 (patch)
treee350c1e654a41e7a090a1c6fe64f01d69bd28ac3 /meta-openembedded/meta-networking/recipes-support/wireshark
parent8b1392834def7d17263b45bd1aab35759235fb3e (diff)
downloadopenbmc-97771a30474a164ca08efd09209692a1fb8a4574.tar.xz
meta-openembedded: subtree update:7206f7f5bc..98175fd0cc
Adam Miartus (4): libcereal: update to newer version libcereal: pick up additional licenses of cereal components libcereal: add dev package that can be included into toolchain sdk cereal: Remove Alejandro Hernandez Samaniego (2): freerdp: Upgrade 2.2.0 -> 2.3.0 remmina: Upgrade 1.4.10 -> 1.4.11 Anatol Belski (2): abseil-cpp: Relax build requirements grpc: Upgrade 1.24.3 -> 1.35.0 Andrei Gherzan (1): nss: Fix warnings generated by getcwd Bartosz Golaszewski (1): pydbus-manager: new package Carlos Rafael Giani (2): pipewire: Move to meta-multimedia pipewire: Rework 0.3 recipe and upgrade to 0.3.22 Christian B. Sørensen (1): libgpiod: packageqa problem => static python lib to ${PN}-staticdev Clément Péron (2): grpc: Add PackageConfig to build only required plugins grpc: remove gflags dependency Diego Santa Cruz (1): php: split out phpdbg into a separate package Enrico Jörns (1): python3-aiohttp: add missing RDEPENDS on python3-typing-extensions Gianfranco (1): mosquitto: Upgrade 2.0.7 -> 2.0.8 Hongxu Jia (1): lvm2/libdevmapper: 2.03.06 -> 2.03.11 Kai Kang (2): xfsprogs: 5.9.0 -> 5.10.0 libinih: install header files without prefix dir inih Khem Raj (39): yelp-xsl: Mark native libxml2 in rdeps liburing: Do not build examples on risc/musl aom: Disable neon on arm when not present in TUNE_FEATURES python3-grpcio: Upgrade to 1.35.0 python3-grpcio-tools: Upgrade to 1.35.0 recipes: Update common-licenses references to match new names openldap: Refresh patches to remove fuzz abseil-cpp: Remove libexecinfo band-aid for musl nss: Add powerpc64 little endian support luajit: Upgrade to latest on v2.1 release influxdb: Generate checksums for term module libauthen-sasl-perl,libhtml-tree-perl: allow PERL_USE_UNSAFE_INC dvb-apps: Allow insecure inc paths glog: Upgrade to 0.4.0 mpd: Upgrade to 0.22 series mbedtls: Fix gcc11 stringop-overflow warning v4l-utils: Package systemd fragment for systemd-udevd.service.d mpich: Upgrade to 3.4.1 srt: Backport fix for missing <limits> header gerbera: Update to 1.7.0 nautilus: Drop use of volatile vlc: Fix build with gcc 11 squid: Include <limits> for using std::numeric_limits minifi-cpp: include limits header for numeric_limits definition opencv: Upgrade to 4.5.1 mozjs: Drop using JS_VOLATILE_ARM opengl-es-cts: Disable -Wuninitialized for external/amber grpc: Upgrade to 1.36.1 mongodb: Include <optional> c++ header libyui,libyui-ncurses: Upgrade to 4.0.0 libyui-ncurses: Disable Werror libyui: Adopt to new cmake option to disable Werror libyui-ncurses: Pass -DNCURSES_WIDECHAR in CXXFLAGS gimp: Add missing dependencies gimp: Disable svg icons on arm libcamera: Update to latest abseil-cpp: Ask for C++14 std explicitly opencv: Add packageconfig for building tests opencv: Remove duplicate patch Leon Anavi (30): python3-h5py: Upgrade 2.10.0 -> 3.1.0 python3-transitions: Upgrade 0.8.6 -> 0.8.7 python3-tabulate: Upgrade 0.8.7 -> 0.8.9 python3-pyperclip: Upgrade 1.8.1 -> 1.8.2 python3-elementpath: Upgrade 2.1.3 -> 2.1.4 python3-mpmath: Upgrade 1.1.0 -> 1.2.1 python3-prompt-toolkit: Upgrade 3.0.14 -> 3.0.16 python3-pkgconfig: Upgrade 1.5.1 -> 1.5.2 python3-mypy: Upgrade 0.800 -> 0.812 python3-typeguard: Upgrade 2.11.0 -> 2.11.1 python3-httplib2: Upgrade 0.18.1 -> 0.19.0 python3-autobahn: Upgrade 20.12.3 -> 21.2.1 python3-iso8601: Upgrade 0.1.13 -> 0.1.14 python3-alembic: Upgrade 1.5.4 -> 1.5.5 python3-txaio: Upgrade 20.12.1 -> 21.2.1 python3-watchdog: Upgrade 2.0.0 -> 2.0.2 python3-rsa: Upgrade 4.7 -> 4.7.1 python3-pandas: Upgrade 1.2.1 -> 1.2.2 python3-cffi: Upgrade 1.14.4 -> 1.14.5 python3-pymisp: Upgrade 2.4.137.3 -> 2.4.138 python3-pytest-runner: Upgrade 5.2 -> 5.3.0 python3-markdown: Upgrade 3.3.3 -> 3.3.4 python3-pulsectl: Upgrade 20.5.1 -> 21.2.0 python3-cvxopt: Upgrade 1.2.5 -> 1.2.6 python3-rsa: Upgrade 4.7.1 -> 4.7.2 python3-pyzmq: Upgrade 22.0.2 -> 22.0.3 python3-tqdm: Upgrade 4.57.0 -> 4.58.0 python3-autobahn: Upgrade 21.2.1 -> 21.2.2 python3-aiohttp: Upgrade 3.7.3 -> 3.7.4 python3-semantic-version: Add recipe Matteo Croce (1): recipes-kernel: add libbpf Michael Vetter (1): jasper: upgrade 2.0.24 -> 2.0.25 Mingli Yu (3): crash: add support for lockless ringbuffer gtkmm3: use relative path mcelog: Upgrade to 175 Oleksandr Kravchuk (21): rfkill: update to 1.0 python3-idna: update to 3.1 python3-pika: update to 1.2.0 python3-protobuf: update to 3.14.0 python3-pychromecast: update to 8.1.0 python3-pykickstart: update to 3.32 python3-watchdog: update to 2.0.0 wolfssl: updae to 4.7.0 ncmpc: update to 0.45 rocksdb: update to 6.15.5 stm32flash: update to 0.6 python3-astroid: update to 2.5 python3-configargparse: update to 1.3 python3-cryptography-vectors: update to 3.4.6 python3-periphery: update to 2.3.0 python3-sentry-sdk: update to 0.20.3 python3-soupsieve: update to 2.2 python3-supervisor: update to 4.2.1 python3-tqdm: update 4.57.0 python3-typeguard: update to 2.11.0 python3-xmlschema: update to 1.5.1 Oleksiy Obitotskyy (2): wireshark-src: improve reproducibility smartmontools: Improve reproducibility Patrick Williams (2): boost-url: update to latest catch2: upgrade to 2.13.4 Peter Kjellerstedt (1): librcereal: A couple of improvements Randy MacLeod (2): libssh2: remove the recipe since it moved to oe-core libgit2: remove the recipe since it moved to oe-core Ross Burton (1): python3-intelhex: add recipe for the intelhex package Sean Nyekjaer (3): nodejs: 12.20.1 -> 12.20.2 zstd: split bin into separate package can-utils: split into more packages Ulrich ?lmann (1): v4l-utils: update to 1.20.0 Wang Mingyu (7): stunnel: upgrade 5.57 -> 5.58 iwd: upgrade 1.11 -> 1.12 protobuf: upgrade 3.14.0 -> 3.15.2 redis-plus-plus: upgrade 1.2.1 -> 1.2.2 tesseract-lang: upgrade 4.0.0 -> 4.1.0 gphoto2: upgrade 2.5.26 -> 2.5.27 libgphoto2: upgrade 2.5.26 -> 2.5.27 Yanfei Xu (1): lmbench: Install cache command and fix typos in manual page Yi Fan Yu (4): rsyslog: upgrade 8.2006.0->8.2012.0 tcpdump: update 4.9.3 -> 4.99.0 rsyslog: Add imhttp to packageconfig rsyslog: Update 8.2012.0 -> 8.2102.0 Yi Zhao (1): vsftpd: allow newfstatat and pselect6 syscalls in the seccomp sandbox akuster (1): softhsm: update to 2.6.1 and align zangrc (11): fuse3: upgrade 3.10.1 -> 3.10.2 enca: upgrade 1.9 -> 1.19 gensio: upgrade 2.2.3 -> 2.2.4 lcms: upgrade 2.11 -> 2.12 libburn: upgrade 1.5.2 -> 1.5.4 opensaf: upgrade 5.20.11 -> 5.21.03 openvpn: upgrade 2.5.0 -> 2.5.1 strongswan: upgrade 5.9.1 -> 5.9.2 wireguard-tools: upgrade 1.0.20200827 -> 1.0.20210223 hwdata: upgrade 0.343 -> 0.345 mailcap: upgrade 2.1.49 -> 2.1.52 zhengruoqin (7): libjcat: upgrade 0.1.4 -> 0.1.6 postgresql: upgrade 13.1 -> 13.2 ser2net: upgrade 4.3.0 -> 4.3.3 Fix do_package error when enable multilib. nano: upgrade 5.5 -> 5.6 qpdf: upgrade 10.0.4 -> 10.2.0 sigrok-cli: upgrade 0.7.1 -> 0.7.2 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: Ibbbafaa846b1dcc3c03ac585e7d5075826e4ee37
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/wireshark')
-rw-r--r--meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch44
-rw-r--r--meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch46
-rw-r--r--meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch59
-rw-r--r--meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch77
-rw-r--r--meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb7
5 files changed, 233 insertions, 0 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch
new file mode 100644
index 0000000000..0b83ca4ae4
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch
@@ -0,0 +1,44 @@
+From 0a9ab056ce7582033a21d6bc541ece520bf2b0b6 Mon Sep 17 00:00:00 2001
+From: Oleksiy Obitotskyy <oobitots@cisco.com>
+Date: Thu, 26 Nov 2020 05:38:31 -0800
+Subject: [PATCH] wireshark-src: improve reproducibility
+
+Cut absolute path for filename in generated code
+comments.
+
+Upstream-Status: Pending
+Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+---
+ tools/make-plugin-reg.py | 2 +-
+ tools/ncp2222.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py
+index 66b4656..c52b3fc 100755
+--- a/tools/make-plugin-reg.py
++++ b/tools/make-plugin-reg.py
+@@ -28,7 +28,7 @@ preamble = """\
+ *
+ * Generated automatically from %s.
+ */
+-""" % (sys.argv[0])
++""" % (os.path.basename(sys.argv[0]))
+
+ # Create the proper list of filenames
+ filenames = []
+diff --git a/tools/ncp2222.py b/tools/ncp2222.py
+index 1dea4ec..dc376e3 100755
+--- a/tools/ncp2222.py
++++ b/tools/ncp2222.py
+@@ -5858,7 +5858,7 @@ def produce_code():
+
+ print("/*")
+ print(" * Do not modify this file. Changes will be overwritten.")
+- print(" * Generated automatically from %s" % (sys.argv[0]))
++ print(" * Generated automatically from %s" % (os.path.basename(sys.argv[0])))
+ print(" */\n")
+
+ print("""
+--
+2.26.2.Cisco
+
diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch
new file mode 100644
index 0000000000..069b5793d9
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch
@@ -0,0 +1,46 @@
+From 3e571e24c730f747d18ed02ba7451e9e00480fc7 Mon Sep 17 00:00:00 2001
+From: Oleksiy Obitotskyy <oobitots@cisco.com>
+Date: Thu, 26 Nov 2020 12:00:43 -0800
+Subject: [PATCH] flex: Remove #line directives
+
+Append --noline option to flex to not
+generate #line directives with absolute file patch.
+
+Upstream-Status: Pending
+Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+---
+ cmake/modules/FindLEX.cmake | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake
+index 0008bc4..ec68f84 100644
+--- a/cmake/modules/FindLEX.cmake
++++ b/cmake/modules/FindLEX.cmake
+@@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated)
+ SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c)
+ SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_lex.h)
+
+- ADD_CUSTOM_COMMAND(
+- OUTPUT ${_outc} ${_outh}
+- COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in}
+- DEPENDS ${_in}
+- )
++ IF (DEFINED ENV{SOURCE_DATE_EPOCH})
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${_outc} ${_outh}
++ COMMAND ${LEX_EXECUTABLE} --noline -o${_outc} --header-file=${_outh} ${_in}
++ DEPENDS ${_in}
++ )
++ ELSE ()
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${_outc} ${_outh}
++ COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in}
++ DEPENDS ${_in}
++ )
++ ENDIF ()
+ LIST(APPEND ${_source} ${_in})
+ LIST(APPEND ${_generated} ${_outc})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+--
+2.26.2.Cisco
+
diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch
new file mode 100644
index 0000000000..824761a3dc
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch
@@ -0,0 +1,59 @@
+From 42abf1d299fed8e00a189f6f9c55fb344e5bb775 Mon Sep 17 00:00:00 2001
+From: Oleksiy Obitotskyy <oobitots@cisco.com>
+Date: Wed, 27 Jan 2021 04:01:34 -0800
+Subject: [PATCH] bison: Remove #line directives
+
+Append --no-lines option to bison to not
+generate #line directives with absolute file path.
+
+Upstream-Status: Pending
+Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+---
+ cmake/modules/FindYACC.cmake | 31 ++++++++++++++++++++++---------
+ 1 file changed, 22 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake
+index c96f87b..54a73cb 100644
+--- a/cmake/modules/FindYACC.cmake
++++ b/cmake/modules/FindYACC.cmake
+@@ -29,15 +29,28 @@ MACRO(ADD_YACC_FILES _source _generated)
+
+ SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c)
+
+- ADD_CUSTOM_COMMAND(
+- OUTPUT ${_out}
+- COMMAND ${YACC_EXECUTABLE}
+- -d
+- -p ${_basename}
+- -o${_out}
+- ${_in}
+- DEPENDS ${_in}
+- )
++ IF (DEFINED ENV{SOURCE_DATE_EPOCH})
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${_out}
++ COMMAND ${YACC_EXECUTABLE}
++ --no-lines
++ -d
++ -p ${_basename}
++ -o${_out}
++ ${_in}
++ DEPENDS ${_in}
++ )
++ ELSE ()
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${_out}
++ COMMAND ${YACC_EXECUTABLE}
++ -d
++ -p ${_basename}
++ -o${_out}
++ ${_in}
++ DEPENDS ${_in}
++ )
++ ENDIF ()
+ LIST(APPEND ${_source} ${_in})
+ LIST(APPEND ${_generated} ${_out})
+ ENDFOREACH (_current_FILE)
+--
+2.26.2.Cisco
+
diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch
new file mode 100644
index 0000000000..c1a528f90d
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch
@@ -0,0 +1,77 @@
+From 17f05a8d02c589e4867906f70381e63e46a67870 Mon Sep 17 00:00:00 2001
+From: Oleksiy Obitotskyy <oobitots@cisco.com>
+Date: Wed, 27 Jan 2021 06:47:13 -0800
+Subject: [PATCH] lemon: Remove #line directives
+
+In case of reproducible build remove #line
+directives with extra option '-l'.
+
+Upstream-Status: Pending
+Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+---
+ cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++-----------
+ 1 file changed, 34 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake
+index 849ffc1..ca38ab7 100644
+--- a/cmake/modules/UseLemon.cmake
++++ b/cmake/modules/UseLemon.cmake
+@@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated)
+
+ SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename})
+
+- ADD_CUSTOM_COMMAND(
+- OUTPUT
+- ${_out}.c
+- # These files are generated as side-effect
+- ${_out}.h
+- ${_out}.out
+- COMMAND lemon
+- -T${_lemonpardir}/lempar.c
+- -d.
+- ${_in}
+- DEPENDS
+- ${_in}
+- lemon
+- ${_lemonpardir}/lempar.c
+- )
++ IF (DEFINED ENV{SOURCE_DATE_EPOCH})
++ ADD_CUSTOM_COMMAND(
++ OUTPUT
++ ${_out}.c
++ # These files are generated as side-effect
++ ${_out}.h
++ ${_out}.out
++ COMMAND lemon
++ -l
++ -T${_lemonpardir}/lempar.c
++ -d.
++ ${_in}
++ DEPENDS
++ ${_in}
++ lemon
++ ${_lemonpardir}/lempar.c
++ )
++ ELSE ()
++ ADD_CUSTOM_COMMAND(
++ OUTPUT
++ ${_out}.c
++ # These files are generated as side-effect
++ ${_out}.h
++ ${_out}.out
++ COMMAND lemon
++ -T${_lemonpardir}/lempar.c
++ -d.
++ ${_in}
++ DEPENDS
++ ${_in}
++ lemon
++ ${_lemonpardir}/lempar.c
++ )
++ ENDIF ()
+
+ LIST(APPEND ${_source} ${_in})
+ LIST(APPEND ${_generated} ${_out}.c)
+--
+2.26.2.Cisco
+
diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb
index 1c470d8bc6..e730b18a03 100644
--- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb
+++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.3.bb
@@ -10,6 +10,13 @@ DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz"
+SRC_URI += " \
+ file://0001-wireshark-src-improve-reproducibility.patch \
+ file://0002-flex-Remove-line-directives.patch \
+ file://0003-bison-Remove-line-directives.patch \
+ file://0004-lemon-Remove-line-directives.patch \
+"
+
UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
SRC_URI[sha256sum] = "f467cc77f0fc73fce0b854cdbc292f132d4879fca69d417eccad5f967fbf262b"