From eef6386ca7c8a62f37fc84a0a5a68842183cdfb0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Jan 2021 15:58:13 -0600 Subject: meta-openembedded: subtree update:4599fea881..fd123c9bb2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian (1): networkmanager: add missing readline depends Adrian Freihofer (2): nftables: upgrade 0.9.7 -> 0.9.8 firewalld: upgrade 0.9.2 -> 0.9.3 Adrian Herrera (2): cppunit: add support for native version protobuf: apply fix for pkg-config pthread flags Alejandro Enedino Hernandez Samaniego (2): remmina: Update to 1.4.10 imapfilter: Upgrade 2.6.16 -> 2.7.5 Anatol Belski (1): xmlsec1: Fix configure QA error caused by host lookup path Andreas Müller (24): libunique: remove xfce4-screenshooter: replace gtk+ -> gtk+3 in DEPENDS libxfce4ui: Fix sporadic install error poppler: upgrade 20.12.1 -> 21.01.0 dconf: upgrade 0.36.0 -> 0.38.0 dconf-editor: upgrade 3.36.2 -> 3.38.2 amtk: upgrade 5.1.1 -> 5.2.0 evince: upgrade 3.36.7 -> 3.38.0 catfish: upgrade 1.4.13 -> 4.16.0 xfwm4: upgrade 4.16.0 -> 4.16.1 parole: upgrade 1.0.5 -> 4.16.0 garcon: upgrade 0.8.0 -> 4.16.1 xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2 thunar: upgrade 4.16.0 -> 4.16.2 jack: upgrade 1.19.16 -> 1.19.17 networkmanager: upgrade 1.22.14 -> 1.28.0 appstream-glib: upgrade 0.7.17 -> 0.7.18 vlc: upgrade 3.0.11.1 -> 3.0.12 python3-mypy-extensions: Initial add 0.4.3 python3-mypy: initial add 0.800 python3-send2trash_ initial add 1.5.0 python3-asttokens: initial add 2.0.4 python3-typed-ast: Initial add 1.4.1 packagegroup-meta-python: Add asttokens/mypy/mypy-extensions/typed-ast/send2trash Andrew Jeffery (2): meta-python: Add hexdump package meta-python: Add jstyleson Armin Kuster (3): wireshark: Several securtiy fixes ipset: add recipe lua: update to 5.3.6 Clément Péron (2): re2: Add recipe for Google RE2 library abseil-cpp: bump to LTS 2020_09_23 Patch Release 3 Daniel Gomez (2): zbar: Add support for mchehab/zbar zbar: Remove support for 0.10 version Diego Santa Cruz (1): net-snmp: control smux via PACKAGECONFIG Gianfranco (2): vboxguestdrivers: upgrade 6.1.16 -> 6.1.18 vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386 Gianfranco Costamagna (1): dlt-daemon: update to new release 2.18.6 Harpritkaur Bhandari (1): rapidjson: Upgrade SRCREV to latest He Zhe (2): lmbench: Fix webpage-lm and manual page typos lmbench: lat_fifo: Fix cleanup sequence Junjie Mao (1): python3-xmlschema: Yocto recipes for validating against XSD 1.1 Kai Kang (4): xfce4-panel-profiles: fix do install failure with dash xfce4-panel-profiles: update remove-bashisms.patch for centos 7 blueman: refresh patch mariadb: add package config zstd Khem Raj (6): influxdb: Fix build on mips packagegroup-meta-oe: Add new package influxdb packagegroup-meta-networking: Add ipset packagegroup-meta-oe: Add re2 autoconf-2.13-native,xserver-xorg-cvt-native: Move inheriting native to the end dfu-util-native: Adjust Inherit order Leon Anavi (75): python3-aiohttp: Upgrade 3.7.2 -> 3.7.3 python3-coloredlogs: Upgrade 14.0 -> 15.0 python3-jsonrpcserver: Upgrade 4.1.3 -> 4.2.0 python3-pymisp: Upgrade 2.4.133 -> 2.4.135.3 python3-parso: Upgrade 0.8.0 -> 0.8.1 python3-pillow: Upgrade 7.2.0 -> 8.1.0 python3-croniter: Upgrade 0.3.37 -> 1.0.1 python3-pychromecast: Upgrade 7.7.1 -> 7.7.2 python3-hyperlink: Upgrade 20.0.1 -> 21.0.0 python3-dnspython: Upgrade 2.0.0 -> 2.1.0 python3-prompt-toolkit: Upgrade 3.0.9 -> 3.0.10 python3-ptyprocess: Upgrade 0.6.0 -> 0.7.0 python3-certifi: Upgrade 2020.11.8 -> 2020.12.5 python3-jedi: Upgrade 0.17.2 -> 0.18.0 python3-mock: Upgrade 4.0.2 -> 4.0.3 python3-pyscaffold: Upgrade 3.2.3 -> 3.3 python3-cffi: Upgrade 1.14.3 -> 1.14.4 python3-rsa: Upgrade 4.6 -> 4.7 python3-pyjwt: Upgrade 1.7.1 -> 2.0.0 python3-isort: Upgrade 5.6.4 -> 5.7.0 python3-lz4: Upgrade 3.1.0 -> 3.1.1 python3-msgpack: Upgrade 1.0.0 -> 1.0.2 python3-pyopenssl: Upgrade 19.1.0 -> 20.0.1 python3-ecdsa: Upgrade 0.16.0 -> 0.16.1 python3-regex: Upgrade 2020.10.28 -> 2020.11.13 python3-cryptography: Upgrade 3.2 -> 3.3.1 python3-cryptography-vectors: Upgrade 3.2 -> 3.3.1 python3-wheel: Upgrade 0.35.1 -> 0.36.2 python3-pyzmq: Upgrade 19.0.2 -> 20.0.0 python3-greenlet: Upgrade 0.4.17 -> 1.0.0 python3-parse: Upgrade 1.18.0 -> 1.19.0 python3-colorlog: Upgrade 4.6.2 -> 4.7.2 python3-pyephem: Upgrade 3.7.7.0 -> 3.7.7.1 python3-pyperf: Upgrade 2.0.0 -> 2.1.0 python3-cheetah: Upgrade 3.2.5 -> 3.2.6 python3-pyscaffold: Upgrade 3.3 -> 3.3.1 python3-lxml: Upgrade 4.6.1 -> 4.6.2 python3-openpyxl: Upgrade 3.0.5 -> 3.0.6 python3-pymysql: Upgrade 0.10.1 -> 1.0.2 python3-dbus-next: Upgrade 0.1.4 -> 0.2.2 python3-yappi: Upgrade 1.3.0 -> 1.3.2 python3-pyyaml: Upgrade 5.3.1 -> 5.4 python3-google-api-python-client: Upgrade 1.12.5 -> 1.12.8 python3-evdev: Upgrade 1.3.0 -> 1.4.0 python3-pyusb: Upgrade 1.1.0 -> 1.1.1 python3-pyserial: Upgrade 3.4 -> 3.5 python3-pandas: Upgrade 1.2.0 -> 1.2.1 python3-alembic: Upgrade 1.4.3 -> 1.5.1 python3-coverage: Upgrade 5.3 -> 5.3.1 python3-lz4: Upgrade 3.1.1 -> 3.1.3 python3-bitarray: Upgrade 1.6.1 -> 1.6.3 python3-pykwalify: Upgrade 1.7.0 -> 1.8.0 python3-croniter: Upgrade 1.0.1 -> 1.0.2 python3-ujson: Upgrade 4.0.1 -> 4.0.2 python3-smbus2: Upgrade 0.4.0 -> 0.4.1 python3-pyzmq: Upgrade 20.0.0 -> 21.0.1 python3-alembic: Upgrade 1.5.1 -> 1.5.2 python3-prompt-toolkit: Upgrade 3.0.10 -> 3.0.11 python3-pyjwt: Upgrade 2.0.0 -> 2.0.1 python3-pyyaml: Upgrade 5.4 -> 5.4.1 python3-natsort: Upgrade 7.1.0 -> 7.1.1 python3-pymisp: Upgrade 2.4.135.3 -> 2.4.137.1 python3-socketio: Upgrade 4.6.0 -> 5.0.4 python3-lazy-object-proxy: Upgrade 1.5.1 -> 1.5.2 python3-custom-inherit: Upgrade 2.3.0 -> 2.3.1 python3-cachetools: Upgrade 4.2.0 -> 4.2.1 python3-coverage: Upgrade 5.3.1 -> 5.4 python3-diskcache: Upgrade 5.1.0 -> 5.2.1 python3-aenum: Upgrade 2.2.6 -> 3.0.0 python3-xmlschema: Upgrade 1.4.1 -> 1.4.2 python3-intervals: Upgrade 1.10.0 -> 1.10.0.post1 python3-portion: Add recipe python3-pako: Upgrade 0.2.3 -> 0.3.0 python3-typed-ast: Upgrade 1.4.1 -> 1.4.2 python3-pyzmq: Upgrade 21.0.1 -> 21.0.2 Luca Boccassi (4): dbus-broker: enable SO_PEERSEC usage by default fsverity: update to 1.3 fsverity: fix MinGW build dbus-broker: update to v26 Mario Schuknecht (1): dnsmasq: Fix systemd service Mikko Rapeli (3): fuse: set CVE_PRODUCT to "fuse_project:fuse" flatbuffers: whitelist CVE-2020-35864 giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT Mingli Yu (2): mcelog: fix the pfa test hang mariadb: upgrade to 10.5.8 Nicolas Jeker (1): networkmanager: Add Wireless Extensions to PACKAGECONFIG[wifi] Oleksiy Obitotskyy (1): libsmi: set awk as target path Robert Joslyn (1): htop: Update to 3.0.4 Ross Burton (1): libmicrohttpd: allow native/nativesdk builds S. Lockwood-Childs (1): sip3: simplify recipe Shlomi Vaknin (1): python3-sh: remove python3-tests from RDEPENDS Stefano Babic (1): libconfig: split package for C++ Søren Andersen (1): zram: fix sourcing of zram parameters Thomas Perrot (1): influxdb: add new recipe Trevor Gamblin (2): packagegroup-meta-python: sort package names, add notes packagegroup-meta-python: add ptest packages to ptest group Wang Mingyu (1): dovecot: upgrade 2.2.36.4 -> 2.3.13 Yi Zhao (1): nss: upgrade 3.60 -> 3.60.1 Zang Ruochen (9): c-periphery: upgrade 2.3.0 -> 2.3.1 htop: upgrade 3.0.4 -> 3.0.5 hwdata: upgrade 0.342 -> 0.343 spitools: upgrade 0.8.6 -> 0.8.7 librole-tiny-perl: upgrade 2.001004 -> 2.002003 python3-smbus: upgrade 4.1 -> 4.2 python3-snappy: upgrade 0.5.4 -> 0.6.0 python3-zopeinterface: upgrade 5.1.0 -> 5.2.0 python3-nmap: upgrade 1.4.8 -> 1.5.0 Zheng Ruoqin (7): cifs-utils: upgrade 6.11 -> 6.12 firewalld: upgrade 0.9.1 -> 0.9.2 igmpproxy: upgrade 0.2.1 -> 0.3 mdns: upgrade 1096.40.7 -> 1310.40.42 opensc: Fix the wrong version number. python3-djangorestframework: upgrade 3.12.1 -> 3.12.2 python3-ipy: upgrade 1.00 -> 1.01 changqing.li@windriver.com (1): celt051: update SRC_URI zangrc (6): libnftnl: upgrade 1.1.8 -> 1.1.9 czmq: upgrade 4.2.0 -> 4.2.1 dialog: upgrade 1.3-20201126 -> 1.3-20210117 modemanager: upgrade 1.14.8 -> 1.14.10 monit: upgrade 5.27.1 -> 5.27.2 python3-networkmanager: upgrade 2.1 -> 2.2 zhengruoqin (3): openldap: upgrade 2.4.56 -> 2.4.57 satyr: upgrade 0.35 -> 0.36 zeromq: upgrade 4.3.3 -> 4.3.4 Signed-off-by: Andrew Geissler Change-Id: I2469d162f1db8072fec106f629872618082bbeac --- .../recipes-support/celt051/celt051_git.bb | 2 +- ...x-Modify-the-dir-of-install-exec-hook-and.patch | 43 ---------- .../recipes-support/cifs/cifs-utils_6.11.bb | 37 -------- .../recipes-support/cifs/cifs-utils_6.12.bb | 33 ++++++++ .../dnsmasq/files/dnsmasq-resolvconf.service | 2 +- ...c-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch | 99 ++++++++++++---------- .../dovecot/0001-doveadm-Fix-parallel-build.patch | 38 --------- .../dovecot/dovecot/0001-not-check-pandoc.patch | 26 ++++++ .../recipes-support/dovecot/dovecot_2.2.36.4.bb | 73 ---------------- .../recipes-support/dovecot/dovecot_2.3.13.bb | 73 ++++++++++++++++ .../recipes-support/wireshark/wireshark_3.2.10.bb | 80 +++++++++++++++++ .../recipes-support/wireshark/wireshark_3.2.7.bb | 80 ----------------- 12 files changed, 267 insertions(+), 319 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb (limited to 'meta-openembedded/meta-networking/recipes-support') diff --git a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb index 12b9124f74..c3e4cbbe6d 100644 --- a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb @@ -16,7 +16,7 @@ PV = "0.5.1.3+git${SRCPV}" SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" -SRC_URI = "git://git.xiph.org/celt.git;branch=compat-v0.5.1;protocol=https \ +SRC_URI = "git://gitlab.xiph.org/xiph/celt.git;branch=compat-v0.5.1;protocol=https \ file://0001-configure.ac-make-tools-support-optional.patch \ file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch deleted file mode 100644 index 233ae40ce0..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f61f5f8a328207867b5c523b1c6bef6aaecaab88 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Sat, 15 Feb 2020 16:05:58 +0800 -Subject: [PATCH] Bugfix: Modify the dir of install-exec-hook and - install-data-hook - -Error message: -(cd /sbin && ln -sf mount.cifs mount.smb3) - /yocto/work001/fnst/wangmy/build/tmp/hosttools/install -c mount.cifs -'/yocto/work001/fnst/wangmy/build/tmp/work/core2-64-poky-linux/cifs-utils/6.10-r0/image/sbin' -make install-data-hook -ln: failed to create symbolic link 'mount.smb3': Permission denied - -Upstream-Status: Pending - -Signed-off-by: Wang Mingyu ---- - Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fe9cd34..e9be6b3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -119,11 +119,11 @@ endif - SUBDIRS = contrib - - install-exec-hook: -- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) - - install-data-hook: -- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) - - uninstall-hook: -- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) -- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb deleted file mode 100644 index de3fbb0947..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." -HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" -SECTION = "otherosfs" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRCREV = "ded4e81796a18cde73329e838357f084aa05720f" -SRC_URI = "git://git.samba.org/cifs-utils.git" - -S = "${WORKDIR}/git" -DEPENDS += "libtalloc" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" -# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed -PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" -# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed -PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" -PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" -PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" -PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" - -SRC_URI += " \ - file://0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch \ - " - -inherit autotools pkgconfig - -do_install_append() { - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} -} - -FILES_${PN} += "${base_libdir}/security" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" -RRECOMMENDS_${PN} = "kernel-module-cifs" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb new file mode 100644 index 0000000000..c68b474cc6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" +SECTION = "otherosfs" +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "73008e3292e4d46fde3eab5d5f618886210ec4a1" +SRC_URI = "git://git.samba.org/cifs-utils.git" + +S = "${WORKDIR}/git" +DEPENDS += "libtalloc" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" +# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" +# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed +PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" +PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" +PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" +PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" + +inherit autotools pkgconfig + +do_install_append() { + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} +} + +FILES_${PN} += "${base_libdir}/security" +FILES_${PN}-dbg += "${base_libdir}/security/.debug" +RRECOMMENDS_${PN} = "kernel-module-cifs" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service index 2980f7def6..ef2f3f7e41 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service @@ -8,7 +8,7 @@ PIDFile=/run/dnsmasq.pid ExecStartPre=/usr/bin/dnsmasq --test ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start -ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop +ExecStop=/usr/bin/dnsmasq-resolvconf-helper stop ExecStop=/bin/kill $MAINPID ExecReload=/bin/kill -HUP $MAINPID diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch index f86235076e..f16f687f24 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch @@ -9,58 +9,65 @@ Upstream-Status: pending Signed-off-by: Koen Kooi Signed-off-by: Li Xin + +Signed-off-by: Wang Mingyu --- - configure.ac | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) + m4/glibc.m4 | 6 ++---- + m4/ioloop.m4 | 9 +++------ + 2 files changed, 5 insertions(+), 10 deletions(-) -diff --git a/configure.ac b/configure.ac -index 3b32614..94ec002 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -519,13 +519,10 @@ have_ioloop=no - - if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then - AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +diff --git a/m4/glibc.m4 b/m4/glibc.m4 +index 5d722aa..ce088d3 100644 +--- a/m4/glibc.m4 ++++ b/m4/glibc.m4 +@@ -17,7 +17,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. + dnl * It may also be broken in AIX. + AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - AC_TRY_RUN([ + AC_TRY_LINK([ - #include -- -- int main() -- { -- return epoll_create(5) < 1; + #define _XOPEN_SOURCE 600 + #include + #include +@@ -26,7 +26,7 @@ AC_DEFUN([DOVECOT_GLIBC], [ + #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) + possibly broken posix_fallocate + #endif +- int main() { ++ ], [ + int fd = creat("conftest.temp", 0600); + int ret; + if (fd == -1) { +@@ -35,8 +35,6 @@ AC_DEFUN([DOVECOT_GLIBC], [ + } + ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; + unlink("conftest.temp"); +- return ret; - } -+ ], [ -+ epoll_create(5) < 1; ], [ - i_cv_epoll_works=yes + i_cv_posix_fallocate_works=yes ], [ -@@ -653,7 +650,7 @@ fi - dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it. - dnl * It may also be broken in AIX. - AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ -- AC_TRY_RUN([ -+ AC_TRY_LINK([ - #define _XOPEN_SOURCE 600 - #include - #include -@@ -662,7 +659,7 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) - possibly broken posix_fallocate - #endif -- int main() { -+ ], [ - int fd = creat("conftest.temp", 0600); - int ret; - if (fd == -1) { -@@ -671,8 +668,6 @@ AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[ - } - ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0; - unlink("conftest.temp"); -- return ret; -- } - ], [ - i_cv_posix_fallocate_works=yes - ], [ +diff --git a/m4/ioloop.m4 b/m4/ioloop.m4 +index 0f7dde0..f40fd62 100644 +--- a/m4/ioloop.m4 ++++ b/m4/ioloop.m4 +@@ -4,13 +4,10 @@ AC_DEFUN([DOVECOT_IOLOOP], [ + + if test "$ioloop" = "best" || test "$ioloop" = "epoll"; then + AC_CACHE_CHECK([whether we can use epoll],i_cv_epoll_works,[ +- AC_TRY_RUN([ ++ AC_TRY_LINK([ + #include +- +- int main() +- { +- return epoll_create(5) < 1; +- } ++ ], [ ++ epoll_create(5) < 1; + ], [ + i_cv_epoll_works=yes + ], [ -- -1.8.4.2 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch deleted file mode 100644 index 65ae9bf910..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From be9b3809b86fe593dbb16f0b981b3d315a27b799 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 22 Oct 2017 22:10:41 -0700 -Subject: [PATCH] doveadm: Fix parallel build - -Sometimes dovetail build fails with errors like - -doveadm-util.o: file not recognized: File truncated -collect2: error: ld returned 1 exit status -make[4]: *** [Makefile:812: test-doveadm-util] Error 1 - -This is partial backport from - -https://github.com/dovecot/core/commit/b200bc3875fa06d42c8619865cc306c3297fcacc - -Signed-off-by: Khem Raj ---- - src/doveadm/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am -index c644646..6ae9144 100644 ---- a/src/doveadm/Makefile.am -+++ b/src/doveadm/Makefile.am -@@ -180,8 +180,8 @@ test_libs = \ - ../lib/liblib.la - test_deps = $(noinst_LTLIBRARIES) $(test_libs) - --test_doveadm_util_SOURCES = test-doveadm-util.c --test_doveadm_util_LDADD = doveadm-util.o $(test_libs) $(MODULE_LIBS) -+test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c -+test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS) - test_doveadm_util_DEPENDENCIES = $(test_deps) - - check: check-am check-test --- -2.14.2 - diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch new file mode 100644 index 0000000000..20ba73a824 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-not-check-pandoc.patch @@ -0,0 +1,26 @@ +From 8c7d143ff28441c8b74b0f518dd2281239aede3d Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Fri, 15 Jan 2021 11:10:22 +0900 +Subject: [PATCH] not check pandoc + +Signed-off-by: Wang Mingyu +--- + m4/dovecot.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/dovecot.m4 b/m4/dovecot.m4 +index 2b5d895..ece8489 100644 +--- a/m4/dovecot.m4 ++++ b/m4/dovecot.m4 +@@ -447,7 +447,7 @@ AC_DEFUN([DC_PANDOC], [ + dnl Optional tool for making documentation + AC_CHECK_PROGS(PANDOC, [pandoc], [true]) + +- AS_IF([test "$PANDOC" = "true"], [ ++ AS_IF([test "$PANDOC" = "false"], [ + AS_IF([test ! -e README], [ + AC_MSG_ERROR([Cannot produce documentation without pandoc - disable with PANDOC=false ./configure]) + ]) +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb deleted file mode 100644 index bda1740234..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.36.4.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Dovecot is an open source IMAP and POP3 email server" -HOMEPAGE = "https://www.dovecot.org/" -DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." -SECTION = "mail" -LICENSE = "LGPLv2.1 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" - -SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ - file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ - file://dovecot.service \ - file://dovecot.socket \ - file://0001-doveadm-Fix-parallel-build.patch \ - " - -SRC_URI[md5sum] = "66c4d71858b214afee5b390ee602dee2" -SRC_URI[sha256sum] = "777c61e264869e9b288b8d6603f4ed3ac3aac9ec573908067353f51269dce2fe" - -DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc" -CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDFLAGS += "-ltirpc" - -inherit autotools pkgconfig systemd useradd gettext - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" - -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," - -# From native build in armv7a-hf/eglibc -CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ - i_cv_gmtime_max_time_t=32 \ - i_cv_signed_time_t=yes \ - i_cv_mmap_plays_with_write=yes \ - i_cv_fd_passing=yes \ - i_cv_c99_vsnprintf=yes \ - lib_cv___va_copy=yes \ - lib_cv_va_copy=yes \ - lib_cv_va_val_copy=yes \ - " - -# hardcode epoll() to avoid running unsafe tests -# BSD needs kqueue and uclibc poll() -EXTRA_OECONF = " --with-ioloop=epoll \ - --with-systemdsystemunitdir=${systemd_unitdir}/system" - -# Uses hidden symbols -# libssl_iostream_openssl.so: undefined reference to `ssl_iostream_handshake' -LTO = "" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" -SYSTEMD_AUTO_ENABLE = "disable" - -do_install_append () { - install -d 755 ${D}/etc/dovecot - touch 644 ${D}/etc/dovecot/dovecot.conf - install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ - -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" -GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" - -FILES_${PN} += "${libdir}/dovecot/*plugin.so \ - ${libdir}/dovecot/libfs_compress.so \ - ${libdir}/dovecot/libssl_iostream_openssl.so" -FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" -FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" -FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb new file mode 100644 index 0000000000..c78d283d25 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.13.bb @@ -0,0 +1,73 @@ +SUMMARY = "Dovecot is an open source IMAP and POP3 email server" +HOMEPAGE = "https://www.dovecot.org/" +DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." +SECTION = "mail" +LICENSE = "LGPLv2.1 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048" + +SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ + file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ + file://dovecot.service \ + file://dovecot.socket \ + file://0001-not-check-pandoc.patch \ + " + +SRC_URI[md5sum] = "f512bf1a4dac9ac994fddfb6bc5068ff" +SRC_URI[sha256sum] = "a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4" + +DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" + +inherit autotools pkgconfig systemd useradd gettext + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}" + +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," +PACKAGECONFIG[ldap] = "--with-ldap=plugin,--without-ldap,openldap," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," + +# From native build in armv7a-hf/eglibc +CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ + i_cv_gmtime_max_time_t=32 \ + i_cv_signed_time_t=yes \ + i_cv_mmap_plays_with_write=yes \ + i_cv_fd_passing=yes \ + i_cv_c99_vsnprintf=yes \ + lib_cv___va_copy=yes \ + lib_cv_va_copy=yes \ + lib_cv_va_val_copy=yes \ + " + +# hardcode epoll() to avoid running unsafe tests +# BSD needs kqueue and uclibc poll() +EXTRA_OECONF = " --with-ioloop=epoll \ + --with-systemdsystemunitdir=${systemd_unitdir}/system" + +# Uses hidden symbols +# libssl_iostream_openssl.so: undefined reference to `ssl_iostream_handshake' +LTO = "" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install_append () { + install -d 755 ${D}/etc/dovecot + touch 644 ${D}/etc/dovecot/dovecot.conf + install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ + -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" +GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" + +FILES_${PN} += "${libdir}/dovecot/*plugin.so \ + ${libdir}/dovecot/libfs_compress.so \ + ${libdir}/dovecot/libssl_iostream_openssl.so" +FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" +FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" +FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb new file mode 100644 index 0000000000..d284824149 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.10.bb @@ -0,0 +1,80 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" + +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" + +DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " + +SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" + +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[sha256sum] = "1e9e239f2449f240a7910ed598084ccaf8ea308b2b46b196c5adbec59612226c" + +PE = "1" + +inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" + +PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" + +PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" +PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" +PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" +PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" +PACKAGECONFIG[ssl] = ",,openssl" +PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" +PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" +PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" +PACKAGECONFIG[geoip] = ",, geoip" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" +PACKAGECONFIG[libssh] = ",,libssh2" +PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" + +# these next two options require addional layers +PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ + -DBUILD_mmdbresolve=OFF \ + -DBUILD_randpktdump=OFF \ + -DBUILD_androiddump=OFF \ + -DBUILD_dcerpcidl2wrs=OFF \ + -DM_INCLUDE_DIR=${includedir} \ + -DM_LIBRARY=${libdir} \ + " +CFLAGS_append = " -lm" + +do_install_append_class-native() { + install -d ${D}${bindir} + for f in lemon + do + install -m 0755 ${B}/run/$f ${D}${bindir} + done +} + +do_install_append_class-target() { + for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` + do + chrpath --delete $f + done +} + +PACKAGE_BEFORE_PN += "tshark" + +FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" + +FILES_${PN} += "${datadir}*" + +RDEPENDS_tshark = "wireshark" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb deleted file mode 100644 index 65f925ce1f..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb +++ /dev/null @@ -1,80 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" - -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native" - -DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " - -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" - -UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" - -SRC_URI[sha256sum] = "be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da" - -PE = "1" - -inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" - -PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" - -PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" -PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" -PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" -PACKAGECONFIG[libnl] = ",,libnl" -PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" -PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" -PACKAGECONFIG[ssl] = ",,openssl" -PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" -PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" -PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" -PACKAGECONFIG[geoip] = ",, geoip" -PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" -PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" -PACKAGECONFIG[libssh] = ",,libssh2" -PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" - -# these next two options require addional layers -PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ - -DBUILD_mmdbresolve=OFF \ - -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=OFF \ - -DBUILD_dcerpcidl2wrs=OFF \ - -DM_INCLUDE_DIR=${includedir} \ - -DM_LIBRARY=${libdir} \ - " -CFLAGS_append = " -lm" - -do_install_append_class-native() { - install -d ${D}${bindir} - for f in lemon - do - install -m 0755 ${B}/run/$f ${D}${bindir} - done -} - -do_install_append_class-target() { - for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` - do - chrpath --delete $f - done -} - -PACKAGE_BEFORE_PN += "tshark" - -FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" - -FILES_${PN} += "${datadir}*" - -RDEPENDS_tshark = "wireshark" - -BBCLASSEXTEND = "native" -- cgit v1.2.3