diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-03-06 00:23:11 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-03-15 14:02:06 +0300 |
| commit | 97771a30474a164ca08efd09209692a1fb8a4574 (patch) | |
| tree | e350c1e654a41e7a090a1c6fe64f01d69bd28ac3 /meta-openembedded/meta-networking/recipes-support | |
| parent | 8b1392834def7d17263b45bd1aab35759235fb3e (diff) | |
| download | openbmc-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')
16 files changed, 308 insertions, 166 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb index c02a19944..5afec7663 100644 --- a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Administration tool for arp packet filtering" SECTION = "net" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" PV = "0.0.5+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb index f42223b1f..a2f0ccc06 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \ one: you don't have to type the coordinates of your peer." HOMEPAGE = "http://www.fefe.de/ncp" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "libowfat" SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2" diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.1.bb index 3dc25bacd..6aa7b17be 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.1.bb @@ -14,8 +14,8 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[md5sum] = "2d42d3c2fff942bfe9eefa41cfd6f123" -SRC_URI[sha256sum] = "87ef9f5d42c1193fec2ebd86757229b5ae4f295504968392375155adeda83b56" +SRC_URI[md5sum] = "b1c279e89d97849d5fcde31d76812f04" +SRC_URI[sha256sum] = "e9582b8e9457994bd8d50012be82c23b2f465da51460c9b2360a81da0f4e06e6" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb index 095a93df3..dd50fba3d 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb @@ -12,8 +12,8 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "1f4db969d072e120dc12d1c116a0f658" -SRC_URI[sha256sum] = "a337c9fb63d973b8440827755c784031648bf423b7114a04918b0b00fd42cafb" +SRC_URI[md5sum] = "8918e6675e1be3784817641f07eadeb8" +SRC_URI[sha256sum] = "61c72f741edb2c1295a7b7ccce0317a104b3f9d39efd04c52cd05b01b55ab063" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.57.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.58.bb index 8f6de571f..1f1ca4e6b 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.57.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.58.bb @@ -6,7 +6,7 @@ SECTION = "net" # a combined work based on stunnel. Thus, the terms and conditions of the GNU # General Public License cover the whole combination. LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=6bae28875b3b599f8f621f4335b17955" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=223b26c62f5e7c5c8656d6c133edd5ec" DEPENDS = "autoconf-archive libnsl2 openssl" @@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[sha256sum] = "af5ab973dde11807c38735b87bdd87563a47d2fa1c72a07929fcfce80a600fe1" +SRC_URI[sha256sum] = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch deleted file mode 100644 index 9b74e00c5..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 -From: Guy Harris <guy@alum.mit.edu> -Date: Sat, 18 Apr 2020 14:04:59 -0700 -Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. - -The buffer should be big enough to hold the captured data, but it -doesn't need to be big enough to hold the entire on-the-network packet, -if we haven't captured all of it. - -(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) - -Upstream-Status: Backport -Signed-off-by: Stacy Gaikovaia <stacy.gaikovaia@windriver.com> - ---- - print-ppp.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/print-ppp.c b/print-ppp.c -index 89176172..33fb0341 100644 ---- a/print-ppp.c -+++ b/print-ppp.c -@@ -1367,19 +1367,29 @@ trunc: - return 0; - } - -+/* -+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. -+ * The length argument is the on-the-wire length, not the captured -+ * length; we can only un-escape the captured part. -+ */ - static void - ppp_hdlc(netdissect_options *ndo, - const u_char *p, int length) - { -+ u_int caplen = ndo->ndo_snapend - p; - u_char *b, *t, c; - const u_char *s; -- int i, proto; -+ u_int i; -+ int proto; - const void *se; - -+ if (caplen == 0) -+ return; -+ - if (length <= 0) - return; - -- b = (u_char *)malloc(length); -+ b = (u_char *)malloc(caplen); - if (b == NULL) - return; - -@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, - * Do this so that we dont overwrite the original packet - * contents. - */ -- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { -+ for (s = p, t = b, i = caplen; i != 0; i--) { - c = *s++; - if (c == 0x7d) { -- if (i <= 1 || !ND_TTEST(*s)) -+ if (i <= 1) - break; - i--; - c = *s++ ^ 0x20; --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch new file mode 100644 index 000000000..bb56c4d4c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch @@ -0,0 +1,33 @@ +From 867bf5c9d0fb64e1b4e64cb13b983674c270a6bf Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 19 Feb 2021 00:52:35 -0500 +Subject: [PATCH] aclocal.m4: Skip checking for pcap-config + +Bitbake triggers an configure error +saying we should look for pkg-config instead. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + aclocal.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index bd4e27a5..136cb8ca 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -584,8 +584,8 @@ AC_DEFUN(AC_LBL_LIBPCAP, + # No pkg-config + # Look for an installed pcap-config. + # +- AC_PATH_TOOL(PCAP_CONFIG, pcap-config) +- if test -n "$PCAP_CONFIG" ; then ++ # AC_PATH_TOOL(PCAP_CONFIG, pcap-config) ++ if false; then + # + # Found - use it to get the include flags for + # libpcap and the flags to link with libpcap. +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index f8ff354fe..c46de4b96 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,6 +1,6 @@ -From 8c9c728757f89ebe6c4019114b83a63c63596f69 Mon Sep 17 00:00:00 2001 -From: "Hongjun.Yang" <hongjun.yang@windriver.com> -Date: Wed, 2 Oct 2019 16:57:06 -0400 +From 5f0f70192b0e20336e642b02ca9662ba2fef66cf Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Fri, 19 Feb 2021 15:21:18 -0500 Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending @@ -8,15 +8,21 @@ Upstream-Status: Pending Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com> Signed-off-by: Peiran Hong <peiran.hong@windriver.com> +remove perl script not required by ptest causing QA problems + +reference upstream issue/commit: +https://github.com/the-tcpdump-group/tcpdump/issues/26 + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- - Makefile.in | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + Makefile.in | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 3b589184..7b10e38c 100644 +index ea1ef1d0..e7987bd8 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -437,9 +437,17 @@ distclean: +@@ -445,9 +445,18 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW @@ -24,14 +30,18 @@ index 3b589184..7b10e38c 100644 +buildtest-TESTS: tcpdump + +runtest-PTEST: - (mkdir -p tests && SRCDIR=`cd ${srcdir}; pwd` && export SRCDIR && $$SRCDIR/tests/TESTrun.sh ) + $(srcdir)/tests/TESTrun +install-ptest: + cp -r tests $(DESTDIR) ++ rm $(DESTDIR)/tests/setkey2esp-secrets.pl + cp -r config.h $(DESTDIR) + install -m 0755 Makefile $(DESTDIR) -+ ln -sf /usr/sbin/tcpdump $(DESTDIR)/tcpdump ++ ln -s /usr/bin/tcpdump $(DESTDIR)/tcpdump + extags: $(TAGFILES) ctags $(TAGFILES) +-- +2.29.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch deleted file mode 100644 index 977ab95b7..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/avoid-absolute-path-when-searching-for-libdlpi.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 02085028cdaf075943c27ebc02bb6de0289ec1d3 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Wed, 2 Oct 2019 16:43:48 -0400 -Subject: [PATCH] avoid absolute path when searching for libdlpi - -Let the build environment control library search paths. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> -Signed-off-by: Peiran Hong <peiran.hong@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3401a7a3..6a52485a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -528,7 +528,7 @@ don't.]) - fi - - # libdlpi is needed for Solaris 11 and later. --AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) -+AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi") - - dnl - dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()", --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch deleted file mode 100644 index 8793bf7a3..000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dd023c133980fcc0cff5896e85377675e0571894 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Tue, 8 Jul 2014 13:20:47 +0800 -Subject: [PATCH] unnecessary to check libpcap - -since the check of libpcap did not consider the cross-compile, lead to the -below error: - This autoconf log indicates errors, it looked at host include and/or - library paths while determining system capabilities. - -In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to -check if libpcap existed. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> -Signed-off-by: Peiran Hong <peiran.hong@windriver.com> ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 56e2a624..3401a7a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -404,7 +404,9 @@ dnl Some platforms may need -lnsl for getrpcbynumber. - AC_SEARCH_LIBS(getrpcbynumber, nsl, - AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) - --AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) -+# Simplified (more cross compile friendly) check for libpcap. All we really -+# need is to sanity check that libpcap is available and add -lpcap to LIBS. -+AC_CHECK_LIB(pcap, pcap_compile, LIBS="$LIBS -lpcap") - - # - # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb index afcb4d508..66510b7fd 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb @@ -2,26 +2,33 @@ SUMMARY = "A sophisticated network protocol analyzer" HOMEPAGE = "http://www.tcpdump.org/" SECTION = "net" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453" DEPENDS = "libpcap" RDEPENDS_${PN}-ptest += " make perl \ perl-module-file-basename \ + perl-module-file-spec \ + perl-module-file-spec-unix \ + perl-module-file-path \ + perl-module-file-glob \ + perl-module-data-dumper \ + perl-module-bytes \ perl-module-posix \ - perl-module-carp" + perl-module-carp \ + perl-module-cwd \ + perl-module-constant \ +" SRC_URI = " \ http://www.tcpdump.org/release/${BP}.tar.gz \ - file://unnecessary-to-check-libpcap.patch \ - file://avoid-absolute-path-when-searching-for-libdlpi.patch \ file://add-ptest.patch \ file://run-ptest \ - file://0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buff.patch \ + file://0001-aclocal.m4-Skip-checking-for-pcap-config.patch \ " -SRC_URI[md5sum] = "a4ead41d371f91aa0a2287f589958bae" -SRC_URI[sha256sum] = "2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410" +SRC_URI[md5sum] = "b10aa2f497def7283bc060f626879ce5" +SRC_URI[sha256sum] = "8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" @@ -46,7 +53,7 @@ do_configure_prepend() { do_install_append() { # make install installs an unneeded extra copy of the tcpdump binary - rm -f ${D}${sbindir}/tcpdump.${PV} + rm ${D}${bindir}/tcpdump.${PV} } do_compile_ptest() { 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 000000000..0b83ca4ae --- /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 000000000..069b5793d --- /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 000000000..824761a3d --- /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 000000000..c1a528f90 --- /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 1c470d8bc..e730b18a0 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" |