From 7e0e3c0c6a2cd4e76ebca17ed16a37155992025e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 25 Feb 2022 20:34:39 +0000 Subject: subtree updates feb 25 2022 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit poky: 27ff420543..49168f5d55: Ahsan Hussain (1): staging: use relative path in sysroot_stage_dir() Alejandro Hernandez Samaniego (5): core-image-tiny-initramfs: Mark recipe as 32 bit ARM compatible kernel.bbclass: Allow initramfs to be built from a separate multiconfig busybox: Add shell arithmetic to work with poky-tiny newlib: Upgrade 4.1.0 -> 4.2.0 documentation: Add multiconfig initramfs configuration: Alex Stewart (1): sudo: add /etc/sudoers to sudo-lib conffiles Alexander Kanavin (84): ruby: do not parallel install bind: upgrade 9.16.24 -> 9.16.25 ifupdown: upgrade 0.8.36 -> 0.8.37 ethtool: upgrade 5.15 -> 5.16 webkitgtk: upgrade 2.34.3 -> 2.34.4 debianutils: upgrade 5.5 -> 5.7 diffoscope: upgrade 200 -> 201 libbsd: upgrade 0.11.3 -> 0.11.5 libical: upgrade 3.0.12 -> 3.0.13 zstd: update 1.5.0 -> 1.5.2 rust: update 1.58.0 -> 1.58.1 wpa-supplicant: update 2.9 -> 2.10 ltp: update 20210927 -> 20220121 gnutls: update 3.7.2 -> 3.7.3 libusb1: correct SRC_URI gobject-introspection: replace prelink-rtld with objdump -p util-linux: update 2.37.2 -> 2.37.3 cmake: update 3.22.1 -> 3.22.2 git: merge .inc into .bb git: build manpages from source subject to manpages PACKAGECONFIG git: update 2.34.1 -> 2.35.1 python3-pycryptodome: update 3.12.0 -> 3.14.0 at: update 3.2.2 -> 3.2.4 sudo: update 1.9.8p2 -> 1.9.9 seatd: add recipe weston: upgrade 9.0.0 -> 10.0.0 xf86-input-libinput: update 1.2.0 -> 1.2.1 glib-2.0: upgrade 2.70.2 -> 2.70.3 lua: upgrade 5.4.3 -> 5.4.4 mmc-utils: upgrade to latest revision python3-cython: upgrade 0.29.26 -> 0.29.27 python3-hypothesis: upgrade 6.36.0 -> 6.36.1 python3-pip: upgrade 21.3.1 -> 22.0.2 cups: upgrade 2.4.0 -> 2.4.1 stress-ng: upgrade 0.13.10 -> 0.13.11 mesa: upgrade 21.3.4 -> 21.3.5 piglit: upgrade to latest revision puzzles: upgrade to latest revision diffoscope: upgrade 201 -> 202 libcap: upgrade 2.62 -> 2.63 libusb1: upgrade 1.0.24 -> 1.0.25 re2c: upgrade 2.2 -> 3.0 libgpg-error: update 1.43 -> 1.44 harfbuzz: upgrade 3.2.0 -> 3.3.1 qemu: replace a gtk wrapper with directly setting environment from runqemu runqemu: preload uninative libraries when host gl drivers are in use git: restore reproducibility on centos 7 insane.bbclass: use multiprocessing for collecting 'objdump -p' output llvm: update 12.0.1 -> 13.0.1 python3-numpy: update 1.22.1 -> 1.22.2 sstate: additional debugging when fetch fails occur sstate: fix up additional debugging when fetch fails occur ruby: correctly set native/target dependencies core-image-weston-sdk: synchronize with core-image-sato-sdk gstreamer1.0: disable flaky gstbin:test_watch_for_state_change test weston-init: disable systemd watchdog option webkitgtk: drop patch merged upstream man-db: update 2.10.0 -> 2.10.1 webkitgtk: remove rejected patch vulkan: update 1.2.198 -> 1.3.204 vulkan-samples: update to latest revision xkeyboard-config: update 2.34 -> 2.35.1 libgit2: update 1.3.0 -> 1.4.0 util-linux: upgrade 2.37.3 -> 2.37.4 python3-tomli: upgrade 2.0.0 -> 2.0.1 repo: upgrade 2.20 -> 2.21 help2man: upgrade 1.48.5 -> 1.49.1 meson: upgrade 0.61.1 -> 0.61.2 mmc-utils: upgrade to latest revision python3-dtschema: upgrade 2021.12 -> 2022.1 python3-pytest: upgrade 7.0.0 -> 7.0.1 vala: upgrade 0.54.6 -> 0.54.7 gi-docgen: upgrade 2021.8 -> 2022.1 pango: upgrade 1.48.10 -> 1.50.4 piglit: upgrade to latest revision shaderc: upgrade 2022.0 -> 2022.1 gst-examples: upgrade 1.18.5 -> 1.18.6 libical: upgrade 3.0.13 -> 3.0.14 diffoscope: upgrade 202 -> 204 gdb: update 11.1 -> 11.2 weston-init: replace deprecated/disabled fbdev with drm backend devtool: explicitly set main or master branches in upgrades when available base/staging: use HOST_PREFIX, not TARGET_PREFIX insane: use HOST_ variables, not TARGET_ to determine the cross system Alexandru Ardelean (1): libsndfile1: bump to version 1.0.31 Andrej Valek (3): busybox: refresh defconfig oeqa: qemu: create missing directory for _write_dump dhcpcd: add option to set DBDIR location Andres Beltran (1): create-spdx: add support for SDKs Andrey Zhizhikin (1): waffle: add wayland-protocols when building with wayland Bruce Ashfield (18): linux-yocto/5.15: update to v5.15.15 linux-yocto/5.10: update to v5.10.92 x86: fix defconfig configuration warnings linux-yocto/5.15: update to v5.15.16 linux-yocto/5.10: update to v5.10.93 linux-libc-headers: update to v5.16 qemuarm64: Add tiny ktype to qemuarm64 bsp lttng-modules: fix build against v5.17+ linux-yocto-dev: update to v5.17+ linux-yocto/5.15: update to v5.15.19 linux-yocto/5.10: update to v5.10.96 lttng-modules: update devupstream to latest 2.13 linux-yocto/5.15: update to v5.15.22 linux-yocto/5.10: update to v5.10.99 linux-yocto/5.15: ppc/riscv: fix build with binutils 2.3.8 linux-yocto/5.10: ppc/riscv: fix build with binutils 2.3.8 linux-yocto/5.10: fix dssall build error with binutils 2.3.8 linux-yocto/5.15: fix dssall build error with binutils 2.3.8 Carlos Rafael Giani (1): libxml2: Backport python3-lxml workaround patch Changhyeok Bae (1): connman: update 1.40 -> 1.41 Changqing Li (2): mdadm: fix testcase 00multipath failure nghttp2: fix for multilib support Chen Qi (1): mdadm: install mdcheck Christian Eggers (5): sdk: fix search for dynamic loader mc: fix build if ncurses have been configured without wide characters curl: configure with '--without-ssl' if ssl is disabled gcsections: add nativesdk-cairo to exclude list dev-manual: update example from kernel.bbclass Daiane Angolini (1): classes/lib/useradd: The option -P is deprecated Daniel Gomez (2): bitbake: contrib: Fix hash server Dockerfile dependencies bitbake: asyncrpc: Fix attribute errors Daniel Müller (1): scripts/runqemu-ifdown: Don't treat the last iptables command as special Denys Dmytriyenko (2): wayland-protocols: upgrade 1.24 -> 1.25 yocto-check-layer: add ability to perform tests from a global bbclass Florian Amstutz (1): devtool: deploy-target: Remove stripped binaries in pseudo context Hongxu Jia (1): glibc: fix create thread failed in unprivileged process Joe Slater (1): virglrenderer: fix CVE-2022-0135 and -0175 Jon Mason (1): linux-yocto-dev: add qemuriscv32 Jose Quaresma (18): icecc.bbclass: replace deprecated bash command substitution spirv-headers: bump to b42ba6 spirv-tools: upgrade 2021.4 -> 2022.1 glslang: upgrade 11.7.1 -> 11.8.0 shaderc: upgrade 2021.3 -> 2021.4 shaderc: upgrade 2021.4 -> 2022.0 gstreamer1.0: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-plugins-base: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-plugins-good: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-plugins-bad: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-plugins-ugly: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-rtsp-server: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-libav: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-vaapi: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-omx: upgrade 1.18.5 -> 1.20.0 gstreamer1.0-python: upgrade 1.18.5 -> 1.20.0 gst-devtools: upgrade 1.18.5 -> 1.20.0 gstreamer1.0: update licenses of all modules Joshua Watt (4): classes/create-spdx: Add packageSupplier field classes/create-spdx: Remove unnecessary package spdx: Add set helper for list properties bitbake: msg: Ensure manually created loggers have the once filter Justin Bronder (1): initramfs-framework: unmount automounts before switch_root Kai Kang (2): toolchain-scripts.bbclass: use double quotes for exported PS1 webkitgtk: 2.34.4 -> 2.34.5 Khem Raj (17): ffmpeg: Remove --disable-msa2 mips option systemd: Forward port musl patches ruby: Fix build on riscv/musl musl: Update to latest master libstd-rs: Apply patches to right version of libc image-prelink: Remove bbclass qemuppc64.conf: Remove commented prelink use meta: Remove libsegfault and catchsegv man-db: Fix build with clang diffutils: Link with libbcrypt on mingw binutils: Upgrade to 2.38 release opensbi: Upgrade to 1.0 u-boot: Fix RISCV build with binutils 2.38 libgit2: Upgrade to 1.4.1 grub: Fix build with bintutils 2.38 on riscv boost: Fix build on 32bit arches with 64bit time_t defaults scripts/documentation-audit: Use renamed LICENSE_FLAGS_ACCEPTED variable Konrad Weihmann (2): ruby: fix DEPENDS append gmp: fix EXTRA_OECONF for mipsarchr6 Kory Maincent (1): icu: fix make_icudata dependencies Lee Chee Yang (1): libarchive : update to 3.5.3 LiweiSong (1): qemu: add tpm string section to qemu acpi table Luna Gräfje (1): tune-cortexa72: Fix a misspelt override in PACKAGE_EXTRA_ARCHS Marek Vasut (1): kernel-fitimage: Add missing dependency for UBOOT_ENV Markus Niebel (1): kmscube: depend on virtual/libgbm Markus Volk (2): libical: build gobject and vala introspection seatd: build systemd backend if DISTRO_FEATURE systemd is set Marta Rybczynska (1): bitbake: lib/bb: fix exit when found renamed variables Martin Beeger (1): cmake: remove bogus CMAKE_LDFLAGS_FLAGS definition from toolchain file Martin Jansa (2): systemd: fix DeprecationWarning about regexps icecc.bbclass: fix syntax error Matthias Klein (1): boost: add json lib Michael Halstead (3): uninative: Upgrade to 3.5 releases: update to include 3.1.14 releases: update to include 3.4.2 Michael Opdenacker (8): migration-3.5: mention task specific network access dev-manual: stop mentioning the Angstrom distribution dev-manual: new "working with pre-compiled libraries" section manuals: improve references to classes manuals: propose https for SSTATE_MIRRORS ref-manual: add usage details about ccache.bbclass ref-manual: update TCLIBC description manuals: add 3.4 and 3.4.1 release notes after migration information Oleksandr Kravchuk (1): ell: update to 0.48 Oleksandr Suvorov (1): depmodwrapper-cross: add config directory option Pavel Zhukov (3): systemd: allow to create directory whose path contains symlink systemd: enable KeepConfiguration= when running on network filesystem patch.py: Prevent git repo reinitialization Peter Kjellerstedt (21): sstate: A third fix for for touching files inside pseudo devtool: sdk-update: Remove an unnecessary \n from SSTATE_MIRRORS sstatetests: Correct a typo in a comment glibc-tests: Correct PACKAGE_DEBUG_SPLIT_STYLE test-manual: Correct two references to BB_SKIP_NETTESTS package: Split out package_debug_vars from split_and_strip_files package: Make package_debug_vars() return a dict package: Pass dv (debug_vars) around instead of individual vars bitbake: bitbake-user-manual: Remove unnecessary \n from a PREMIRRORS example bitbake: tests/fetch: Skip the crate tests if network tests are disabled bitbake: tests/fetch: Remove unnecessary \n from mirror variables bitbake: tests/fetch: Improve the verbose messages for skipped tests bitbake: tests/fetch: Unify how git commands are run bitbake: tests/fetch: Only set the Git user name/email if they are not already set bitbake: tests/fetch: Make test_npm_premirrors work with the current fetcher bitbake: fetch2: Correct handling of replacing the basename in URIs bitbake: fetch2: npm: Put all downloaded files in the npm2 directory poky.conf: Remove unnecessary \n from PREMIRRORS local.conf.sample: Remove unnecessary \n from the SSTATE_MIRRORS example manuals: Remove unnecessary \n from SSTATE_MIRRORS examples oeqa/selftest/bblogging: Add logging tests for bb.build.exec_func with shell/python code Pgowda (2): glibc : Fix CVE-2021-3998 glibc : Fix CVE-2021-3999 Quentin Schulz (2): docs: point to renamed BB_BASEHASH_IGNORE_VARS variable docs: fix hardcoded link warning messages Richard Purdie (65): lttng-tools: upgrade 2.13.2 -> 2.13.4 gcc: Drop stdlib++ option patch staging: Add extra hash handling code abi_version/sstate: Bump for hash equivalence fix prelink: Drop support for it glibc: Drop prelink patch oqea/runtime/oe_syslog: Improve test vim: Upgrade 4269 -> 4134 binutils: Add fix for CVE-2021-45078 glibc: Upgrade to 2.35 patchelf: Fix corrupted file mode patch buildtools: Allow testsdk to access the network scriptutils: Fix handling of srcuri urls default-distrovars.inc: Switch connectivity check to a yoctoproject.org page bitbake: tests/fetch: Add missing branch param for git urls oeqa/buildtools: Switch to our webserver instead of example.com openssl: Add perl functionality test to do_configure ltp: Disable proc01 test bitbake: fetch2/cooker: Fix source revision handling with floating upstreams bitbake: data_smart: Fix overrides file/line message additions bitbake: cooker: Improve parsing failure from handled exception usability bitbake: msg: Add bb.warnonce() and bb.erroronce() log methods bitbake: data_smart: Add hasOverrides method to public datastore API selftest/bbtests: Add tests for git floating tag resolution oeqa/selftest/bbtests: Update to match changed bitbake output features_check/insane: Use hasOverrides datastore method recipeutils: Add missing get_srcrev() call archiver: Fix typo bitbake: utils: Fix environment decorator logic error bitbake: fetch2: Abstract fetcher environment to a function core-image-testmaster: Rename to core-image-testcontroller scripts: Add a conversion script to use SPDX license names meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers oeqa/selftest/bbtests: Update after license changes sstate: Setup fetcher environment in advance expat: Upgrade 2.4.4 -> 2.4.5 expat: Upgrade 2.4.5 -> 2.4.6 perl: Improve and update module RPDEPENDS libxml-parser-perl: Add missing RDEPENDS vim: Upgrade 8.2.4314 -> 8.2.4424 tiff: Add backports for two CVEs from upstream bitbake: utils: Ensure shell function failure in python logging is correct oeqa/selftest/bblogging: Split the test cases up for ease of testing bitbake: data_smart/cookerdata: Add variable remapping support bitbake: data_smart: Allow rename mechanism to show full expressions bitbake: data_smart: Add support to BB_RENAMED_VARIABLES for custom strings bitbake: bitbake: Bump version to 1.53.1 sanity.conf: Require bitbake version 1.53.1 layer.conf: Update to use kirkstone meta/scripts: Change BB_ENV_EXTRA_WHITE -> BB_ENV_PASSTHROUGH_ADDITIONS meta/scripts: Handle bitbake variable renaming bitbake.conf: Add entries for renamed variables meta/scripts: Automated conversion of OE renamed variables icecc: Improve variables/terminology bitbake.conf: Add entries to warn on usage of removed variables layer.conf: Update to kirkstone namespace bitbake: data_smart: Avoid exceptions for non string data bitbake: tests/fetch: Update for master -> main change upstream python3targetconfig: Use for nativesdk too licenses: Fix logic error introduced in rename pip_install_wheel: Recompile modified files pip_install_wheel: Use --ignore-installed for pip python3-pip: Don't change shebang python3-pip: Improve reproducibility python3-numpy: Fix pyc determinism issue Robert Joslyn (1): dev-manual/common-tasks: Fix typo Robert Yang (1): bitbake: bitbake: bitbake-worker: Preserve network non-local uid Ross Burton (21): tiff: backport fix for CVE-2022-22844 yocto-check-layer: add debug output for the layers that were found openssl: export OPENSSL_MODULES in the wrapper expat: upgrade to 2.4.4 vim: upgrade to patch 4269 core-image-sato-sdk: allocate more memory when in qemu oeqa/runtime/stap: improve systemtap test systemtap: backport buffer size tuning patches strace: remove obsolete musl-on-MIPS patch strace: skip a number of load-sensitive tests yocto-check-layer: check for duplicate layers when finding layers common-licences: remove ambiguous "BSD" license newlib: fix license checksums oeqa/selftest: test that newlib can build cmake: stop FetchContent from fetching content kernel: make kernel-base recommend kernel-image, not depend poky-tiny: don't skip core-image-base and core-image-full-cmdline poky-tiny: set QB_DEFAULT_FSTYPE correctly coreutils: remove obsolete ignored CVE list cve-check: get_cve_info should open the database read-only oeqa/controllers: update for MasterImageHardwareTarget->Controller... Rudolf J Streif (1): linux-firmware: Add CLM blob to linux-firmware-bcm4373 package Saul Wold (13): recipetool: Fix circular reference in SRC_URI create-spdx: Get SPDX-License-Identifier from source blacklist: Replace class with SKIP_RECIPE variable dnf: Use renamed SKIP_RECIPE varFlag multilib: Use renamed SKIP_RECIPE varFlag imagefeatures: selftest: Change variable to be more descriptive scripts: Add convert-variable-renames script for inclusive language variable renaming meta: Rename LICENSE_FLAGS variable poky-tiny: Use renamed SKIP_RECIPES varFlag Rename LICENSE_FLAGS variable meta: Further LICENSE_FLAGS variable updates package: rename LICENSE_EXCLUSION license.py: rename variables Scott Murray (13): bitbake: bitbake: Rename basehas and taskhash filtering variables bitbake: bitbake: Rename environment filtering variables bitbake: bitbake: Rename configuration hash filtering variable bitbake: bitbake: Rename setscene enforce filtering variable bitbake: bitbake: Rename allowed multiple provider variable bitbake: lib: Replace remaining "blacklist"/"whitelist" usage bitbake: lib/bb: Replace "abort" usage in task handling bitbake: lib/bb: Replace "ABORT" action in BB_DISKMON_DIRS bitbake: bitbake: Replace remaining "abort" usage local.conf/oeqa: Update BB_DISKMON_DIRS use meta-poky: Update BB_DISKMON_DIRS use scripts: fix file writing in convert-variable-renames scripts: fix file writing in convert-spdx-licenses Sean Anderson (1): libpcap: Disable DPDK explicitly Stefan Herbrechtsmeier (12): cve-check: create directory of CVE_CHECK_MANIFEST before copy systemd: Add link-udev-shared PACKAGECONFIG systemd: Minimize udev package size if DISTRO_FEATURES doen't contain sysvinit gcc-target: fix glob to remove gcc- binary gcc-target: move cc1plus to g++ package wic: partition: Support valueless keys in sourceparams wic: rawcopy: Add support for packed images selftest: wic: Remove requirement of syslinux from test_rawcopy_plugin selftest: wic: Add rawcopy plugin unpack test selftest: wic: Disable graphic of qemu to support WSL classes: rootfs-postcommands: avoid exception in overlayfs_qa_check files: overlayfs-create-dirs: split ExecStart into two commands Tamizharasan Kumar (2): linux-yocto/5.10: update genericx86* machines to v5.10.99 linux-yocto/5.15: update genericx86* machines to v5.15.22 Tim Orling (43): python3-hypothesis: upgrade 6.35.0 -> 6.36.0 python3-setuptools-scm: upgrade 6.3.2 -> 6.4.2 python3-pyparsing: upgrade 3.0.6 -> 3.0.7 python3-importlib-metadata: upgrade 4.10.0 -> 4.10.1 python3-wheel: move 0.37.1 from meta-python python3-flit-core: add recipe for 3.6.0 python3-flit-core: SUMMARY DESCRIPTION HOMEPAGE python3-flit-core: inherit pip_install_wheel flit_core.bbclass: add helper for newer python packaging python3-wheel: inherit flit_core pip_install_wheel.bbclass: add helper class python3-wheel-native: install ${bindir}/wheel setuptools_build_meta.bbclass: add helper class python3-pip: inherit setuptools_build_meta python3-pip-native: install scripts in ${bindir} python3-attrs: inherit setuptools_build_meta python3-git: inherit setuptools_build_meta python3-pytest: inherit setuptools_build_meta python3-setuptools-scm: inherit setuptools_build_meta python3-zipp: inherit setuptools_build_meta python3-iniconfig: inherit setuptools_build_meta python3-py: inherit setuptools_build_meta python3-pluggy: inherit setuptools_build_meta python3-setuptools: inherit setuptools_base_meta setuptools3.bbclass: refactor for wheels python3-more-itertools: set PIP_INSTALL_PACKAGE meson: inherit setuptools_build_meta python3-libarchive-c: set PIP_INSTALL_PACKAGE python3-smartypants: patch hash bang to python3 python3-scons: merge -native recipe python3-subunit: merge inc; set PIP_INSTALL_PACKAGE python3-magic: set PIP_INSTALL_PACKAGE bmap-tools: set PIP_INSTALL_PACKAGE, BASEVER asciidoc: set PIP_INSTALL_PACKAGE gi-docgen: set PIP_INSTALL_PACKAGE python3-numpy: set PIP_INSTALL_PACKAGE python3-dbusmock: set PIP_INSTALL_PACKAGE python3-mako: inherit setuptools_build_meta python3-packaging: inherit setuptools_build_meta python3-nose: drop recipe disutils*.bbclasses: move to meta-python selftest: drop distutils3 test from recipetool pip_install_wheel: improved wheel filename guess Tom Hochstein (1): xwayland: Add xkbcomp runtime dependency Yi Zhao (2): glibc: unify wordsize.h between arm and aarch64 glibc: fix multilib headers conflict for arm Zoltán Böszörményi (2): qemuboot: Fix build error if UNINATIVE_LOADER is unset gtk-icon-cache: Allow using gtk4 Zygmunt Krynicki (13): bitbake: fetch2/wget: move loop-invariant load of BB_ORIGENV bitbake: cooker: Fix typo "isn't" and "tuples" bitbake: cookerdata: Fix typo "normally" bitbake: daemonize: Fix typo "separate" bitbake: event: Fix typo "asynchronous" and "occasionally" bitbake: fetch2: Fix typo "conform" and "processed" bitbake: fetch2/git: Remove duplicate "the" bitbake: persist_data: Fix typo "committed" bitbake: process: Fix typo: "process" bitbake: progress: Fix typo "wherever" bitbake: tinfoil: Fix typo "receive" and "something" bitbake: utils: Fix typo "dependency" and "spawning" bitbake: wget: Fix grammar "can happen" pgowda (1): gcc : Fix CVE-2021-46195 wangmy (44): libwebp: 1.2.1 -> 1.2.2 python3-libarchive-c: upgrade 3.2 -> 4.0 lighttpd: upgrade 1.4.63 -> 1.4.64 nfs-utils: upgrade 2.5.4 -> 2.6.1 libmodulemd: upgrade 2.13.0 -> 2.14.0 libxcrypt: upgrade 4.4.27 -> 4.4.28 lzip: upgrade 1.22 -> 1.23 libxkbcommon: upgrade 1.3.1 -> 1.4.0 man-db: upgrade 2.9.4 -> 2.10.0 gdbm: upgrade 1.22 -> 1.23 harfbuzz: upgrade 3.3.1 -> 3.3.2 findutils: upgrade 4.8.0 -> 4.9.0 python3-magic: upgrade 0.4.24 -> 0.4.25 python3-pycryptodome: upgrade 3.14.0 -> 3.14.1 python3-pytest: upgrade 6.2.5 -> 7.0.0 python3-pip: upgrade 22.0.2 -> 22.0.3 python3-pyelftools: upgrade 0.27 -> 0.28 screen: upgrade 4.8.0 -> 4.9.0 ed: upgrade 1.17 -> 1.18 autoconf-archive: upgrade 2021.02.19 -> 2022.02.11 gpgme: upgrade 1.16.0 -> 1.17.0 glib-2.0: upgrade 2.70.3 -> 2.70.4 harfbuzz: upgrade 3.3.2 -> 3.4.0 python3-hypothesis: upgrade 6.36.1 -> 6.36.2 python3-pathlib2: upgrade 2.3.6 -> 2.3.7 python3-pbr: upgrade 5.8.0 -> 5.8.1 python3-ruamel-yaml: upgrade 0.17.20 -> 0.17.21 linux-firmware: upgrade 20211216 -> 20220209 rng-tools: upgrade 6.14 -> 6.15 mesa: upgrade 21.3.5 -> 21.3.6 go: upgrade 1.17.6 -> 1.17.7 libhandy: Use upstream regex to check version of upgrade. libva-utils: upgrade 2.13.0 -> 2.14.0 patchelf: upgrade 0.14.3 -> 0.14.5 quilt: upgrade 0.66 -> 0.67 ruby: upgrade 3.1.0 -> 3.1.1 wireless-regdb: upgrade 2021.08.28 -> 2022.02.18 bind: upgrade 9.16.25 -> 9.16.26 flac: upgrade 1.3.3 -> 1.3.4 init-system-helpers: upgrade 1.60 -> 1.62 libdrm: upgrade 2.4.109 -> 2.4.110 python3-hypothesis: upgrade 6.36.2 -> 6.37.2 python3-markupsafe: upgrade 2.0.1 -> 2.1.0 asciidoc: upgrade 10.1.1 -> 10.1.3 meta-raspberrypi: 836755370f..e39a0a570c: Andrei Gherzan (13): README.md: Add contributing section Move the python3-adafruit recipes depending on meta-oe to dynamic layers README.md: Don't advertise meta-oe dependency docs: Detail the merging process of patches sent through the mailing list ci: Define an action for building a local docker image ci: Define an action for cleaning dangling image ci: Define an action for cleaning/removing an image ci: Introduce workflow for compliance ci: Introduce workflow Yocto operations/builds ci: Add workflow to cancel redundant workflows ci: Add git mirror workflow ci: No need for checkout step in mirror workflow ci: Use the current stable version for the mirror action Aníbal Limón (1): gstreamer1.0-plugins-good: Update bbappend to 1.20 Bernhard Guillon (1): rpi-base.inc: enable i2c-gpio overlay Devendra Tewari (1): linux-raspberrypi: Upgrade to 5.10.83 Khem Raj (7): raspberrypi4-64: Switch to using cortexa72-crc default tune picamera-libs,python3-picamera: Limit visibility to 32 bit rpi machines rpi-gpio: Replace setuptool3 instead of distutils3 python3-adafruit-blinka: Disable on musl linux-raspberrypi: Add recipe for 5.15 LTS kernel rpi-default-versions: Use 5.15 as default kernel layers: Bump to use kirkstone Martin Jansa (4): sdcard_image-rpi: fix DeprecationWarning gstreamer1.0-plugins-bad: remove libmms PACKAGECONFIG and add gpl meta: update variable names meta: update license names Mauro Anjo (1): machine: add Pi Zero 2 W 32bits Michal Toman (1): rpi-base.inc: Add vc4-fkms-v3d-pi4 overlay Mingli Yu (1): xserver-xorg: remove xshmfence configure option Otto Esko (2): recipes-bsp: Add support for gpio-shutdown Add documentation for gpio-shutdown Paul Barker (1): raspberrypi4-64: Switch to cortexa72 tune bhargavthriler (1): python3-picamera: Add picamera library meta-openembedded: 6b63095946..cf0ed42391: Alejandro Hernandez Samaniego (1): remmina: Upgrade to 1.4.23 Alexander Kanavin (4): libvncserver: disable ffmpeg support due to incompatiblility with ffmpeg 5.0 opencv: update 4.5.2 -> 4.5.5 minidlna: update 1.2.1 -> 1.3.0 mpd: update 0.22.9 -> 0.23.5 An?bal Lim?n (2): python3-apt: add new recipe version 2.3.0 unattended-upgrades: add new recipe version 2.6 Andreas Müller (1): All layers: Follow oe-core's variable name changes Andrej Valek (1): nodejs: add option to use openssl legacy providers Carlos Rafael Giani (3): pipewire: Upgrade to 0.3.45 wireplumber: Add recipe wireplumber: Improve configuration Changqing Li (1): python3-psutil: fix test failure Christian Eggers (5): ebtables: remove perl from RDEPENDS graphviz: native: create /usr/lib/graphviz/config6 in populate_sysroot boost-sml: add new recipe python3-dt-schema: remove recipe graphviz: added PACKAGECONFIG for librsvg Clément Péron (1): networking: add new netsniff-ng recipe version 0.6.8 Daniel Gomez (1): opencv: Update contrib 4.5.2 -> 4.5.5 Devendra Tewari (1): libcamera: add pkg-config files Fabio Estevam (2): rtc-tools: Add a recipe rtc-tools: Update to 2022.02 Gianfranco Costamagna (4): vboxguestdrivers: upgrade 6.1.30 -> 6.1.32 boinc-client: Update to 7.18.1 mosquitto: upgrade 2.0.12 -> 2.0.14 websocketpp: Apply upstream proposed patch to fix a Scons 4.2.0+ build failure Jan Luebbe (1): snappy: use main branch to fix fetch failure Jan Vermaete (2): netdata: upgrade 1.32.1 -> 1.33.0 netdata: version bump 1.33.0 -> 1.33.1 Justin Bronder (4): yaml-cpp: bump 0.7.0 googlebenchmark: add 1.6.1 python3-pytest-forked: add 1.4.0 python3-pytest-xdist: add 2.5.0 Kai Kang (1): openjpeg: fix CVE-2021-29338 Kartikey Rameshbhai Parmar (1): imagemagick: update SRC_URI branch to main Khem Raj (46): xfce4-datetime-setter: Fix build with meson 0.61+ gerbera: Upgrade to 1.9.2 iotop: Disable LTO with clang/rv64 spdlog: Update the external fmt patch dlt-daemon: Bump to latest revision on master evolution-data-server: Disable g-i data generation gerbera: Fix build with fmt 8.1+ php: Update to 8.1.2 postgresql: Fix build on riscv libcec: Fix type mismatch for return value of LibCecBootloader() gparted: Do not use NULL where boolean is expected python3-pyruvate: Fix build with mips python3-pyruvate: Fix build with riscv64/musl pcp: Disable parallel compile gst-shark: Upgrade to 0.7.3.1 crda: Fix buffer overflow in sscanf open-vm-tools: Fix build with musl openldap: Fix build with musl gimp: Disable vector icons on x86 with clang libjs-jquery-icheck: Use hardcoded SHA for srcrev smarty: Upgrade to 4.1.0 dhcp-relay: Package needed shared libs from bind gimp: Disable vector icons with clang on arm capnproto: Fix build on mips packagegroup-meta-oe: Add googlebenchmark packagegroup-meta-python: Add python3-pytest-forked and python3-pytest-xdist ntopng: Avoid linking libm statically libsigc++-3: Upgrade to 3.2.0 geany-plugins: Fix build with libgit2 1.4+ recipes: Use renamed SKIP_RECIPE varFlag recipes: Use new CVE_CHECK_IGNORE variable meta-oe: Use new variable SYSROOT_DIRS_IGNORE layers: Bump to use kirkstone capnproto: Link with libatomic on rv32 iotop: Disable lto with clang for rv32 glibmm: Add recipe for 2.70.0 cairomm: Add recipe for cairomm 1.16 pangomm: Add recipe for pangomm-2.48 atkmm: Add new recipe for 2.36+ libxml++: Upgrade to 2.42.1 release libxml++-5.0: Add recipe for libxml++ 5.0 Revert "libcamera: add pkg-config files" python3-blinker: Migrate to use pytest instead of nose for testing python3-oauthlib: Drop redundant nose dependency netplan: Add knob to enable tests openldap: Use renamed variable CVE_CHECK_IGNORE Leon Anavi (23): python3-imageio: Upgrade 2.14.0 -> 2.14.1 python3-pandas: Upgrade 1.3.5 -> 1.4.0 python3-aenum: Upgrade 3.1.6 -> 3.1.8 python3-redis: Upgrade 4.0.2 -> 4.1.1 python3-jdatetime: Upgrade 3.8.1 -> 3.8.2 python3-bandit: Upgrade 1.7.1 -> 1.7.2 python3-fasteners: Upgrade 0.17.2 -> 0.17.3 python3-ansi2html: Upgrade 1.6.0 -> 1.7.0 python3-coverage: Upgrade 6.2 -> 6.3 python3-imageio: Upgrade 2.14.1 -> 2.15.0 python3-humanize: Upgrade 3.13.1 -> 3.14.0 python3-bitarray: Upgrade 2.3.5 -> 2.3.6 python3-itsdangerous: Upgrade 2.0.1 -> 2.1.0 python3-croniter: Upgrade 1.2.0 -> 1.3.4 python3-distro: Upgrade 1.6.0 -> 1.7.0 python3-click: Upgrade 8.0.3 -> 8.0.4 python3-ordered-set: Upgrade 4.0.2 -> 4.1.0 python3-bitarray: Upgrade 2.3.6 -> 2.3.7 python3-pandas: Upgrade 1.4.0 -> 1.4.1 python3-unidiff: Upgrade 0.7.0 -> 0.7.3 python3-langtable: Upgrade to release 0.0.57 python3-cmd2: Upgrade 2.3.3 -> 2.4.0 python3-coverage: Upgrade 6.3 -> 6.3.2 Marek Vasut (1): freerdp: Update to FreeRDP 2.5.0 Mark Jonas (1): mbedtls: Upgrade to 2.28.0 Markus Volk (12): geary: initial add recipe packagegroup-gnome-apps.bb: add geary folks: add PACKAGECONFIG for import_tool and inspect_tool geary: use sha hash for SRCREV; fix identation folks: make some dependencies optional evolution-data-server: try to fix g-i data generation folks: dont build tests as they are not installed anyway gvfs: upgrade 1.48.1 -> 1.49.1 libxfce4util: inherit vala xfconf: inherit vala libxfce4ui: disable vala xfce4-panel: disable vala Martin Jansa (1): Fix DeprecationWarning about regexps Matsunaga-Shinji (1): openldap: add CVE-2015-3276 to allowlist Matthias Klein (1): gpsd-machine-conf: set precise BSD-3-Clause license Mingli Yu (5): plymouth: switch to KillMode=mixed lxdm: remove conflicts setting plymouth: add extra kernel parameter opencv: disable sse4.1 and sse4.2 on x86 plymouth: Add the retain-splash option Oleksandr Kravchuk (4): redis: add recipe for 7.0-rc1 iwd: update to 1.24 fping: update to 5.1 capnproto: update to 0.9.1 Peter Bergin (1): pipewire: fix build error when pipewire-jack is used Peter Griffin (1): libcamera: update meson options to build pipeline handlers & cam utility Randy MacLeod (1): rsyslog: update to 8.2202 Robert Joslyn (1): hwdata: Update to 0.356 Ross Burton (16): python3-jsonpath-rw: set correct license concurrencykit: use precise BSD licence version pkcs11-helper: update homepage pkcs11-helper: set precise BSD license spice: set correct LICENSE poppler-data: set precise BSD license openipmi: use precise BSD license s-nail: add a maintained mail(1) fork minidlna: use precise BSD license smartmontools: use s-nail mailx: remove spice-protocol: upgrade to 1.14.3 libjs-jquery: remove fwupd-efi: upgrade to 1.2 fping: set precise license concurrencykit: enable 32- and 64-bit Arm targets Sakib Sajal (1): nss: uprev v3.73.1 -> v3.74 Sam Van Den Berge (1): libiio: use setuptools functions instead of distutils Thomas Perrot (1): breakpad: fix branch for gtest in SRC_URI Tim Orling (2): python3-wheel: drop; moved to oe-core python3-test-generator: drop recipe Trevor Gamblin (1): phoronix-test-suite: upgrade 9.2.1 -> 10.8.1 Wang Mingyu (39): ndpi: upgrade 4.0 -> 4.2 ntopng: upgrade 5.0 -> 5.2.1 python3-werkzeug: upgrade 2.0.2 -> 2.0.3 python3-twisted: upgrade 21.7.0 -> 22.1.0 python3-natsort: upgrade 8.0.2 -> 8.1.0 xfsdump: upgrade 3.1.9 -> 3.1.10 mm-common: upgrade 1.0.3 -> 1.0.4 fsverity-utils: upgrade 1.4 -> 1.5 libgee: upgrade 0.20.4 -> 0.20.5 libqmi: upgrade 1.30.2 -> 1.30.4 libcrypt-openssl-guess-perl: upgrade 0.14 -> 0.15 gjs: upgrade 1.70.0 -> 1.70.1 dnf-plugin-tui: Fix a bug of multilib libwacom: upgrade 1.12 -> 2.1.0 gedit: upgrade 40.1 -> 41.0 gnome-autoar: upgrade 0.4.2 -> 0.4.3 libwnck3: upgrade 40.0 -> 40.1 iscsi-initiator-utils: upgrade 2.1.5 -> 2.1.6 iotop: upgrade 1.20 -> 1.21 inotify-tools: upgrade 3.21.9.6 -> 3.22.1.0 gnuplot: upgrade 5.4.2 -> 5.4.3 libxmlb: upgrade 0.3.6 -> 0.3.7 libgusb: upgrade 0.3.9 -> 0.3.10 monit: upgrade 5.30.0 -> 5.31.0 libjcat: upgrade 0.1.9 -> 0.1.10 libio-socket-ssl-perl: upgrade 2.073 -> 2.074 mpv: upgrade 0.34.0 -> 0.34.1 php: upgrade 8.1.2 -> 8.1.3 nano: upgrade 6.0 -> 6.2 rdma-core: upgrade 38.0 -> 39.0 netplan: upgrade 0.103 -> 0.104 nautilus: upgrade 41.1 -> 41.2 zchunk: upgrade 1.1.16 -> 1.2.0 tree: upgrade 2.0.1 -> 2.0.2 soci: upgrade 4.0.2 -> 4.0.3 remmina: upgrade 1.4.23 -> 1.4.24 wolfssl: upgrade 5.1.0- > 5.2.0 tcpreplay: upgrade 4.4.0 -> 4.4.1 spice-protocol: upgrade 0.14.3 -> 0.14.4 Xu Huan (15): python3-multidict: upgrade 5.2.0 -> 6.0.2 python3-pulsectl upgrade 21.10.5 -> 22.1.3 python3-pyephem: upgrade 4.1.1 -> 4.1.3 python3-pytest-timeout: upgrade 2.0.2 -> 2.1.0 python3-pywbemtools: upgrade 0.9.0 -> 0.9.1 python3-requests-oauthlib: upgrade 1.3.0 -> 1.3.1 python3-sqlalchemy: upgrade 1.4.29 -> 1.4.31 python3-oauthlib: upgrade 3.1.1 -> 3.2.0 python3-pyudev: upgrade 0.22.0 -> 0.23.2 python3-pyopenssl: upgrade 21.0.0 -> 22.0.0 python3-alembic upgrade 1.7.5 -> 1.7.6 python3-autobahn: upgrade 21.11.1 -> 22.1.1 python3-flask: upgrade 2.0.2 -> 2.0.3 python3-imageio: upgrade 2.15.0 -> 2.16.0 python3-jdatetime: upgrade 3.8.2 -> 4.0.0 Yi Zhao (5): phpmyadmin: upgrade 5.1.1 -> 5.1.2 tcpdump: upgrade 4.99.0 -> 4.99.1 tcpslice: upgrade 1.2a3 -> 1.5 tcpreplay: update HOMEPAGE samba: upgrade 4.14.11 -> 4.14.12 Zheng Ruoqin (6): libjs-jquery: Upgrade to 3.3.1. protobuf: upgrade 3.19.3 -> 3.19.4 phpmyadmin: upgrade 5.1.2 -> 5.1.3 postgresql: upgrade 14.1 -> 14.2 pugixml: upgrade 1.11.4 -> 1.12 poppler: upgrade 22.01.0 -> 22.02.0 wangmy (14): fatcat: upgrade 1.1.0 -> 1.1.1 libnma: upgrade 1.8.32 -> 1.8.34 botan: upgrade 2.18.2 -> 2.19.1 cgdb: upgrade 0.7.1 -> 0.8.0 ddrescue: upgrade 1.25 -> 1.26 hostapd: upgrade 2.9 -> 2.10 libcereal: upgrade 1.3.0 -> 1.3.1 ser2net: upgrade 4.3.4 -> 4.3.5 dlt-daemon: upgrade 2.18.7 -> 2.18.8 devilspie2: upgrade 0.43 -> 0.44 opensaf: upgrade 5.21.09 -> 5.22.01 tcpreplay: upgrade 4.3.4 -> 4.4.0 lcms: upgrade 2.12 -> 2.13.1 libcgi-perl: upgrade 4.53 -> 4.54 meta-security: c20b35b527..6cc8dde794: Akshay Bhat (2): meta-hardening: Fix override syntax scap-security-guide: Fix openembedded platform tests Anton Antonov (1): Upgrade parsec-tool to 0.5.1 Armin Kuster (11): google-authenticator-libpam: update to 1.09 packagegroup-security-tpm2.bb: remove dynamic pkgs tpm2-pkcs11_1.7.0: Drop dstat from DPENDS lkrg-module: update to 0.9.2 suricata: update to 6.0.4 tpm2-tss: update to 3.1.0 parsec-service: fix compile issue. layer.conf: Update to use kirkstone recipes: Use renamed SKIP_RECIPE varFlag chipsec: fix WARNING smack: Use new CVE_CHECK_IGNORE variable Patrick Williams (1): tpm2-pkcs11: fix RDEPENDS variable Yi Zhao (1): samhain: upgrade 4.4.3 -> 4.4.6 Signed-off-by: Andrew Geissler Change-Id: I270425c8a022f2e281a28ea19fdfae47aa375551 --- meta-openembedded/meta-filesystems/conf/layer.conf | 2 +- .../recipes-utils/fatcat/fatcat_1.1.0.bb | 18 - .../recipes-utils/fatcat/fatcat_1.1.1.bb | 18 + .../recipes-utils/xfsdump/xfsdump_3.1.10.bb | 38 + .../recipes-utils/xfsdump/xfsdump_3.1.9.bb | 39 - meta-openembedded/meta-gnome/conf/layer.conf | 2 +- .../recipes-connectivity/folks/folks_0.15.4.bb | 13 +- .../recipes-connectivity/geary/geary_40.0.bb | 54 + .../recipes-connectivity/libnma/libnma_1.8.32.bb | 26 - .../recipes-connectivity/libnma/libnma_1.8.34.bb | 26 + ...Do-not-use-NULL-where-boolean-is-expected.patch | 33 + .../recipes-extended/gparted/gparted_1.3.1.bb | 1 + .../meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb | 2 + .../recipes-gnome/devilspie/devilspie2_0.43.bb | 35 - .../recipes-gnome/devilspie/devilspie2_0.44.bb | 35 + .../evolution-data-server/evolution-data-server.bb | 6 +- ...Remove-incorrect-args-for-i18n.merge_file.patch | 34 - .../meta-gnome/recipes-gnome/gedit/gedit_40.1.bb | 47 - .../meta-gnome/recipes-gnome/gedit/gedit_41.0.bb | 46 + .../meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb | 39 - .../meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb | 39 + .../gnome-autoar/gnome-autoar_0.4.2.bb | 21 - .../gnome-autoar/gnome-autoar_0.4.3.bb | 21 + ...Remove-incorrect-i18n.merge_file-argument.patch | 34 + .../meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb | 88 -- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb | 92 ++ .../recipes-gnome/libwnck/libwnck3_40.0.bb | 26 - .../recipes-gnome/libwnck/libwnck3_40.1.bb | 26 + .../recipes-gnome/nautilus/nautilus_41.1.bb | 46 - .../recipes-gnome/nautilus/nautilus_41.2.bb | 46 + .../recipes-gnome/tracker/tracker-miners_3.2.1.bb | 2 +- .../recipes-support/libwacom/libwacom_1.12.bb | 24 - .../recipes-support/libwacom/libwacom_2.1.0.bb | 24 + .../packagegroups/packagegroup-gnome-apps.bb | 1 + meta-openembedded/meta-initramfs/conf/layer.conf | 2 +- .../recipes-devtools/dracut/dracut_055.bb | 2 +- meta-openembedded/meta-multimedia/conf/layer.conf | 2 +- .../recipes-connectivity/rygel/rygel_0.38.3.bb | 4 +- .../recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb | 8 +- .../gerbera/gerbera/0001-Fix-for-fmt-8.0.patch | 46 + .../gerbera/0001-include-optional-header.patch | 32 - .../recipes-multimedia/gerbera/gerbera_1.7.0.bb | 31 - .../recipes-multimedia/gerbera/gerbera_1.9.2.bb | 31 + .../0001-tracers-Fix-buffer-overflow.patch | 33 + .../gstreamer-1.0/gst-shark_git.bb | 7 +- .../recipes-multimedia/libao/libao_1.2.0.bb | 4 +- .../recipes-multimedia/libcamera/libcamera.bb | 14 +- .../recipes-multimedia/minidlna/minidlna.inc | 4 +- ...001-Mark-setjmp_buffer-extern-declaration.patch | 29 - ...heck-for-clock_gettime-seprately-from-__N.patch | 19 +- ...001-configure.ac-drop-non-standard-checks.patch | 37 + .../recipes-multimedia/minidlna/minidlna_1.2.1.bb | 4 - .../recipes-multimedia/minidlna/minidlna_1.3.0.bb | 4 + .../mpd/0001-include-utility-for-std-forward.patch | 43 - .../recipes-multimedia/musicpd/mpd_0.22.9.bb | 102 -- .../recipes-multimedia/musicpd/mpd_0.23.5.bb | 101 ++ .../packagegroups/packagegroup-meta-multimedia.bb | 14 +- .../recipes-multimedia/pipewire/pipewire_0.3.34.bb | 289 ----- .../recipes-multimedia/pipewire/pipewire_0.3.45.bb | 332 +++++ .../recipes-multimedia/sox/sox_14.4.2.bb | 2 +- .../recipes-multimedia/vlc/vlc_3.0.12.bb | 2 +- ...-OE-disable-session-dbus-dependent-features.lua | 5 + .../wireplumber/wireplumber_0.4.8.bb | 143 +++ meta-openembedded/meta-networking/conf/layer.conf | 2 +- .../0001-Make-alpha2-to-be-3-characters-long.patch | 31 + .../recipes-connectivity/crda/crda_3.18.bb | 1 + .../dhcp/dhcp-relay_4.4.2p1.bb | 10 +- ...001-ssl_tls-Increase-size-of-padbuf-to-64.patch | 34 - .../recipes-connectivity/mbedtls/mbedtls_2.26.0.bb | 45 - .../recipes-connectivity/mbedtls/mbedtls_2.28.0.bb | 44 + .../mosquitto/files/1571.patch | 2 +- .../mosquitto/mosquitto_2.0.12.bb | 90 -- .../mosquitto/mosquitto_2.0.14.bb | 90 ++ .../netplan/0001-Makefile-do-not-use-Werror.patch | 11 +- ...1-don-t-fail-if-GLOB_BRACE-is-not-defined.patch | 16 +- .../0001-parse-nm-fix-32bit-format-string.patch | 25 - .../recipes-connectivity/netplan/netplan_0.103.bb | 64 - .../recipes-connectivity/netplan/netplan_0.104.bb | 67 + .../recipes-connectivity/samba/samba_4.14.11.bb | 342 ----- .../recipes-connectivity/samba/samba_4.14.12.bb | 342 +++++ .../recipes-connectivity/wolfssl/wolfssl_5.1.0.bb | 22 - .../recipes-connectivity/wolfssl/wolfssl_5.2.0.bb | 22 + .../packagegroups/packagegroup-meta-networking.bb | 3 +- .../cyrus-sasl/cyrus-sasl_2.1.27.bb | 2 +- ...r-error-introduced-with-recent-IPv6-commi.patch | 43 - .../iscsi-initiator-utils_2.1.5.bb | 118 -- .../iscsi-initiator-utils_2.1.6.bb | 117 ++ .../recipes-daemons/opensaf/opensaf_5.21.09.bb | 95 -- .../recipes-daemons/opensaf/opensaf_5.22.01.bb | 95 ++ .../recipes-filter/ebtables/ebtables_2.0.11.bb | 2 +- .../netkit-rusers/netkit-rusers_0.17.bb | 2 +- .../recipes-protocols/mdns/mdns_1310.140.1.bb | 2 +- .../recipes-support/dovecot/dovecot_2.3.14.bb | 2 +- .../recipes-support/drbd/drbd_9.0.24-1.bb | 2 +- .../recipes-support/fping/fping_5.0.bb | 24 - .../recipes-support/fping/fping_5.1.bb | 27 + .../lowpan-tools/lowpan-tools_git.bb | 2 +- .../0001-Cmds-automatically-create-folder.patch | 26 + .../netsniff-ng/netsniff-ng_0.6.8.bb | 36 + ...01-Makefile.in-don-t-use-the-internal-lua.patch | 12 +- .../0001-autogen.sh-not-generate-configure.patch | 18 +- ...c.in-Allow-dynamic-linking-against-ndpi-3.patch | 39 + .../0001-configure.ac.in-fix-configure-error.patch | 42 + ...01-configure.ac.in-fix-host-contamination.patch | 82 ++ ...1-configure.ac.in-not-check-clang-on-host.patch | 44 + .../0001-configure.seed-fix-configure-error.patch | 42 - ...001-configure.seed-fix-host-contamination.patch | 82 -- ...01-configure.seed-not-check-clang-on-host.patch | 44 - .../recipes-support/ntopng/ndpi_4.0.bb | 28 - .../recipes-support/ntopng/ndpi_4.2.bb | 28 + .../recipes-support/ntopng/ntopng_5.0.bb | 49 - .../recipes-support/ntopng/ntopng_5.2.1.bb | 50 + .../recipes-support/ntp/ntp_4.2.8p15.bb | 2 +- ...-vm-tools-Correct-include-path-for-poll.h.patch | 36 + .../open-vm-tools/open-vm-tools_11.3.5.bb | 1 + .../recipes-support/openipmi/openipmi_2.0.32.bb | 2 +- .../recipes-support/openvpn/openvpn_2.5.5.bb | 2 +- .../recipes-support/rdma-core/rdma-core_38.0.bb | 42 - .../recipes-support/rdma-core/rdma-core_39.0.bb | 42 + .../recipes-support/spice/spice-protocol_0.14.4.bb | 19 + .../recipes-support/spice/spice-protocol_git.bb | 28 - .../recipes-support/spice/spice_git.bb | 2 +- .../recipes-support/strongswan/strongswan_5.9.4.bb | 10 +- ...-aclocal.m4-Skip-checking-for-pcap-config.patch | 33 - .../recipes-support/tcpdump/tcpdump_4.99.0.bb | 61 - .../recipes-support/tcpdump/tcpdump_4.99.1.bb | 53 + .../tcpdump/tcpslice/tcpslice-1.2a3-time.patch | 75 -- .../tcpslice/tcpslice-CVS.20010207-bpf.patch | 15 - .../recipes-support/tcpdump/tcpslice_1.2a3.bb | 36 - .../recipes-support/tcpdump/tcpslice_1.5.bb | 25 + .../recipes-support/tcpreplay/tcpreplay_4.3.4.bb | 21 - .../recipes-support/tcpreplay/tcpreplay_4.4.1.bb | 21 + meta-openembedded/meta-oe/conf/layer.conf | 2 +- .../recipes-extended/lcdproc/lcdproc_git.bb | 2 +- .../libhugetlbfs/libhugetlbfs_git.bb | 2 +- .../phoronix-test-suite_10.8.1.bb | 41 + .../phoronix-test-suite_9.2.1.bb | 41 - .../meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch | 10 +- .../meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb | 34 - .../meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb | 33 + .../0001-Prepare-for-CVE-2021-30004.patch.patch | 45 - .../hostapd/hostapd/CVE-2019-16275.patch | 79 -- .../hostapd/hostapd/CVE-2019-5061.patch | 854 ------------- .../hostapd/hostapd/CVE-2021-0326.patch | 43 - .../hostapd/hostapd/CVE-2021-27803.patch | 54 - .../hostapd/hostapd/CVE-2021-30004.patch | 123 -- .../recipes-connectivity/hostapd/hostapd_2.10.bb | 51 + .../recipes-connectivity/hostapd/hostapd_2.9.bb | 57 - .../meta-oe/recipes-connectivity/iwd/iwd_1.21.bb | 55 - .../meta-oe/recipes-connectivity/iwd/iwd_1.24.bb | 55 + .../recipes-connectivity/libqmi/libqmi_1.30.2.bb | 21 - .../recipes-connectivity/libqmi/libqmi_1.30.4.bb | 21 + .../recipes-connectivity/ser2net/ser2net_4.3.4.bb | 18 - .../recipes-connectivity/ser2net/ser2net_4.3.5.bb | 18 + .../recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb | 29 + .../meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb | 27 - .../meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb | 27 + .../libsigc++-2.0/libsigc++-3_3.0.6.bb | 20 - .../libsigc++-2.0/libsigc++-3_3.2.0.bb | 19 + .../recipes-core/libxml/libxml++-5.0_5.0.1.bb | 20 + .../libxml/libxml++/libxml++_ptest.patch | 26 +- .../meta-oe/recipes-core/libxml/libxml++_2.40.1.bb | 28 - .../meta-oe/recipes-core/libxml/libxml++_2.42.1.bb | 33 + ...-do-not-ask-for-python-installation-versi.patch | 14 +- .../recipes-core/mm-common/mm-common_1.0.3.bb | 12 - .../recipes-core/mm-common/mm-common_1.0.4.bb | 12 + .../packagegroups/packagegroup-meta-oe.bb | 12 +- ...001-plymouth-Add-the-retain-splash-option.patch | 35 + ...art-service-in-add-related-kernel-paramet.patch | 31 + .../0001-systemd-switch-to-KillMode-mixed.patch | 43 + .../recipes-core/plymouth/plymouth_0.9.5.bb | 3 + .../meta-oe/recipes-crypto/botan/botan_2.18.2.bb | 52 - .../meta-oe/recipes-crypto/botan/botan_2.19.1.bb | 52 + .../fsverity-utils/fsverity-utils_1.4.bb | 31 - .../fsverity-utils/fsverity-utils_1.5.bb | 31 + .../pkcs11-helper/pkcs11-helper_1.28.bb | 4 +- .../recipes-dbs/mysql/mysql-python_1.2.5.bb | 2 +- ...ure.ac-bypass-autoconf-2.69-version-check.patch | 10 +- .../postgresql/files/remove_duplicate.patch | 38 + .../recipes-dbs/postgresql/postgresql_14.1.bb | 12 - .../recipes-dbs/postgresql/postgresql_14.2.bb | 13 + ...ild-when-SIGSTKSZ-is-no-longer-a-constant.patch | 42 - .../meta-oe/recipes-dbs/soci/soci_4.0.2.bb | 44 - .../meta-oe/recipes-dbs/soci/soci_4.0.3.bb | 43 + .../recipes-devtools/breakpad/breakpad_git.bb | 2 +- ...uild-on-32-bit-architectures-using-64-bit.patch | 38 - .../recipes-devtools/capnproto/capnproto_0.8.0.bb | 26 - .../recipes-devtools/capnproto/capnproto_0.9.1.bb | 28 + ...oid-use-of-mips-which-is-reserved-on-mips.patch | 67 - .../meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb | 22 - .../meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb | 19 + .../concurrencykit/concurrencykit_git.bb | 4 +- .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 4 +- .../flatbuffers/flatbuffers_2.0.0.bb | 2 +- ...hangebar-Adjust-structs-for-libgit2-1.4.x.patch | 36 + .../recipes-devtools/geany/geany-plugins_1.38.bb | 1 + .../meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb | 2 +- .../recipes-devtools/libgee/libgee_0.20.4.bb | 22 - .../recipes-devtools/libgee/libgee_0.20.5.bb | 21 + .../0005-add-openssl-legacy-provider-option.patch | 165 +++ .../recipes-devtools/nodejs/nodejs_16.11.1.bb | 1 + .../meta-oe/recipes-devtools/php/php_8.1.0.bb | 275 ---- .../meta-oe/recipes-devtools/php/php_8.1.3.bb | 279 +++++ .../recipes-devtools/protobuf/protobuf_3.19.3.bb | 95 -- .../recipes-devtools/protobuf/protobuf_3.19.4.bb | 95 ++ .../recipes-devtools/pugixml/pugixml_1.11.4.bb | 24 - .../recipes-devtools/pugixml/pugixml_1.12.bb | 24 + .../recipes-devtools/python/python3-apt_2.3.0.bb | 17 + ...upgrade-Remove-distro_info-usage-to-check.patch | 78 ++ .../unattended-upgrades/unattended-upgrades_2.6.bb | 31 + .../recipes-extended/boinc/boinc-client/4563.patch | 36 + .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch | 11 +- .../boinc/boinc-client/gtk-configure.patch | 10 +- .../recipes-extended/boinc/boinc-client_7.16.16.bb | 92 -- .../recipes-extended/boinc/boinc-client_7.18.1.bb | 92 ++ .../recipes-extended/cfengine/cfengine_3.15.0.bb | 2 +- .../recipes-extended/ddrescue/ddrescue_1.25.bb | 44 - .../recipes-extended/ddrescue/ddrescue_1.26.bb | 44 + .../dlt-daemon/dlt-daemon/317.patch | 43 - .../dlt-daemon/dlt-daemon_2.18.7.bb | 67 - .../dlt-daemon/dlt-daemon_2.18.8.bb | 68 + .../recipes-extended/gnuplot/gnuplot_5.4.2.bb | 71 -- .../recipes-extended/gnuplot/gnuplot_5.4.3.bb | 70 ++ .../meta-oe/recipes-extended/iotop/iotop_1.20.bb | 21 - .../meta-oe/recipes-extended/iotop/iotop_1.21.bb | 24 + ...atch-return-type-of-function-LibCecBootlo.patch | 41 + .../recipes-extended/libcec/libcec_6.0.2.bb | 1 + ...e-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch | 59 - .../mailx/files/0001-support-openssl-1.1.x.patch | 72 -- ...-SSL2-support-since-it-is-no-longer-suppo.patch | 41 - ...ntian-warning-warning-macro-N-not-defined.patch | 25 - .../0011-outof-Introduce-expandaddr-flag.patch | 71 -- ...ble-option-processing-for-email-addresses.patch | 79 -- ...c-Unconditionally-require-wordexp-support.patch | 113 -- ...4-globname-Invoke-wordexp-with-WRDE_NOCMD.patch | 31 - .../mailx/files/0015-usr-sbin-sendmail.patch | 38 - .../files/explicitly.disable.krb5.support.patch | 46 - .../meta-oe/recipes-extended/mailx/mailx_12.5-5.bb | 54 - .../openlmi/openlmi-tools_0.10.5.bb | 2 +- .../redis-7/0001-src-Do-not-reset-FINAL_LIBS.patch | 30 + .../0006-Define-correct-gregs-for-RISCV32.patch | 60 + .../redis/redis-7/GNU_SOURCE.patch | 29 + .../hiredis-use-default-CC-if-it-is-set.patch | 36 + .../redis/redis-7/init-redis-server | 40 + ...Makefile-to-use-environment-build-setting.patch | 76 ++ .../redis/redis-7/oe-use-libc-malloc.patch | 34 + .../recipes-extended/redis/redis-7/redis.conf | 1314 ++++++++++++++++++++ .../recipes-extended/redis/redis-7/redis.service | 15 + .../recipes-extended/redis/redis_7.0-rc1.bb | 68 + .../recipes-extended/rsyslog/rsyslog_8.2106.0.bb | 205 --- .../recipes-extended/rsyslog/rsyslog_8.2202.0.bb | 204 +++ .../s-nail/files/make-errors.patch | 45 + .../recipes-extended/s-nail/s-nail_14.9.23.bb | 44 + .../smartmontools/smartmontools_7.2.bb | 2 +- .../recipes-extended/snappy/snappy_1.1.9.bb | 2 +- .../meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.1.bb | 23 + .../recipes-gnome/libjcat/libjcat_0.1.10.bb | 34 + .../meta-oe/recipes-gnome/libjcat/libjcat_0.1.9.bb | 34 - .../meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.6.bb | 20 - .../meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.7.bb | 20 + .../recipes-graphics/cairo/cairomm-1.16_1.16.1.bb | 18 + .../recipes-graphics/cairo/cairomm_1.12.0.bb | 15 - .../recipes-graphics/cairo/cairomm_1.14.3.bb | 16 + .../dnfdragora/dnfdragora_2.1.2.bb | 2 +- .../recipes-graphics/graphviz/graphviz_2.44.1.bb | 16 +- .../libvncserver/libvncserver_0.9.13.bb | 2 +- ...dm.service-remove-plymouth-quit-conflicts.patch | 38 + .../meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 1 + .../openjpeg/openjpeg/CVE-2021-29338.patch | 78 ++ .../recipes-graphics/openjpeg/openjpeg_2.4.0.bb | 1 + .../recipes-graphics/pango/pangomm-2.48_2.50.0.bb | 20 + .../recipes-graphics/pango/pangomm_2.46.1.bb | 19 - .../recipes-graphics/pango/pangomm_2.46.2.bb | 18 + .../tesseract/tesseract-lang_4.1.0.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-mplus_027.bb | 2 +- .../sessreg/0001-Makefile.am-Error-Fix.patch | 2 +- .../libcdio/libcdio-paranoia_10.2+2.0.1.bb | 2 +- .../recipes-multimedia/libcdio/libcdio_2.1.0.bb | 2 +- .../recipes-multimedia/mplayer/mpv_0.34.0.bb | 116 -- .../recipes-multimedia/mplayer/mpv_0.34.1.bb | 115 ++ .../gpsd/gpsd-machine-conf_1.0.bb | 2 +- .../recipes-support/boost-sml/boost-sml_git.bb | 27 + .../recipes-support/freerdp/freerdp_2.4.1.bb | 85 -- .../recipes-support/freerdp/freerdp_2.5.0.bb | 85 ++ .../googlebenchmark/googlebenchmark_1.6.1.bb | 20 + .../meta-oe/recipes-support/hwdata/hwdata_0.347.bb | 21 - .../meta-oe/recipes-support/hwdata/hwdata_0.356.bb | 25 + .../imagemagick/imagemagick_7.0.10.bb | 2 +- ...inotifytools-Include-limit.h-for-PATH_MAX.patch | 29 - .../inotify-tools/inotify-tools_3.21.9.6.bb | 27 - .../inotify-tools/inotify-tools_3.22.1.0.bb | 26 + .../meta-oe/recipes-support/lcms/lcms_2.12.bb | 16 - .../meta-oe/recipes-support/lcms/lcms_2.13.1.bb | 15 + .../libcanberra/libcanberra_0.30.bb | 4 +- ...allDirs-instead-of-hard-wiring-install-di.patch | 37 - .../recipes-support/libcereal/libcereal_1.3.0.bb | 33 - .../recipes-support/libcereal/libcereal_1.3.1.bb | 31 + .../recipes-support/libgusb/libgusb_0.3.10.bb | 14 + .../recipes-support/libgusb/libgusb_0.3.9.bb | 14 - .../meta-oe/recipes-support/libiio/libiio_git.bb | 6 +- .../libjs/libjs-jquery-icheck_1.0.3.bb | 8 +- .../recipes-support/libjs/libjs-jquery_1.7.2.bb | 25 - .../recipes-support/libjs/libjs-jquery_3.3.1.bb | 27 + .../recipes-support/lio-utils/lio-utils_4.1.bb | 2 +- .../meta-oe/recipes-support/monit/monit_5.30.0.bb | 52 - .../meta-oe/recipes-support/monit/monit_5.31.0.bb | 52 + .../meta-oe/recipes-support/nano/nano_6.0.bb | 22 - .../meta-oe/recipes-support/nano/nano_6.2.bb | 22 + .../meta-oe/recipes-support/nss/nss_3.73.1.bb | 284 ----- .../meta-oe/recipes-support/nss/nss_3.74.bb | 284 +++++ ...ne-argument-version-of-SetTotalBytesLimit.patch | 41 - .../opencv/0001-sfm-link-with-Glog_LIBS.patch | 44 - .../meta-oe/recipes-support/opencv/opencv_4.5.2.bb | 237 ---- .../meta-oe/recipes-support/opencv/opencv_4.5.5.bb | 238 ++++ ...include-ldap_pvt_thread.h-before-redefini.patch | 54 + .../recipes-support/openldap/openldap_2.5.9.bb | 8 +- .../recipes-support/pcp/pcp-native_5.3.5.bb | 4 + .../meta-oe/recipes-support/pcp/pcp_5.3.5.bb | 4 + .../recipes-support/pidgin/pidgin_2.14.2.bb | 10 +- .../meta-oe/recipes-support/poco/poco_1.11.0.bb | 2 +- .../recipes-support/poppler/poppler-data_0.4.11.bb | 2 +- .../recipes-support/poppler/poppler_22.01.0.bb | 51 - .../recipes-support/poppler/poppler_22.02.0.bb | 51 + .../recipes-support/remmina/remmina_1.4.18.bb | 46 - .../recipes-support/remmina/remmina_1.4.24.bb | 46 + .../recipes-support/rtc-tools/rtc-tools_2022.02.bb | 14 + .../recipes-support/smarty/smarty_3.1.39.bb | 25 - .../meta-oe/recipes-support/smarty/smarty_4.1.0.bb | 26 + .../0001-Enable-use-of-external-fmt-library.patch | 76 +- .../meta-oe/recipes-support/tree/tree_2.0.1.bb | 20 - .../meta-oe/recipes-support/tree/tree_2.0.2.bb | 20 + .../vboxguestdrivers/vboxguestdrivers_6.1.30.bb | 83 -- .../vboxguestdrivers/vboxguestdrivers_6.1.32.bb | 83 ++ .../websocketpp/websocketpp-0.8.2/1024.patch | 506 ++++++++ .../websocketpp/websocketpp_0.8.2.bb | 1 + .../recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb | 17 - .../recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb | 17 + .../recipes-support/zchunk/zchunk_1.1.16.bb | 22 - .../meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb | 22 + meta-openembedded/meta-perl/conf/layer.conf | 2 +- .../recipes-perl/libcgi/libcgi-perl_4.53.bb | 50 - .../recipes-perl/libcgi/libcgi-perl_4.54.bb | 50 + .../libcrypt/libcrypt-openssl-guess-perl_0.14.bb | 36 - .../libcrypt/libcrypt-openssl-guess-perl_0.15.bb | 36 + .../libio/libio-socket-ssl-perl_2.073.bb | 46 - .../libio/libio-socket-ssl-perl_2.074.bb | 46 + meta-openembedded/meta-python/conf/layer.conf | 2 +- .../packagegroups/packagegroup-meta-python.bb | 6 +- .../recipes-devtools/python/python3-aenum_3.1.6.bb | 14 - .../recipes-devtools/python/python3-aenum_3.1.8.bb | 14 + .../python/python3-alembic_1.7.5.bb | 19 - .../python/python3-alembic_1.7.6.bb | 19 + .../python/python3-ansi2html_1.6.0.bb | 13 - .../python/python3-ansi2html_1.7.0.bb | 25 + .../python/python3-autobahn_21.11.1.bb | 23 - .../python/python3-autobahn_22.1.1.bb | 23 + .../python/python3-bandit_1.7.1.bb | 13 - .../python/python3-bandit_1.7.2.bb | 13 + .../python/python3-bitarray_2.3.5.bb | 10 - .../python/python3-bitarray_2.3.7.bb | 10 + ...001-use-pytest-instead-of-deprecated-nose.patch | 36 + .../recipes-devtools/python/python3-blinker_1.4.bb | 2 +- .../recipes-devtools/python/python3-click_8.0.3.bb | 41 - .../recipes-devtools/python/python3-click_8.0.4.bb | 41 + .../recipes-devtools/python/python3-cmd2_2.3.3.bb | 23 - .../recipes-devtools/python/python3-cmd2_2.4.0.bb | 23 + .../python/python3-coverage_6.2.bb | 12 - .../python/python3-coverage_6.3.2.bb | 16 + .../python/python3-croniter_1.2.0.bb | 12 - .../python/python3-croniter_1.3.4.bb | 12 + .../python/python3-distro_1.6.0.bb | 12 - .../python/python3-distro_1.7.0.bb | 19 + .../python/python3-dt-schema_git.bb | 15 - .../python/python3-fasteners_0.17.2.bb | 18 - .../python/python3-fasteners_0.17.3.bb | 18 + .../recipes-devtools/python/python3-flask_2.0.2.bb | 23 - .../recipes-devtools/python/python3-flask_2.0.3.bb | 23 + .../python/python3-humanize_3.13.1.bb | 21 - .../python/python3-humanize_3.14.0.bb | 21 + .../python/python3-imageio_2.14.0.bb | 12 - .../python/python3-imageio_2.16.0.bb | 12 + .../python/python3-itsdangerous_2.0.1.bb | 17 - .../python/python3-itsdangerous_2.1.0.bb | 17 + .../python/python3-jdatetime_3.8.1.bb | 17 - .../python/python3-jdatetime_4.0.0.bb | 17 + .../python/python3-jsonpath-rw_1.4.0.bb | 5 +- .../python/python3-langtable_0.0.56.bb | 23 - .../python/python3-langtable_0.0.57.bb | 23 + .../python/python3-multidict_5.2.0.bb | 24 - .../python/python3-multidict_6.0.2.bb | 24 + .../python/python3-natsort_8.0.2.bb | 11 - .../python/python3-natsort_8.1.0.bb | 11 + .../python/python3-oauthlib_3.1.1.bb | 22 - .../python/python3-oauthlib_3.2.0.bb | 22 + .../python/python3-ordered-set/run-ptest | 2 +- .../python/python3-ordered-set_4.0.2.bb | 23 - .../python/python3-ordered-set_4.1.0.bb | 22 + .../python/python3-pandas_1.3.5.bb | 26 - .../python/python3-pandas_1.4.1.bb | 26 + .../0001-fix-failure-test-cases.patch | 197 +++ .../python/python3-psutil_5.9.0.bb | 2 + .../python/python3-pulsectl_21.10.5.bb | 13 - .../python/python3-pulsectl_22.1.3.bb | 13 + .../python/python3-pyopenssl_21.0.0.bb | 23 - .../python/python3-pyopenssl_22.0.0.bb | 23 + ...-mips-targets-for-stat.st_dev-definitions.patch | 45 + ...01-riscv64-mod.rs-Add-missing-error-codes.patch | 32 + .../python/python3-pyruvate_1.1.2.bb | 3 + .../python/python3-pytest-forked_1.4.0.bb | 15 + .../python/python3-pytest-timeout_2.0.2.bb | 12 - .../python/python3-pytest-timeout_2.1.0.bb | 12 + .../python/python3-pytest-xdist_2.5.0.bb | 17 + .../python/python3-pyudev_0.22.0.bb | 24 - .../python/python3-pyudev_0.23.2.bb | 24 + .../recipes-devtools/python/python3-redis_4.0.2.bb | 14 - .../recipes-devtools/python/python3-redis_4.1.1.bb | 15 + .../python/python3-requests-oauthlib_1.3.0.bb | 9 - .../python/python3-requests-oauthlib_1.3.1.bb | 8 + .../python/python3-sqlalchemy_1.4.29.bb | 23 - .../python/python3-sqlalchemy_1.4.31.bb | 23 + .../python/python3-test-generator/run-ptest | 3 - .../python/python3-test-generator_0.1.2.bb | 29 - .../python/python3-twisted_21.7.0.bb | 324 ----- .../python/python3-twisted_22.1.0.bb | 324 +++++ .../python/python3-unidiff_0.7.0.bb | 26 - .../python/python3-unidiff_0.7.3.bb | 26 + .../python/python3-werkzeug_2.0.2.bb | 39 - .../python/python3-werkzeug_2.0.3.bb | 39 + .../python/python3-wheel_0.37.1.bb | 12 - .../python-pyephem/python3-pyephem_4.1.1.bb | 16 - .../python-pyephem/python3-pyephem_4.1.3.bb | 16 + .../pywbemtools/python3-pywbemtools_0.9.0.bb | 39 - .../pywbemtools/python3-pywbemtools_0.9.1.bb | 39 + meta-openembedded/meta-webserver/conf/layer.conf | 2 +- .../recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb | 41 - .../recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb | 40 + .../recipes-webadmin/netdata/netdata_1.32.1.bb | 76 -- .../recipes-webadmin/netdata/netdata_1.33.1.bb | 80 ++ meta-openembedded/meta-xfce/conf/layer.conf | 2 +- .../files/0001-Fix-build-with-meson-0.61.patch | 26 + .../xfce4-datetime-setter_3.32.2.bb | 1 + .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb | 1 + .../libxfce4util/libxfce4util_4.16.0.bb | 2 +- .../recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb | 4 +- .../meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb | 2 +- 446 files changed, 10491 insertions(+), 8832 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.0.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.32.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb create mode 100644 meta-openembedded/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_1.12.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-for-fmt-8.0.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark/0001-tracers-Fix-buffer-overflow.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.45.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.09.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/fping/fping_5.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/fping/fping_5.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-open-vm-tools-Correct-include-path-for-poll.h.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_38.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-16275.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-5061.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-30004.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.21.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch create mode 100644 meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch create mode 100644 meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.19.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.19.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.19.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.11.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/unattended-upgrades/files/0001-unattended-upgrade-Remove-distro_info-usage-to-check.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/4563.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.26.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.20.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.21.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/0001-src-Do-not-reset-FINAL_LIBS.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/0006-Define-correct-gregs-for-RISCV32.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/hiredis-use-default-CC-if-it-is-set.patch create mode 100755 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/init-redis-server create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/lua-update-Makefile-to-use-environment-build-setting.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/oe-use-libc-malloc.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/redis.conf create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis-7/redis.service create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0-rc1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2202.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/s-nail/files/make-errors.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.23.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.16.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm_1.12.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-systemd-lxdm.service-remove-plymouth-quit-conflicts.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2021-29338.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/pango/pangomm-2.48_2.50.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.46.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/boost-sml/boost-sml_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.6.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.356.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.13.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.30.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.31.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_6.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_6.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.73.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.74.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-librewrite-include-ldap_pvt_thread.h-before-redefini.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.01.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.02.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.24.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/smarty/smarty_4.1.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/tree/tree_2.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/tree/tree_2.0.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.30.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.32.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.53.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.54.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.14.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.073.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.074.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.7.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.7.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_21.11.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.3.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.3.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-blinker/0001-use-pytest-instead-of-deprecated-nose.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.3.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.3.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dt-schema_git.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.17.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.17.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.13.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.14.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.14.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.16.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_3.8.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.56.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.57.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_8.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_8.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_4.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.3.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.10.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_22.1.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_21.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_22.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate/0001-check-for-mips-targets-for-stat.st_dev-definitions.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.22.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.29.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_21.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.37.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.0.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb create mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb create mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch (limited to 'meta-openembedded') diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf index 6a9357d2a9..b5f59d9bac 100644 --- a/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/meta-openembedded/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_filesystems-layer = "honister" +LAYERSERIES_COMPAT_filesystems-layer = "kirkstone" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.0.bb deleted file mode 100644 index c90a7ecc2b..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "FAT filesystems explore, extract, repair, and forensic tool" -DESCRIPTION = "This tool is designed to manipulate FAT filesystems, in order to \ -explore, extract, repair, recover and forensic them. It currently supports \ -FAT12, FAT16 and FAT32." -HOMEPAGE = "https://github.com/Gregwar/fatcat" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=57fbbfebd0dd1d6ff21b8cecb552a03f" - -SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https \ - file://0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch \ - " - -SRCREV = "b923172d97c578297964c062e3a92799e2a9eca4" - -S = "${WORKDIR}/git" - -inherit cmake diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb new file mode 100644 index 0000000000..e344eda154 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "FAT filesystems explore, extract, repair, and forensic tool" +DESCRIPTION = "This tool is designed to manipulate FAT filesystems, in order to \ +explore, extract, repair, recover and forensic them. It currently supports \ +FAT12, FAT16 and FAT32." +HOMEPAGE = "https://github.com/Gregwar/fatcat" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=57fbbfebd0dd1d6ff21b8cecb552a03f" + +SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https \ + file://0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch \ + " + +SRCREV = "99cb99fc86eb1601ac7ae27f5bba23add04d2543" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb new file mode 100644 index 0000000000..3b80fb5b0c --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb @@ -0,0 +1,38 @@ +SUMMARY = "XFS Filesystem Dump Utility" +DESCRIPTION = "The xfsdump package contains xfsdump, xfsrestore and a \ + number of other utilities for administering XFS filesystems.\ + xfsdump examines files in a filesystem, determines which \ + need to be backed up, and copies those files to a \ + specified disk, tape or other storage medium." +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc" +DEPENDS = "xfsprogs attr" + +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ + file://remove-install-as-user.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ + " +SRC_URI[sha256sum] = "9aab7a53aa05cd46edc97269ebf1456aab2b60ab8c1fffaaf8aa492f0b5f6517" + +inherit autotools-brokensep + +PARALLEL_MAKE = "" +PACKAGECONFIG ??= "" +PACKAGECONFIG[gettext] = "--enable-gettext=yes,--enable-gettext=no,gettext" + +CFLAGS += "-D_FILE_OFFSET_BITS=64" + +do_configure () { + export DEBUG="-DNDEBUG" + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} + +do_install () { + export DIST_ROOT=${D} + oe_runmake install + oe_runmake install-dev +} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb deleted file mode 100644 index 3b06730b70..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.9.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "XFS Filesystem Dump Utility" -DESCRIPTION = "The xfsdump package contains xfsdump, xfsrestore and a \ - number of other utilities for administering XFS filesystems.\ - xfsdump examines files in a filesystem, determines which \ - need to be backed up, and copies those files to a \ - specified disk, tape or other storage medium." -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc" -DEPENDS = "xfsprogs attr" - -SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ - file://remove-install-as-user.patch \ - ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ - " -SRC_URI[md5sum] = "086f7582875b14c17522867ffe3e202b" -SRC_URI[sha256sum] = "55aeede6232ddce6c9e79e2af88d6f808534df1552eb2bfaf7fb85b92add6dd1" - -inherit autotools-brokensep - -PARALLEL_MAKE = "" -PACKAGECONFIG ??= "" -PACKAGECONFIG[gettext] = "--enable-gettext=yes,--enable-gettext=no,gettext" - -CFLAGS += "-D_FILE_OFFSET_BITS=64" - -do_configure () { - export DEBUG="-DNDEBUG" - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} - -do_install () { - export DIST_ROOT=${D} - oe_runmake install - oe_runmake install-dev -} diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf index d2ee3e0692..3f6b4f7b76 100644 --- a/meta-openembedded/meta-gnome/conf/layer.conf +++ b/meta-openembedded/meta-gnome/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_gnome-layer = "honister" +LAYERSERIES_COMPAT_gnome-layer = "kirkstone" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ faenza-icon-theme->gdk-pixbuf \ diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb b/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb index 3e57fbb0d1..c3c30ca467 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb @@ -3,27 +3,26 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = " \ - dbus-glib \ glib-2.0 \ libgee \ - libxml2 \ - python3-dbusmock-native \ " GNOMEBASEBUILDCLASS = "meson" +EXTRA_OEMESON += "-Dtests=false" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" GIR_MESON_OPTION = "" PACKAGECONFIG[eds] = "-Deds_backend=true,-Deds_backend=false,evolution-data-server" -PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false" -PACKAGECONFIG[ofono] = "-Dofono_backend=true,-Dofono_backend=false" -PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib" +PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false,evolution-data-server" +PACKAGECONFIG[ofono] = "-Deds_backend=true -Dofono_backend=true,-Dofono_backend=false,evolution-data-server" +PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib dbus-glib" +PACKAGECONFIG[import_tool] = "-Dimport_tool=true,-Dimport_tool=false,libxml2" +PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false" PACKAGECONFIG ??= "" inherit pkgconfig gnomebase gettext gobject-introspection vala features_check SRC_URI[archive.sha256sum] = "e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f" - diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb new file mode 100644 index 0000000000..b3b4311320 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb @@ -0,0 +1,54 @@ +SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop." +SECTION = "network" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2" + +DEPENDS = " \ + appstream-glib \ + cairo \ + enchant2 \ + evolution-data-server \ + folks \ + gcr \ + gmime \ + gnome-online-accounts \ + gsound \ + gspell \ + gtk+3 \ + icu \ + iso-codes \ + json-glib \ + libhandy \ + libical \ + libpeas \ + libsecret \ + libstemmer \ + libxml2 \ + sqlite3 \ + webkitgtk \ +" + +RDEPENDS:${PN} = "gnome-keyring" + +inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala + +SRC_URI = " \ + git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ +" + +S = "${WORKDIR}/git" +SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382" + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +GIR_MESON_OPTION = "" +EXTRA_OEMESON = "-Dprofile=release" + +PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" +PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" +PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" + +PACKAGECONFIG ??= "" + +FILES:${PN} += "${datadir}" + diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.32.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.32.bb deleted file mode 100644 index 747c67b030..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.32.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "NetworkManager GUI library" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "glib-2.0 gtk+3 networkmanager" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gtk-doc gettext vala features_check - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.sha256sum] = "0a57b93a2fad43acc763f320dd3a7a93c429b0e3118dfa549d67824cddc4e905" - -PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" -PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" -PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" -PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" - -# go introspection is not supported for mipsn32/riscv32, but vapi needs it -# -EXTRA_OEMESON:append:mipsarchn32 = " -Dvapi=false" -EXTRA_OEMESON:append:riscv32 = " -Dvapi=false" -EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false" - -GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb new file mode 100644 index 0000000000..311492eea3 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb @@ -0,0 +1,26 @@ +SUMMARY = "NetworkManager GUI library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0 gtk+3 networkmanager" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gobject-introspection gtk-doc gettext vala features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304" + +PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" +PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" +PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" +PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" + +# go introspection is not supported for mipsn32/riscv32, but vapi needs it +# +EXTRA_OEMESON:append:mipsarchn32 = " -Dvapi=false" +EXTRA_OEMESON:append:riscv32 = " -Dvapi=false" +EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch b/meta-openembedded/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch new file mode 100644 index 0000000000..1b0d24024b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch @@ -0,0 +1,33 @@ +From 9af84e1c08a2159c10baf13244e2c8a7d7e837e9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 27 Jan 2022 23:02:20 -0800 +Subject: [PATCH] Do not use NULL where boolean is expected + +Fixes +src/GParted_Core.cc:73:57: error: static_cast from 'nullptr_t' to 'PedPartitionFlag' (aka '_PedPartitionFlag') is not allowed +| for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( NULL ) ) ; +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/GParted_Core.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc +index f7ac970..3290c66 100644 +--- a/src/GParted_Core.cc ++++ b/src/GParted_Core.cc +@@ -70,7 +70,7 @@ GParted_Core::GParted_Core() + ped_exception_set_handler( ped_exception_handler ) ; + + //get valid flags ... +- for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( NULL ) ) ; ++ for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( false ) ) ; + flag ; + flag = ped_partition_flag_next( flag ) ) + flags .push_back( flag ) ; +-- +2.35.0 + diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb index 1c8dd69686..355bcce9b6 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb @@ -10,6 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ + file://0001-Do-not-use-NULL-where-boolean-is-expected.patch \ " SRC_URI[sha256sum] = "5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb index a74e240ff6..5081583d63 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb @@ -51,8 +51,10 @@ EXTRA_OECONF = "--disable-python \ --disable-check-update \ --without-wmf" +EXTRA_OECONF:append:toolchain-clang:arm = " --disable-vector-icons" EXTRA_OECONF:append:toolchain-clang:riscv32 = " --disable-vector-icons" EXTRA_OECONF:append:toolchain-clang:mips = " --disable-vector-icons" +EXTRA_OECONF:append:toolchain-clang:x86 = " --disable-vector-icons" do_configure:append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb deleted file mode 100644 index 8372448432..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" -HOMEPAGE = "http://www.gusnan.se/devilspie2" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ - file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "gtk+ glib-2.0 libwnck libxinerama lua virtual/libx11" - -PV .= "+git${SRCPV}" - -SRCREV = "a3ee65b815a0247a0dbdaa39353444cef6f93499" - -SRC_URI = "git://github.com/dsalt/devilspie2;branch=master;protocol=https \ - file://default.lua \ - file://devilspie2.desktop \ -" - -S = "${WORKDIR}/git" - -inherit features_check pkgconfig gettext - -REQUIRED_DISTRO_FEATURES = "x11" - -do_compile() { - export GTK2=1 - oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" -} - -do_install() { - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install - install -d ${D}/${sysconfdir}/devilspie2 - install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 - install -d ${D}/${sysconfdir}/xdg/autostart - install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb new file mode 100644 index 0000000000..8e048170bc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" +HOMEPAGE = "http://www.gusnan.se/devilspie2" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ + file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "gtk+ glib-2.0 libwnck libxinerama lua virtual/libx11" + +PV .= "+git${SRCPV}" + +SRCREV = "b9d7ad9c09a5fb17a1562ee1d892798c646e9ec9" + +SRC_URI = "git://github.com/dsalt/devilspie2;branch=master;protocol=https \ + file://default.lua \ + file://devilspie2.desktop \ +" + +S = "${WORKDIR}/git" + +inherit features_check pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +do_compile() { + export GTK2=1 + oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" +} + +do_install() { + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install + install -d ${D}/${sysconfdir}/devilspie2 + install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 + install -d ${D}/${sysconfdir}/xdg/autostart + install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 9ccaedbcce..59856f3ab7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -20,6 +20,7 @@ SRC_URI += " \ LKSTRFTIME = "HAVE_LKSTRFTIME=ON" LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF" +GI_DATA_ENABLED="False" EXTRA_OECMAKE = " \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \ @@ -27,14 +28,15 @@ EXTRA_OECMAKE = " \ -DENABLE_UOA=OFF \ -DENABLE_GOOGLE_AUTH=OFF \ -DENABLE_WEATHER=OFF \ - -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper \ - -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper \ -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ -D${LKSTRFTIME} \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " +EXTRA_OECMAKE:append:class-target = " -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" +EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" + PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib" PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch deleted file mode 100644 index 66df3c269d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ea9a15afb76c093aea37f6c56c559b61afd9a9f2 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Wed, 15 Dec 2021 07:02:09 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -The positional argument has been silently ignored for a time. And it causes failure -with "ERROR: Function does not take positional arguments" since meson 0.60.0 - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124] -Signed-off-by: Alexander Kanavin ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bb61387..28d72a1 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -4,7 +4,6 @@ install_man('gedit.1') - - appdata = 'org.gnome.gedit.appdata.xml' - appdata_file = i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: '../po/', -@@ -23,7 +22,6 @@ endif - - desktop_file = 'org.gnome.gedit.desktop' - desktop_output_file = i18n.merge_file( -- desktop_file, - type: 'desktop', - input: desktop_file + '.in', - output: desktop_file, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb deleted file mode 100644 index df8ab620c7..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - gdk-pixbuf-native \ - gtk+3 \ - gsettings-desktop-schemas \ - libpeas \ - libsoup-2.4 \ - gspell \ - gtksourceview4 \ - tepl \ -" - -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGES += "${PN}-python" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" - -FILES:${PN}-python += " \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" -RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb new file mode 100644 index 0000000000..8c11fb52e0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + libpeas \ + libsoup-2.4 \ + gspell \ + gtksourceview4 \ + tepl \ +" + +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGES += "${PN}-python" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES:${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" +RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb deleted file mode 100644 index af4d7f6cac..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Javascript bindings for GNOME" -LICENSE = "MIT & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = "mozjs-78 gtk4" - -inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig - -SRC_URI[archive.sha256sum] = "4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b043a5ffb01861c5f" -SRC_URI += " \ - file://0001-Support-cross-builds-a-bit-better.patch \ - file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ -" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" - -EXTRA_OEMESON = " \ - -Dinstalled_tests=false \ - -Dskip_dbus_tests=true \ -" - -LDFLAGS:append:mipsarch = " -latomic" -LDFLAGS:append:powerpc = " -latomic" -LDFLAGS:append:powerpc64 = " -latomic" -LDFLAGS:append:riscv32 = " -latomic" - -FILES:${PN} += "${datadir}/gjs-1.0/lsan" - -PACKAGES =+ "${PN}-valgrind" -FILES:${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" -RDEPENDS:${PN}-valgrind += "valgrind" - -# Valgrind not yet available on rv32/rv64 -RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind" -RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb new file mode 100644 index 0000000000..90ea140448 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Javascript bindings for GNOME" +LICENSE = "MIT & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = "mozjs-78 gtk4" + +inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig + +SRC_URI[archive.sha256sum] = "bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f" +SRC_URI += " \ + file://0001-Support-cross-builds-a-bit-better.patch \ + file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ +" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +EXTRA_OEMESON = " \ + -Dinstalled_tests=false \ + -Dskip_dbus_tests=true \ +" + +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:powerpc64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" + +FILES:${PN} += "${datadir}/gjs-1.0/lsan" + +PACKAGES =+ "${PN}-valgrind" +FILES:${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" +RDEPENDS:${PN}-valgrind += "valgrind" + +# Valgrind not yet available on rv32/rv64 +RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind" +RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.2.bb deleted file mode 100644 index 24e7760fa8..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "GNOME archive library" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - gtk+3 \ - libarchive \ -" - -GNOMEBASEBUILDCLASS = "meson" -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = "gtk_doc" - -inherit gnomebase gobject-introspection gtk-doc vala - -SRC_URI[archive.sha256sum] = "1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3" - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb new file mode 100644 index 0000000000..0015e9f05b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb @@ -0,0 +1,21 @@ +SUMMARY = "GNOME archive library" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + gtk+3 \ + libarchive \ +" + +GNOMEBASEBUILDCLASS = "meson" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc vala + +SRC_URI[archive.sha256sum] = "7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88" + +do_compile:prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch new file mode 100644 index 0000000000..a6e3523743 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch @@ -0,0 +1,34 @@ +Upstream-Status: Backport + +Fixes "../gvfs-1.49.1/daemon/meson.build:362:7: ERROR: Function does not take positional arguments. + +Signed-off-by: Markus Volk f_l_k@t-online.de + +From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index 5f9559aa..e20ada29 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -360,7 +360,6 @@ if enable_admin + policy = gvfs_namespace + '.file-operations.policy' + + i18n.merge_file( +- policy, + input: configure_file( + input: policy + '.in.in', + output: '@BASENAME@', +-- + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb deleted file mode 100644 index 18abac29cc..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb +++ /dev/null @@ -1,88 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd - -DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ - gsettings-desktop-schemas dbus" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" - -SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.sha256sum] = "b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2" - -# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OEMESON = " \ - -Dbluray=false \ - -Dgoa=false \ - -Dgoogle=false \ - -Dnfs=false \ -" - -PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" - -FILES:${PN} += " \ - ${datadir}/glib-2.0 \ - ${datadir}/GConf \ - ${datadir}/dbus-1/services \ - ${libdir}/gio/modules/*.so \ - ${libdir}/tmpfiles.d \ - ${systemd_user_unitdir} \ -" - -FILES:${PN}-dbg += "${libdir}/gio/modules/.debug/*" -FILES:${PN}-dev += "${libdir}/gio/modules/*.la" - -FILES:gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" -FILES:gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" -FILES:gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" - -RRECOMMENDS:gvfsd-ftp += "openssh-sftp openssh-ssh" - -PACKAGECONFIG ?= "libgphoto2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ - " - -PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" -PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" -PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" -PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" -PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" -PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" -PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" -PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" -PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" -PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" -PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" - -# needs meta-filesystems -PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3" - -# libcdio-paranoia recipe doesn't exist yet -PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" - -do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d - fi - - # After rebuilds (not from scracth) it can happen that the executables in - # libexec ar missing executable permission flag. Not sure but it came up - # during transition to meson. Looked into build files and logs but could - # not find suspicious - for exe in `find ${D}/${libexecdir}`; do - chmod +x $exe - done -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb new file mode 100644 index 0000000000..c73716d749 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb @@ -0,0 +1,92 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd + +DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ + gsettings-desktop-schemas dbus" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" + +SRC_URI = " \ + https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive \ + file://Remove-incorrect-i18n.merge_file-argument.patch \ +" + +SRC_URI[archive.sha256sum] = "b0d1dda4e475066207305b0776b0daefeae790f6c0107ffd2687994c8e71915a" + +# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMESON = " \ + -Dbluray=false \ + -Dgoa=false \ + -Dgoogle=false \ + -Dnfs=false \ +" + +PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" + +FILES:${PN} += " \ + ${datadir}/glib-2.0 \ + ${datadir}/GConf \ + ${datadir}/dbus-1/services \ + ${libdir}/gio/modules/*.so \ + ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ +" + +FILES:${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES:${PN}-dev += "${libdir}/gio/modules/*.la" + +FILES:gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" +FILES:gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" +FILES:gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" + +RRECOMMENDS:gvfsd-ftp += "openssh-sftp openssh-ssh" + +PACKAGECONFIG ?= "libgphoto2 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ + " + +PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" +PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" +PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" +PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" +PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" +PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" +PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" +PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" +PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" +PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" + +# needs meta-filesystems +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3" + +# libcdio-paranoia recipe doesn't exist yet +PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi + + # After rebuilds (not from scracth) it can happen that the executables in + # libexec ar missing executable permission flag. Not sure but it came up + # during transition to meson. Looked into build files and logs but could + # not find suspicious + for exe in `find ${D}/${libexecdir}`; do + chmod +x $exe + done +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb deleted file mode 100644 index bfb52e5bbf..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "libwnck" - -SECTION = "x11/libs" -DEPENDS = "intltool-native gnome-common-native gtk+3 gdk-pixbuf-native libxres" - -PACKAGECONFIG ??= "startup-notification" -PACKAGECONFIG[startup-notification] = "-Dstartup_notification=enabled,-Dstartup_notification=disabled,startup-notification" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -inherit gnomebase gobject-introspection gtk-doc gettext features_check - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI[archive.sha256sum] = "30cb79a839f90cd66f3e202f3f98cb5166fa0cd9b92eb571ad9c470a43021d83" - -# libxres means x11 only -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb new file mode 100644 index 0000000000..6c9e631e11 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Window navigation construction toolkit" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +BPN = "libwnck" + +SECTION = "x11/libs" +DEPENDS = "intltool-native gnome-common-native gtk+3 gdk-pixbuf-native libxres" + +PACKAGECONFIG ??= "startup-notification" +PACKAGECONFIG[startup-notification] = "-Dstartup_notification=enabled,-Dstartup_notification=disabled,startup-notification" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +inherit gnomebase gobject-introspection gtk-doc gettext features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611" + +# libxres means x11 only +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb deleted file mode 100644 index 330c361806..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "File manager for GNOME" -SECTION = "x11/gnome" - -LICENSE="GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - fontconfig \ - gtk+3 \ - gnome-desktop \ - gsettings-desktop-schemas \ - gnome-autoar \ - tracker \ - libhandy \ - libportal \ -" - -inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI += "file://liportal-0.5-fix.patch" -SRC_URI[archive.sha256sum] = "3e633098853711a3e96b12fe9228b3201816e554b2823f161e7d901a8880582f" - -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OEMESON += " \ - -Dtests=none \ -" - -PACKAGECONFIG = "extensions" -PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ - ${datadir}/tracker3 \ -" - -# mandatory - not checked during configuration: -# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed -RDEPENDS:${PN} += "tracker-miners" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb new file mode 100644 index 0000000000..e9541a7150 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb @@ -0,0 +1,46 @@ +SUMMARY = "File manager for GNOME" +SECTION = "x11/gnome" + +LICENSE="GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + fontconfig \ + gtk+3 \ + gnome-desktop \ + gsettings-desktop-schemas \ + gnome-autoar \ + tracker \ + libhandy \ + libportal \ +" + +inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI += "file://liportal-0.5-fix.patch" +SRC_URI[archive.sha256sum] = "872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b" + +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMESON += " \ + -Dtests=none \ +" + +PACKAGECONFIG = "extensions" +PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ + ${datadir}/tracker3 \ +" + +# mandatory - not checked during configuration: +# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed +RDEPENDS:${PN} += "tracker-miners" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb index a9c96a53d7..44b3671122 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb @@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" GIR_MESON_OPTION = "" PACKAGECONFIG ??= " \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg", "", d)} \ gexiv2 \ gstreamer \ icu \ diff --git a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_1.12.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_1.12.bb deleted file mode 100644 index d35bbaacbf..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_1.12.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A tablet description library" -DESCRIPTION = "libwacom is a library to identify Wacom tablets and their model-specific features. \ - It provides easy access to information such as 'is this a built-in on-screen tablet\', \ - 'what is the size of this model', etc." -HOMEPAGE = "https://github.com/linuxwacom/libwacom" -BUGTRACKER = "https://github.com/linuxwacom/libwacom/issues" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" - -SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" -SRCREV = "942628be9faffa96ae1068833eccb00a1bfe4578" - -DEPENDS = " \ - libxml2-native \ - libgudev \ -" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig - -EXTRA_OEMESON = " \ - -Dtests=disabled \ -" diff --git a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb new file mode 100644 index 0000000000..226446dcbb --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "A tablet description library" +DESCRIPTION = "libwacom is a library to identify Wacom tablets and their model-specific features. \ + It provides easy access to information such as 'is this a built-in on-screen tablet\', \ + 'what is the size of this model', etc." +HOMEPAGE = "https://github.com/linuxwacom/libwacom" +BUGTRACKER = "https://github.com/linuxwacom/libwacom/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" + +SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" +SRCREV = "0f263ce26edc47587d5f7604e44fad1b61240c3d" + +DEPENDS = " \ + libxml2-native \ + libgudev \ +" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index d003e23b8d..481dd727d0 100644 --- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -10,6 +10,7 @@ RDEPENDS:${PN} = " \ evolution-data-server \ evince \ file-roller \ + geary \ gedit \ ghex \ gnome-calculator \ diff --git a/meta-openembedded/meta-initramfs/conf/layer.conf b/meta-openembedded/meta-initramfs/conf/layer.conf index 11dd43178e..33e61d333f 100644 --- a/meta-openembedded/meta-initramfs/conf/layer.conf +++ b/meta-openembedded/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "8" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "honister" +LAYERSERIES_COMPAT_meta-initramfs = "kirkstone" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb index 91514b8409..3eee6669a3 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb @@ -67,4 +67,4 @@ RRECOMMENDS:${PN} = " \ " # CVE-2010-4176 affects only Fedora -CVE_CHECK_WHITELIST += "CVE-2010-4176" +CVE_CHECK_IGNORE += "CVE-2010-4176" diff --git a/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf index 56c3569d00..1fe9c80330 100644 --- a/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/meta-openembedded/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "honister" +LAYERSERIES_COMPAT_multimedia-layer = "kirkstone" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb index c08ab11b24..9633cab530 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb @@ -64,8 +64,8 @@ python populate_packages:prepend () { postinst = d.getVar('plugin_postinst') pkgs = [] - pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), 'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), '(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), r'(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) metapkg = d.getVar('PN') + '-meta' d.setVar('RDEPENDS:' + metapkg, ' '.join(pkgs)) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb index adaa552ed8..3cf0ca4eb8 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb @@ -91,10 +91,10 @@ FILES:dvb-zap-data = "${docdir}/dvb-apps/szap" python populate_packages:prepend () { dvb_libdir = bb.data.expand('${libdir}', d) - do_split_packages(d, dvb_libdir, '^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True) - do_split_packages(d, dvb_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') - do_split_packages(d, dvb_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') - do_split_packages(d, dvb_libdir, '^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True) + do_split_packages(d, dvb_libdir, r'^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True) + do_split_packages(d, dvb_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') + do_split_packages(d, dvb_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') + do_split_packages(d, dvb_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True) } INSANE_SKIP:${PN} = "ldflags" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-for-fmt-8.0.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-for-fmt-8.0.patch new file mode 100644 index 0000000000..efd8dc066c --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-for-fmt-8.0.patch @@ -0,0 +1,46 @@ +From 22b3a91473d548456a0823f9f170db0d7db5a444 Mon Sep 17 00:00:00 2001 +From: kyak +Date: Wed, 12 Jan 2022 19:41:37 +0300 +Subject: [PATCH] Fix for fmt > 8.0 + +Upstream-Status: Backport [https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] +Signed-off-by: Khem Raj +--- + src/util/logger.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/util/logger.h b/src/util/logger.h +index 8a8f0b1f..0a512bff 100644 +--- a/src/util/logger.h ++++ b/src/util/logger.h +@@ -32,7 +32,9 @@ + #ifndef __LOGGER_H__ + #define __LOGGER_H__ + ++#include + #include ++#include + + #define log_debug SPDLOG_DEBUG + #define log_info SPDLOG_INFO +@@ -40,4 +42,17 @@ + #define log_error SPDLOG_ERROR + #define log_js SPDLOG_INFO + ++#if FMT_VERSION >= 80100 ++template ++struct fmt::formatter, char>> ++ : formatter> { ++ template ++ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) ++ { ++ return fmt::formatter>::format( ++ static_cast>(value), ctx); ++ } ++}; ++#endif ++ + #endif // __LOGGER_H__ +-- +2.35.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch deleted file mode 100644 index f3197f937b..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-include-optional-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5719ed8ce9ba60beb9c1670b49296b1c66430dc2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 2 Mar 2021 12:57:37 -0800 -Subject: [PATCH] include header - -Fixes build with gcc11 -/src/util/tools.h:165:6: error: 'optional' in na -mespace 'std' does not name a template type -| 165 | std::optional> readBinaryFile(const fs::path& path); -| | ^~~~~~~~ - -Upstream-Status: Submitted [https://github.com/gerbera/gerbera/pull/1273] -Signed-off-by: Khem Raj ---- - src/util/tools.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/util/tools.h b/src/util/tools.h -index 3a4064e9..e5142966 100644 ---- a/src/util/tools.h -+++ b/src/util/tools.h -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - namespace fs = std::filesystem; - --- -2.30.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb deleted file mode 100644 index ec5548ab6c..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.7.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -Description = "Gerbera - An UPnP media server" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" - -SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \ - file://0001-include-optional-header.patch \ - " - -SRCREV = "7bc33b98994411e1748d3b3fa9a8424c49e236d6" - -S = "${WORKDIR}/git" - -DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fsprogs sqlite3 libnsl2" - -SYSTEMD_SERVICE:${PN} = "gerbera.service" - -inherit cmake pkgconfig systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" -PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" -EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid" - -do_install:append() { - install -d ${D}/root/.config/ -} - -FILES:${PN} += "/root/.config/" - -SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb new file mode 100644 index 0000000000..7e6ae97983 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb @@ -0,0 +1,31 @@ +Description = "Gerbera - An UPnP media server" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" + +SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \ + file://0001-Fix-for-fmt-8.0.patch \ + " + +SRCREV = "3b93d362ec33f738868a4e896a2c9ee8e9d7a92a" + +S = "${WORKDIR}/git" + +DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fsprogs sqlite3 libnsl2" + +SYSTEMD_SERVICE:${PN} = "gerbera.service" + +inherit cmake pkgconfig systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" +PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" +EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid" + +do_install:append() { + install -d ${D}/root/.config/ +} + +FILES:${PN} += "/root/.config/" + +SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark/0001-tracers-Fix-buffer-overflow.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark/0001-tracers-Fix-buffer-overflow.patch new file mode 100644 index 0000000000..1d85e51d6b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark/0001-tracers-Fix-buffer-overflow.patch @@ -0,0 +1,33 @@ +From d84807ec6d6f8511e4ec939a745d4d7bb35c3cfb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 4 Feb 2022 09:22:48 -0800 +Subject: [PATCH] tracers: Fix buffer overflow + +Fixes +| ../../../git/plugins/tracers/gstcpuusagecompute.c:106:9: error: 'fscanf' may overflow; destination buffer in argument 3 has size 8, but the corresponding specifier may require size 9 [-Werror,-Wfortify-sour +ce] +| cpu_name, &user[0], &nice[0], &system[0], &idle[0], &iowait, &irq, +| ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + plugins/tracers/gstcpuusagecompute.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/tracers/gstcpuusagecompute.c b/plugins/tracers/gstcpuusagecompute.c +index 39255fb..00bae66 100644 +--- a/plugins/tracers/gstcpuusagecompute.c ++++ b/plugins/tracers/gstcpuusagecompute.c +@@ -69,7 +69,7 @@ gst_cpu_usage_compute (GstCPUUsage * cpu_usage) + gint *idle; + gint *idle_aux; + +- gchar cpu_name[CPU_NAME_MAX_SIZE]; ++ gchar cpu_name[CPU_NAME_MAX_SIZE+1]; + gint iowait; /* Time waiting for I/O to complete */ + gint irq; /* Time servicing interrupts */ + gint softirq; /* Time servicing softirqs */ +-- +2.35.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb index d9863608a8..8c0a5c153f 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb @@ -10,14 +10,15 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad " SRCBRANCH ?= "master" -PV = "0.7.2" +PV = "0.7.3.1" -SRCREV_base = "50e3dbd3b131de2a39d3917576e8f834631ec46b" -SRCREV_common = "88e512ca7197a45c4114f7fa993108f23245bf50" +SRCREV_base = "5413ef5475e5b70476c2480a75ca3746d91d4caf" +SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0" SRCREV_FORMAT = "base_common" SRC_URI = " \ git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH};name=base \ git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;destsuffix=git/common;name=common;;branch=master \ + file://0001-tracers-Fix-buffer-overflow.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb index dc09d9413a..e6a9b7d250 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb @@ -23,8 +23,8 @@ do_install:append () { python populate_packages:prepend () { rootdir = bb.data.expand('${libdir}/ao/plugins-4', d) rootdir_dbg = bb.data.expand('${libdir}/ao/plugins-4/.debug', d) - do_split_packages(d, rootdir, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s', description='AO %s plugin') - do_split_packages(d, rootdir_dbg, '^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') + do_split_packages(d, rootdir, r'^(.*)\.so$', output_pattern='${BPN}-plugin-%s', description='AO %s plugin') + do_split_packages(d, rootdir_dbg, r'^(.*)\.so$', output_pattern='${BPN}-plugin-%s-dbg', description='AO %s plugin debug data') } PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 82028ecb37..a8d54f08f6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -18,7 +18,7 @@ PV = "202105+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native" +DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native libevent" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" PACKAGES =+ "${PN}-gst" @@ -26,6 +26,16 @@ PACKAGES =+ "${PN}-gst" PACKAGECONFIG ??= "" PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" +EXTRA_OEMESON = " \ + -Dpipelines=uvcvideo,simple,vimc \ + -Dipas=vimc \ + -Dv4l2=true \ + -Dcam=enabled \ + -Dlc-compliance=disabled \ + -Dtest=false \ + -Ddocumentation=disabled \ +" + RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}" inherit meson pkgconfig python3native @@ -59,4 +69,6 @@ FILES:${PN} += " ${libdir}/libcamera.so.0.0.0" FILES:${PN}-dev += " ${libdir}/libcamera-base.so" FILES:${PN}-dev += " ${libdir}/libcamera-base.so.0" FILES:${PN} += " ${libdir}/libcamera-base.so.0.0.0" +FILES:${PN} += " ${libdir}/v4l2-compat.so" FILES:${PN}-gst = "${libdir}/gstreamer-1.0/libgstlibcamera.so" +FILES:${PN} += " ${bindir}/cam" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index da2607fcf1..b913a83931 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -1,6 +1,6 @@ DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ being fully compliant with DLNA/UPnP-AV clients." -LICENSE = "GPL-2.0|BSD" +LICENSE = "GPL-2.0|BSD-3-Clause" DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" # because it depends on libav which has commercial flag @@ -13,7 +13,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna.service \ file://0001-Update-Gettext-version.patch \ file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ - file://0001-Mark-setjmp_buffer-extern-declaration.patch \ + file://0001-configure.ac-drop-non-standard-checks.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch deleted file mode 100644 index 0a1e800c81..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1c6028f5f8bbfd3fd7327a43e1bb762c2c166167 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 12 Aug 2020 18:10:54 -0700 -Subject: [PATCH] Mark setjmp_buffer extern declaration - -Fixes build with -fno-common - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - metadata.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/metadata.c b/metadata.c -index 8a10c77..c114091 100644 ---- a/metadata.c -+++ b/metadata.c -@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name) - } - - /* For libjpeg error handling */ --jmp_buf setjmp_buffer; -+extern jmp_buf setjmp_buffer; - static void - libjpeg_error_handler(j_common_ptr cinfo) - { --- -2.28.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch index 24a307db19..dd29797a66 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch @@ -1,4 +1,4 @@ -From 1118b1912916924bbfa3fd4dced9dfed01fbf0e0 Mon Sep 17 00:00:00 2001 +From 93e7e25a10c890b8c8cd06cbfd78175c30999d31 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 9 Mar 2020 09:44:33 -0700 Subject: [PATCH] configure: Check for clock_gettime seprately from @@ -9,13 +9,16 @@ since direct use of __NR_clock_gettime is not time64-safe Upstream-Status: Pending Signed-off-by: Khem Raj + --- - configure.ac | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) + configure.ac | 4 ++++ + 1 file changed, 4 insertions(+) +diff --git a/configure.ac b/configure.ac +index 3d218ea..aa7dd1c 100644 --- a/configure.ac +++ b/configure.ac -@@ -125,6 +125,10 @@ case $host in +@@ -127,6 +127,10 @@ case $host in esac AC_CHECK_HEADERS(syscall.h sys/syscall.h mach/mach_time.h) @@ -26,11 +29,3 @@ Signed-off-by: Khem Raj AC_MSG_CHECKING([for __NR_clock_gettime syscall]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( -@@ -143,7 +147,6 @@ AC_COMPILE_IFELSE( - ], - [ - AC_MSG_RESULT([no]) -- AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],) - ]) - - AC_CHECK_HEADER(linux/netlink.h, diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch new file mode 100644 index 0000000000..93334b7dab --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch @@ -0,0 +1,37 @@ +From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sat, 22 Jan 2022 11:41:50 +0100 +Subject: [PATCH] configure.ac: drop non-standard checks + +Not sure what upstream is trying to do here but it does not work +with the latest autoconf. + +Upstream-Status: Inactive-Upstream +Signed-off-by: Alexander Kanavin +--- + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index aa7dd1c..858db52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do + AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) + break + done +-test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag]) + AC_SUBST(LIBID3TAG_LIBS) + + LDFLAGS_SAVE="$LDFLAGS" +@@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do + [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])]) + break + done +-if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" && +- test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then +- AC_MSG_ERROR([Could not find libavformat - part of ffmpeg]) +-fi + AC_SUBST(LIBAVFORMAT_LIBS) + + AC_CHECK_LIB(pthread, pthread_create) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb deleted file mode 100644 index 999d85ce74..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${BPN}.inc - -SRCREV = "c760a338e07ebd11d62fef701e3de824a91f8625" -LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb new file mode 100644 index 0000000000..4238918c97 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb @@ -0,0 +1,4 @@ +require ${BPN}.inc + +SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b" +LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch deleted file mode 100644 index 68ccb65835..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9bb962148672a3c20fb0119d7f71789b8ef3dc02 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 29 Jun 2021 19:31:34 -0700 -Subject: [PATCH] include for std::forward - -Fixes -../git/src/Log.hxx:121:42: error: no member named 'forward' in namespace 'std' - LogFormat(LogLevel::ERROR, e, fmt, std::forward(args)...); - -Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/1201] -Signed-off-by: Khem Raj ---- - src/Log.hxx | 1 + - src/lib/expat/ExpatParser.hxx | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Log.hxx b/src/Log.hxx -index a295ed9f6..87097b086 100644 ---- a/src/Log.hxx -+++ b/src/Log.hxx -@@ -24,6 +24,7 @@ - #include "util/Compiler.h" - - #include -+#include - - class Domain; - -diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx -index e1723d109..4b5221e89 100644 ---- a/src/lib/expat/ExpatParser.hxx -+++ b/src/lib/expat/ExpatParser.hxx -@@ -25,6 +25,7 @@ - #include - - #include -+#include - - class InputStream; - --- -2.32.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb deleted file mode 100644 index 4eac256748..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb +++ /dev/null @@ -1,102 +0,0 @@ -SUMMARY = "Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -HOMEPAGE ="http://www.musicpd.org" - -inherit meson useradd systemd pkgconfig - -DEPENDS += " \ - curl \ - sqlite3 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ - yajl \ - boost \ - icu \ - dbus \ - expat \ -" - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/MPD;branch=v0.22.x;protocol=https \ - file://0001-include-utility-for-std-forward.patch \ - file://mpd.conf.in \ -" -SRCREV = "18628bf89ebfa5a806971479a71cf9b5764e500e" -S = "${WORKDIR}/git" - -EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" - -PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "aac", "", d)} \ - alsa ao bzip2 daemon \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg aac", "", d)} \ - fifo flac fluidsynth iso9660 \ - jack libsamplerate httpd \ - mms mpg123 modplug sndfile \ - upnp openal opus oss recorder \ - vorbis wavpack zlib" - -PACKAGECONFIG[aac] = "-Dfaad=enabled,-Dfaad=disabled,faad2" -PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" -PACKAGECONFIG[ao] = "-Dao=enabled,-Dao=disabled,libao" -PACKAGECONFIG[audiofile] = "-Daudiofile=enabled,-Daudiofile=disabled,audiofile" -PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" -PACKAGECONFIG[cdioparanoia] = "-Dcdio_paranoia=enabled,-Dcdio_paranoia=disabled,libcdio-paranoia" -PACKAGECONFIG[daemon] = "-Ddaemon=true,-Ddaemon=false" -PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" -PACKAGECONFIG[fifo] = "-Dfifo=true,-Dfifo=false" -PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" -PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" -PACKAGECONFIG[httpd] = "-Dhttpd=true,-Dhttpd=false" -PACKAGECONFIG[id3tag] = "-Did3tag=enabled,-Did3tag=disabled,libid3tag" -PACKAGECONFIG[iso9660] = "-Diso9660=enabled,-Diso9660=disabled,libcdio" -PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" -PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" -PACKAGECONFIG[libsamplerate] = "-Dlibsamplerate=enabled,-Dlibsamplerate=disabled,libsamplerate0" -PACKAGECONFIG[mad] = "-Dmad=enabled,-Dmad=disabled,libmad" -PACKAGECONFIG[mms] = "-Dmms=enabled,-Dmms=disabled,libmms" -PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" -PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" -PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" -PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus libogg" -PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled," -PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false" -PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba" -PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" -PACKAGECONFIG[upnp] = "-Dupnp=enabled,-Dupnp=disabled,libupnp" -PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg" -PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" -PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" - -do_install:append() { - install -o mpd -d \ - ${D}/${localstatedir}/lib/mpd \ - ${D}/${localstatedir}/lib/mpd/playlists - install -m775 -o mpd -g mpd -d \ - ${D}/${localstatedir}/lib/mpd/music - - install -d ${D}/${sysconfdir} - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf - sed -i \ - -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ - -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ - -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ - -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ - -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ - ${D}/${sysconfdir}/mpd.conf - - # we don't need the icon - rm -rf ${D}${datadir}/icons -} - -RPROVIDES:${PN} += "${PN}-systemd" -RREPLACES:${PN} += "${PN}-systemd" -RCONFLICTS:${PN} += "${PN}-systemd" -SYSTEMD_SERVICE:${PN} = "mpd.socket" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = " \ - --system --no-create-home \ - --home ${localstatedir}/lib/mpd \ - --groups audio \ - --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb new file mode 100644 index 0000000000..5596760d56 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb @@ -0,0 +1,101 @@ +SUMMARY = "Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +HOMEPAGE ="http://www.musicpd.org" + +inherit meson useradd systemd pkgconfig + +DEPENDS += " \ + curl \ + sqlite3 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ + yajl \ + boost \ + icu \ + dbus \ + expat \ + fmt \ +" + +SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \ + file://mpd.conf.in \ + " +SRCREV = "df4b6b92f2c4bba1b55fe0a5559b19808abb28ff" +S = "${WORKDIR}/git" + +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" + +PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ + alsa ao bzip2 daemon \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg aac", "", d)} \ + fifo flac fluidsynth iso9660 \ + jack libsamplerate httpd \ + mms mpg123 modplug sndfile \ + upnp openal opus oss recorder \ + vorbis wavpack zlib" + +PACKAGECONFIG[aac] = "-Dfaad=enabled,-Dfaad=disabled,faad2" +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" +PACKAGECONFIG[ao] = "-Dao=enabled,-Dao=disabled,libao" +PACKAGECONFIG[audiofile] = "-Daudiofile=enabled,-Daudiofile=disabled,audiofile" +PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" +PACKAGECONFIG[cdioparanoia] = "-Dcdio_paranoia=enabled,-Dcdio_paranoia=disabled,libcdio-paranoia" +PACKAGECONFIG[daemon] = "-Ddaemon=true,-Ddaemon=false" +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" +PACKAGECONFIG[fifo] = "-Dfifo=true,-Dfifo=false" +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" +PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" +PACKAGECONFIG[httpd] = "-Dhttpd=true,-Dhttpd=false" +PACKAGECONFIG[id3tag] = "-Did3tag=enabled,-Did3tag=disabled,libid3tag" +PACKAGECONFIG[iso9660] = "-Diso9660=enabled,-Diso9660=disabled,libcdio" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" +PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" +PACKAGECONFIG[libsamplerate] = "-Dlibsamplerate=enabled,-Dlibsamplerate=disabled,libsamplerate0" +PACKAGECONFIG[mad] = "-Dmad=enabled,-Dmad=disabled,libmad" +PACKAGECONFIG[mms] = "-Dmms=enabled,-Dmms=disabled,libmms" +PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" +PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" +PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" +PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus libogg" +PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled," +PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false" +PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba" +PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" +PACKAGECONFIG[upnp] = "-Dupnp=pupnp,-Dupnp=disabled,libupnp" +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg" +PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" + +do_install:append() { + install -o mpd -d \ + ${D}/${localstatedir}/lib/mpd \ + ${D}/${localstatedir}/lib/mpd/playlists + install -m775 -o mpd -g mpd -d \ + ${D}/${localstatedir}/lib/mpd/music + + install -d ${D}/${sysconfdir} + install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf + sed -i \ + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ + ${D}/${sysconfdir}/mpd.conf + + # we don't need the icon + rm -rf ${D}${datadir}/icons +} + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "mpd.socket" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = " \ + --system --no-create-home \ + --home ${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index cfe96bf024..62ca273160 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -31,7 +31,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\ dleyna-renderer \ dleyna-server \ dvb-apps \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faac fdk-aac mpd", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac fdk-aac mpd", "", d)} \ gerbera \ libao \ libavc1394 \ @@ -45,7 +45,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\ mpc \ ncmpc \ libmpd \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \ gst-shark \ gstd \ rtmpdump \ @@ -57,24 +57,24 @@ RDEPENDS:packagegroup-meta-multimedia = "\ pipewire \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d)} \ libcamera \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libde265 openh264", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \ vorbis-tools \ libdvbcsa \ libopenmpt \ libuvc \ mimic \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "minidlna", "", d)} \ mycroft \ openal-soft \ opusfile \ opus-tools \ libdvdcss \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "sox streamripper", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ tinyalsa \ tremor \ webrtc-audio-processing \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ " RDEPENDS:packagegroup-meta-multimedia:remove:libc-musl = "projucer" RDEPENDS:packagegroup-meta-multimedia:remove:powerpc64le = "openh264" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb deleted file mode 100644 index 2abc64efb2..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.34.bb +++ /dev/null @@ -1,289 +0,0 @@ -SUMMARY = "Multimedia processing server for Linux" -DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" -HOMEPAGE = "https://pipewire.org/" -BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" -LICENSE = "MIT & LGPL-2.1-or-later & GPL-2.0-only" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=2158739e172e58dc9ab1bdd2d6ec9c72 \ - file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ -" -SECTION = "multimedia" - -DEPENDS = "dbus" - -SRCREV = "1924c2c29824955b5e763f1def6967f68e403c7c" -SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig systemd gettext useradd - -USERADD_PACKAGES = "${PN}" - -GROUPADD_PARAM:${PN} = "--system pipewire" - -USERADD_PARAM:${PN} = "--system --home / --no-create-home \ - --comment 'PipeWire multimedia daemon' \ - --gid pipewire --groups audio,video \ - pipewire" - -SYSTEMD_PACKAGES = "${PN} ${PN}-media-session" - -# For "EVL", look up https://evlproject.org/ . It involves -# a specially prepared kernel, and is currently unavailable -# in Yocto. -# -# FFmpeg and Vulkan aren't really supported - at the current -# stage (version 0.3.22), these are just experiments, not -# actual features. -# -# libcamera support currently does not build successfully. -# -# manpage generation requires xmltoman, which is not available. -EXTRA_OEMESON += " \ - -Daudiotestsrc=enabled \ - -Devl=disabled \ - -Dtests=disabled \ - -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ - -Dvideotestsrc=enabled \ - -Dffmpeg=disabled \ - -Dvulkan=disabled \ - -Dlibcamera=disabled \ - -Dman=disabled \ -" - -PACKAGECONFIG ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)} \ - gstreamer jack sndfile pw-cat v4l2 \ -" - -# "jack" and "pipewire-jack" packageconfigs cannot be both enabled, -# since "jack" imports libjack, and "pipewire-jack" generates -# libjack.so* files, thus colliding with the libpack package. This -# is why these two are marked in their respective packageconfigs -# as being in conflict. -PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev" -PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" -PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" -PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" -PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" -PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" -PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=enabled,-Dsystemd-system-service=disabled,systemd" -# "systemd-user-service" packageconfig will only install service -# files to rootfs but not enable them as systemd.bbclass -# currently lacks the feature of enabling user services. -PACKAGECONFIG[systemd-user-service] = "-Dsystemd-user-service=enabled,-Dsystemd-user-service=disabled,systemd" -# pw-cat needs sndfile packageconfig to be enabled -PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" -PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev" -PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" -PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,,jack" - -PACKAGESPLITFUNCS:prepend = " split_dynamic_packages " -PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends " - -SPA_SUBDIR = "spa-0.2" -PW_MODULE_SUBDIR = "pipewire-0.3" - -remove_unused_installed_files() { - # jack.conf is used by pipewire-jack (not the JACK SPA plugin). - # Remove it if pipewire-jack is not built to avoid creating the - # pipewire-jack package. - if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then - rm -f "${D}${datadir}/pipewire/jack.conf" - fi -} - -do_install[postfuncs] += "remove_unused_installed_files" - -python split_dynamic_packages () { - # Create packages for each SPA plugin. These plugins are located - # in individual subdirectories, so a recursive search is needed. - spa_libdir = d.expand('${libdir}/${SPA_SUBDIR}') - do_split_packages(d, spa_libdir, r'^libspa-(.*)\.so$', d.expand('${PN}-spa-plugins-%s'), 'PipeWire SPA plugin for %s', extra_depends='', recursive=True) - - # Create packages for each PipeWire module. - pw_module_libdir = d.expand('${libdir}/${PW_MODULE_SUBDIR}') - do_split_packages(d, pw_module_libdir, r'^libpipewire-module-(.*)\.so$', d.expand('${PN}-modules-%s'), 'PipeWire %s module', extra_depends='', recursive=False) -} - -python set_dynamic_metapkg_rdepends () { - import os - import oe.utils - - # Go through all generated SPA plugin and PipeWire module packages - # (excluding the main package and the -meta package itself) and - # add them to the -meta package as RDEPENDS. - - base_pn = d.getVar('PN') - - spa_pn = base_pn + '-spa-plugins' - spa_metapkg = spa_pn + '-meta' - - pw_module_pn = base_pn + '-modules' - pw_module_metapkg = pw_module_pn + '-meta' - - d.setVar('ALLOW_EMPTY:' + spa_metapkg, "1") - d.setVar('FILES:' + spa_metapkg, "") - - d.setVar('ALLOW_EMPTY:' + pw_module_metapkg, "1") - d.setVar('FILES:' + pw_module_metapkg, "") - - blacklist = [ spa_pn, spa_metapkg, pw_module_pn, pw_module_metapkg ] - spa_metapkg_rdepends = [] - pw_module_metapkg_rdepends = [] - pkgdest = d.getVar('PKGDEST') - - for pkg in oe.utils.packages_filter_out_system(d): - if pkg in blacklist: - continue - - is_spa_pkg = pkg.startswith(spa_pn) - is_pw_module_pkg = pkg.startswith(pw_module_pn) - if not is_spa_pkg and not is_pw_module_pkg: - continue - - if pkg in spa_metapkg_rdepends or pkg in pw_module_metapkg_rdepends: - continue - - # See if the package is empty by looking at the contents of its - # PKGDEST subdirectory. If this subdirectory is empty, then then - # package is empty as well. Empty packages do not get added to - # the meta package's RDEPENDS. - pkgdir = os.path.join(pkgdest, pkg) - if os.path.exists(pkgdir): - dir_contents = os.listdir(pkgdir) or [] - else: - dir_contents = [] - is_empty = len(dir_contents) == 0 - if not is_empty: - if is_spa_pkg: - spa_metapkg_rdepends.append(pkg) - if is_pw_module_pkg: - pw_module_metapkg_rdepends.append(pkg) - - d.setVar('RDEPENDS:' + spa_metapkg, ' '.join(spa_metapkg_rdepends)) - d.setVar('DESCRIPTION:' + spa_metapkg, spa_pn + ' meta package') - - d.setVar('RDEPENDS:' + pw_module_metapkg, ' '.join(pw_module_metapkg_rdepends)) - d.setVar('DESCRIPTION:' + pw_module_metapkg, pw_module_pn + ' meta package') -} - -PACKAGES =+ "\ - libpipewire \ - ${PN}-tools \ - ${PN}-pulse \ - ${PN}-alsa \ - ${PN}-jack \ - ${PN}-media-session \ - ${PN}-spa-plugins \ - ${PN}-spa-plugins-meta \ - ${PN}-spa-tools \ - ${PN}-modules \ - ${PN}-modules-meta \ - ${PN}-alsa-card-profile \ - gstreamer1.0-pipewire \ -" - -PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" - -SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd-system-service', 'pipewire.service', '', d)}" -CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf" -FILES:${PN} = " \ - ${datadir}/pipewire/pipewire.conf \ - ${systemd_user_unitdir}/pipewire.* \ - ${bindir}/pipewire \ -" - -FILES:${PN}-dev += " \ - ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ -" - -CONFFILES:libpipewire += "${datadir}/pipewire/client.conf" -FILES:libpipewire = " \ - ${datadir}/pipewire/client.conf \ - ${libdir}/libpipewire-*.so.* \ -" -# Add the bare minimum modules and plugins required to be able -# to use libpipewire. Without these, it is essentially unusable. -RDEPENDS:libpipewire += " \ - ${PN}-modules-client-node \ - ${PN}-modules-protocol-native \ - ${PN}-spa-plugins-support \ -" - -FILES:${PN}-tools = " \ - ${bindir}/pw-* \ -" - -# This is a shim daemon that is intended to be used as a -# drop-in PulseAudio replacement, providing a pulseaudio-compatible -# socket that can be used by applications that use libpulse. -CONFFILES:${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf" -FILES:${PN}-pulse = " \ - ${datadir}/pipewire/pipewire-pulse.conf \ - ${systemd_user_unitdir}/pipewire-pulse.* \ - ${bindir}/pipewire-pulse \ -" -RDEPENDS:${PN}-pulse += " \ - ${PN}-modules-protocol-pulse \ -" - -# alsa plugin to redirect audio to pipewire -FILES:${PN}-alsa = "\ - ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/* \ -" - -# jack drop-in libraries to redirect audio to pipewire -CONFFILES:${PN}-jack = "${datadir}/pipewire/jack.conf" -FILES:${PN}-jack = "\ - ${datadir}/pipewire/jack.conf \ - ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ -" - -# Example session manager. Not intended for use in production. -CONFFILES:${PN}-media-session = "${datadir}/pipewire/media-session.d/*" -SYSTEMD_SERVICE:${PN}-media-session = "${@bb.utils.contains('PACKAGECONFIG', 'systemd-system-service', 'pipewire-media-session.service', '', d)}" -FILES:${PN}-media-session = " \ - ${bindir}/pipewire-media-session \ - ${datadir}/pipewire/media-session.d/* \ - ${systemd_system_unitdir}/pipewire-media-session.service \ - ${systemd_user_unitdir}/pipewire-media-session.service \ -" -RPROVIDES:${PN}-media-session = "virtual-pipewire-sessionmanager" - -# Dynamic packages (see set_dynamic_metapkg_rdepends). -FILES:${PN}-spa-plugins = "" -RRECOMMENDS:${PN}-spa-plugins += "${PN}-spa-plugins-meta" - -FILES:${PN}-spa-tools = " \ - ${bindir}/spa-* \ -" - -# Dynamic packages (see set_dynamic_metapkg_rdepends). -FILES:${PN}-modules = "" -RRECOMMENDS:${PN}-modules += "${PN}-modules-meta" - -CONFFILES:${PN}-modules-rtkit = "${datadir}/pipewire/client-rt.conf" -FILES:${PN}-modules-rtkit += " \ - ${datadir}/pipewire/client-rt.conf \ - " - -CONFFILES:${PN}-modules-filter-chain = "${datadir}/pipewire/filter-chain/*" -FILES:${PN}-modules-filter-chain += " \ - ${datadir}/pipewire/filter-chain/* \ -" - -FILES:${PN}-alsa-card-profile = " \ - ${datadir}/alsa-card-profile/* \ - ${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \ -" - -FILES:gstreamer1.0-pipewire = " \ - ${libdir}/gstreamer-1.0/* \ -" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.45.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.45.bb new file mode 100644 index 0000000000..6ba3124846 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.45.bb @@ -0,0 +1,332 @@ +SUMMARY = "Multimedia processing server for Linux" +DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" +HOMEPAGE = "https://pipewire.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" +AUTHOR = "Wim Taymans " +SECTION = "multimedia" + +LICENSE = "MIT & LGPL-2.1-or-later & GPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=2158739e172e58dc9ab1bdd2d6ec9c72 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ +" + +DEPENDS = "dbus ncurses" + +SRCREV = "bdd407fe66cc9e46d4bc4dcc989d50679000482b" +SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd gettext useradd + +USERADD_PACKAGES = "${PN}" + +GROUPADD_PARAM:${PN} = "--system pipewire" + +USERADD_PARAM:${PN} = "--system --home / --no-create-home \ + --comment 'PipeWire multimedia daemon' \ + --gid pipewire --groups audio,video \ + pipewire" + +SYSTEMD_PACKAGES = "${PN}" + +# For "EVL", look up https://evlproject.org/ . It involves +# a specially prepared kernel, and is currently unavailable +# in Yocto. +# +# Vulkan support is currently (as of version 0.3.44) not functional. +# +# manpage generation requires xmltoman, which is not available. +# +# The session-managers list specifies which session managers Meson +# shall download (via git clone) and build as subprojects. In OE, +# this is not how a session manager should be built. Instead, they +# should be integrated as separate OE recipes. To prevent PipeWire +# from using this Meson feature, set an empty list. +# This does not disable support or the need for session managers, +# it just prevents this subproject feature. +# +# AptX and LDAC are not available in OE. Currently, neither +# are lv2 and ROC. +EXTRA_OEMESON += " \ + -Devl=disabled \ + -Dtests=disabled \ + -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ + -Dsystemd-system-unit-dir=${systemd_system_unitdir} \ + -Dsystemd-user-unit-dir=${systemd_user_unitdir} \ + -Dvulkan=disabled \ + -Dman=disabled \ + -Dsession-managers='[]' \ + -Dlv2=disabled \ + -Droc=disabled \ + -Dbluez5-codec-aptx=disabled \ + -Dbluez5-codec-ldac=disabled \ +" + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)} \ + gstreamer jack libusb pw-cat raop sndfile v4l2 \ +" + +# "jack" and "pipewire-jack" packageconfigs cannot be both enabled, +# since "jack" imports libjack, and "pipewire-jack" generates +# libjack.so* files, thus colliding with the libpack package. This +# is why these two are marked in their respective packageconfigs +# as being in conflict. +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev" +PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" +PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" +PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac" +PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-native" +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" +PACKAGECONFIG[libcamera] = "-Dlibcamera=enabled,-Dlibcamera=disabled,libcamera" +PACKAGECONFIG[libcanberra] = "-Dlibcanberra=enabled,-Dlibcanberra=disabled,libcanberra" +PACKAGECONFIG[libusb] = "-Dlibusb=enabled,-Dlibusb=disabled,libusb" +PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" +PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,,jack" +PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" +PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" +PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=enabled,-Dsystemd-system-service=disabled,systemd" +# "systemd-user-service" packageconfig will only install service +# files to rootfs but not enable them as systemd.bbclass +# currently lacks the feature of enabling user services. +PACKAGECONFIG[systemd-user-service] = "-Dsystemd-user-service=enabled,-Dsystemd-user-service=disabled,systemd" +# pw-cat needs sndfile packageconfig to be enabled +PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev" +PACKAGECONFIG[webrtc-echo-cancelling] = "-Decho-cancel-webrtc=enabled,-Decho-cancel-webrtc=disabled,webrtc-audio-processing" + +PACKAGESPLITFUNCS:prepend = " split_dynamic_packages " +PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends " + +SPA_SUBDIR = "spa-0.2" +PW_MODULE_SUBDIR = "pipewire-0.3" + +remove_unused_installed_files() { + # jack.conf is used by pipewire-jack (not the JACK SPA plugin). + # Remove it if pipewire-jack is not built to avoid creating the + # pipewire-jack package. + if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then + rm -f "${D}${datadir}/pipewire/jack.conf" + fi + + # minimal.conf is an example of how to minimally configure the + # daemon and is not meant to be used for production. + rm -f "${D}${datadir}/pipewire/minimal.conf" +} + +do_install[postfuncs] += "remove_unused_installed_files" + +python split_dynamic_packages () { + # Create packages for each SPA plugin. These plugins are located + # in individual subdirectories, so a recursive search is needed. + spa_libdir = d.expand('${libdir}/${SPA_SUBDIR}') + do_split_packages(d, spa_libdir, r'^libspa-(.*)\.so$', d.expand('${PN}-spa-plugins-%s'), 'PipeWire SPA plugin for %s', extra_depends='', recursive=True) + + # Create packages for each PipeWire module. + pw_module_libdir = d.expand('${libdir}/${PW_MODULE_SUBDIR}') + do_split_packages(d, pw_module_libdir, r'^libpipewire-module-(.*)\.so$', d.expand('${PN}-modules-%s'), 'PipeWire %s module', extra_depends='', recursive=False) +} + +python set_dynamic_metapkg_rdepends () { + import os + import oe.utils + + # Go through all generated SPA plugin and PipeWire module packages + # (excluding the main package and the -meta package itself) and + # add them to the -meta package as RDEPENDS. + + base_pn = d.getVar('PN') + + spa_pn = base_pn + '-spa-plugins' + spa_metapkg = spa_pn + '-meta' + + pw_module_pn = base_pn + '-modules' + pw_module_metapkg = pw_module_pn + '-meta' + + d.setVar('ALLOW_EMPTY:' + spa_metapkg, "1") + d.setVar('FILES:' + spa_metapkg, "") + + d.setVar('ALLOW_EMPTY:' + pw_module_metapkg, "1") + d.setVar('FILES:' + pw_module_metapkg, "") + + blacklist = [ spa_pn, spa_metapkg, pw_module_pn, pw_module_metapkg ] + spa_metapkg_rdepends = [] + pw_module_metapkg_rdepends = [] + pkgdest = d.getVar('PKGDEST') + + for pkg in oe.utils.packages_filter_out_system(d): + if pkg in blacklist: + continue + + is_spa_pkg = pkg.startswith(spa_pn) + is_pw_module_pkg = pkg.startswith(pw_module_pn) + if not is_spa_pkg and not is_pw_module_pkg: + continue + + if pkg in spa_metapkg_rdepends or pkg in pw_module_metapkg_rdepends: + continue + + # See if the package is empty by looking at the contents of its + # PKGDEST subdirectory. If this subdirectory is empty, then then + # package is empty as well. Empty packages do not get added to + # the meta package's RDEPENDS. + pkgdir = os.path.join(pkgdest, pkg) + if os.path.exists(pkgdir): + dir_contents = os.listdir(pkgdir) or [] + else: + dir_contents = [] + is_empty = len(dir_contents) == 0 + if not is_empty: + if is_spa_pkg: + spa_metapkg_rdepends.append(pkg) + if is_pw_module_pkg: + pw_module_metapkg_rdepends.append(pkg) + + d.setVar('RDEPENDS:' + spa_metapkg, ' '.join(spa_metapkg_rdepends)) + d.setVar('DESCRIPTION:' + spa_metapkg, spa_pn + ' meta package') + + d.setVar('RDEPENDS:' + pw_module_metapkg, ' '.join(pw_module_metapkg_rdepends)) + d.setVar('DESCRIPTION:' + pw_module_metapkg, pw_module_pn + ' meta package') +} + +PACKAGES =+ "\ + libpipewire \ + ${PN}-tools \ + ${PN}-pulse \ + ${PN}-alsa \ + ${PN}-jack \ + ${PN}-spa-plugins \ + ${PN}-spa-plugins-meta \ + ${PN}-spa-tools \ + ${PN}-modules \ + ${PN}-modules-meta \ + ${PN}-alsa-card-profile \ + ${PN}-v4l2 \ + gstreamer1.0-pipewire \ +" + +PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" + +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd-system-service', 'pipewire.service', '', d)}" +CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf" +FILES:${PN} = " \ + ${datadir}/pipewire/pipewire.conf \ + ${systemd_system_unitdir}/pipewire.* \ + ${systemd_user_unitdir}/pipewire.* \ + ${bindir}/pipewire \ +" + +FILES:${PN}-dev += " \ + ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ +" + +CONFFILES:libpipewire += "${datadir}/pipewire/client.conf" +FILES:libpipewire = " \ + ${datadir}/pipewire/client.conf \ + ${libdir}/libpipewire-*.so.* \ +" +# Add the bare minimum modules and plugins required to be able +# to use libpipewire. Without these, it is essentially unusable. +RDEPENDS:libpipewire += " \ + ${PN}-modules-client-node \ + ${PN}-modules-protocol-native \ + ${PN}-spa-plugins-support \ +" + +FILES:${PN}-tools = " \ + ${bindir}/pw-cat \ + ${bindir}/pw-cli \ + ${bindir}/pw-dot \ + ${bindir}/pw-dsdplay \ + ${bindir}/pw-dump \ + ${bindir}/pw-link \ + ${bindir}/pw-loopback \ + ${bindir}/pw-metadata \ + ${bindir}/pw-mididump \ + ${bindir}/pw-midiplay \ + ${bindir}/pw-midirecord \ + ${bindir}/pw-mon \ + ${bindir}/pw-play \ + ${bindir}/pw-profiler \ + ${bindir}/pw-record \ + ${bindir}/pw-reserve \ + ${bindir}/pw-top \ +" + +# This is a shim daemon that is intended to be used as a +# drop-in PulseAudio replacement, providing a pulseaudio-compatible +# socket that can be used by applications that use libpulse. +CONFFILES:${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf" +FILES:${PN}-pulse = " \ + ${datadir}/pipewire/pipewire-pulse.conf \ + ${systemd_system_unitdir}/pipewire-pulse.* \ + ${systemd_user_unitdir}/pipewire-pulse.* \ + ${bindir}/pipewire-pulse \ +" +RDEPENDS:${PN}-pulse += " \ + ${PN}-modules-protocol-pulse \ +" + +# ALSA plugin to redirect audio to pipewire. +FILES:${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/* \ +" + +# JACK drop-in libraries to redirect audio to pipewire. +CONFFILES:${PN}-jack = "${datadir}/pipewire/jack.conf" +FILES:${PN}-jack = "\ + ${bindir}/pw-jack \ + ${datadir}/pipewire/jack.conf \ + ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ +" + +# Dynamic SPA plugin packages (see set_dynamic_metapkg_rdepends). +FILES:${PN}-spa-plugins = "" +RRECOMMENDS:${PN}-spa-plugins += "${PN}-spa-plugins-meta" + +FILES:${PN}-spa-plugins-bluez5 += " \ + ${datadir}/${SPA_SUBDIR}/bluez5/* \ +" + +FILES:${PN}-spa-tools = " \ + ${bindir}/spa-* \ +" + +# Dynamic PipeWire module packages (see set_dynamic_metapkg_rdepends). +FILES:${PN}-modules = "" +RRECOMMENDS:${PN}-modules += "${PN}-modules-meta" + +CONFFILES:${PN}-modules-rtkit = "${datadir}/pipewire/client-rt.conf" +FILES:${PN}-modules-rtkit += " \ + ${datadir}/pipewire/client-rt.conf \ + " + +CONFFILES:${PN}-modules-filter-chain = "${datadir}/pipewire/filter-chain/*" +FILES:${PN}-modules-filter-chain += " \ + ${datadir}/pipewire/filter-chain/* \ +" + +FILES:${PN}-alsa-card-profile = " \ + ${datadir}/alsa-card-profile/* \ + ${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \ +" + +# V4L2 interface emulator for sending/receiving data between PipeWire and V4L2 applications. +FILES:${PN}-v4l2 += " \ + ${bindir}/pw-v4l2 \ + ${libdir}/${PW_MODULE_SUBDIR}/v4l2/libpw-v4l2.so \ +" + +FILES:gstreamer1.0-pipewire = " \ + ${libdir}/gstreamer-1.0/* \ +" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index 2d6e913d87..544b6138fc 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -36,4 +36,4 @@ SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3b inherit autotools pkgconfig -EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}" +EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb index 384637281d..fde7b04335 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb @@ -129,4 +129,4 @@ FILES:${PN}-staticdev += "\ INSANE_SKIP:${PN} = "dev-so" -EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}" +EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua new file mode 100644 index 0000000000..353a49c0b5 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/90-OE-disable-session-dbus-dependent-features.lua @@ -0,0 +1,5 @@ +-- These features require a session DBus instance, which is not available +-- by default in OE generated images. The absence of such a DBus instance +-- causes WirePlumber to fail to start. Turn these off to prevent that. +alsa_monitor.properties["alsa.reserve"] = false +default_access.properties["enable-flatpak-portal"] = false diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb new file mode 100644 index 0000000000..2310c3a780 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb @@ -0,0 +1,143 @@ +SUMMARY = "Session / policy manager implementation for PipeWire" +HOMEPAGE = "https://gitlab.freedesktop.org/pipewire/wireplumber" +BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/wireplumber/issues" +AUTHOR = "George Kiagiadakis " +SECTION = "multimedia" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=17d1fe479cdec331eecbc65d26bc7e77" + +DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ +" + +SRCREV = "e14bb72dcc85e2130d0ea96768e5ae3b375a041e" +SRC_URI = "git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ + file://90-OE-disable-session-dbus-dependent-features.lua \ + " + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gobject-introspection systemd + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +# Enable system-lua to let wireplumber use OE's lua. +# Documentation needs python-sphinx, which is not in oe-core or meta-python2 for now. +# elogind is not (yet) available in OE, so disable support. +EXTRA_OEMESON += " \ + -Ddoc=disabled \ + -Dsystem-lua=true \ + -Delogind=disabled \ + -Dsystemd-system-unit-dir=${systemd_system_unitdir} \ + -Dsystemd-user-unit-dir=${systemd_user_unitdir} \ + -Dtests=false \ +" + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service', '', d)} \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" +PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=true,-Dsystemd-system-service=false,systemd" +# "systemd-user-service" packageconfig will only install service +# files to rootfs but not enable them as systemd.bbclass +# currently lacks the feature of enabling user services. +PACKAGECONFIG[systemd-user-service] = "-Dsystemd-user-service=true,-Dsystemd-user-service=false,systemd" + +PACKAGESPLITFUNCS:prepend = " split_dynamic_packages " +PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends " + +WP_MODULE_SUBDIR = "wireplumber-0.4" + +add_custom_lua_config_scripts() { + install -m 0644 ${WORKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d +} + +do_install[postfuncs] += "add_custom_lua_config_scripts" + +python split_dynamic_packages () { + # Create packages for each WirePlumber module. + wp_module_libdir = d.expand('${libdir}/${WP_MODULE_SUBDIR}') + do_split_packages(d, wp_module_libdir, r'^libwireplumber-module-(.*)\.so$', d.expand('${PN}-modules-%s'), 'WirePlumber %s module', extra_depends='', recursive=False) +} + +python set_dynamic_metapkg_rdepends () { + import os + import oe.utils + + # Go through all generated WirePlumber module packages + # (excluding the main package and the -meta package itself) + # and add them to the -meta package as RDEPENDS. + + base_pn = d.getVar('PN') + + wp_module_pn = base_pn + '-modules' + wp_module_metapkg = wp_module_pn + '-meta' + + d.setVar('ALLOW_EMPTY:' + wp_module_metapkg, "1") + d.setVar('FILES:' + wp_module_metapkg, "") + + blacklist = [ wp_module_pn, wp_module_metapkg ] + wp_module_metapkg_rdepends = [] + pkgdest = d.getVar('PKGDEST') + + for pkg in oe.utils.packages_filter_out_system(d): + if pkg in blacklist: + continue + + is_wp_module_pkg = pkg.startswith(wp_module_pn) + if not is_wp_module_pkg: + continue + + if pkg in wp_module_metapkg_rdepends: + continue + + # See if the package is empty by looking at the contents of its + # PKGDEST subdirectory. If this subdirectory is empty, then then + # package is empty as well. Empty packages do not get added to + # the meta package's RDEPENDS. + pkgdir = os.path.join(pkgdest, pkg) + if os.path.exists(pkgdir): + dir_contents = os.listdir(pkgdir) or [] + else: + dir_contents = [] + is_empty = len(dir_contents) == 0 + if not is_empty: + if is_wp_module_pkg: + wp_module_metapkg_rdepends.append(pkg) + + d.setVar('RDEPENDS:' + wp_module_metapkg, ' '.join(wp_module_metapkg_rdepends)) + d.setVar('DESCRIPTION:' + wp_module_metapkg, wp_module_pn + ' meta package') +} + +PACKAGES =+ "\ + libwireplumber \ + ${PN}-default-config \ + ${PN}-scripts \ + ${PN}-modules \ + ${PN}-modules-meta \ +" + +PACKAGES_DYNAMIC = "^${PN}-modules.*" + +SYSTEMD_SERVICE:${PN} = "wireplumber.service" +CONFFILES:${PN} += " \ + ${datadir}/wireplumber/wireplumber.conf \ + ${datadir}/wireplumber/*.lua.d/* \ +" +# Add pipewire to RRECOMMENDS, since WirePlumber expects a PipeWire daemon to +# be present. While in theory any application that uses libpipewire can configure +# itself to become a daemon, in practice, the PipeWire daemon is used. +RRECOMMENDS:${PN} += "${PN}-scripts pipewire" + +FILES:libwireplumber = " \ + ${libdir}/libwireplumber-*.so.* \ +" + +FILES:${PN}-scripts += "${datadir}/wireplumber/scripts/*" + +# Dynamic packages (see set_dynamic_metapkg_rdepends). +FILES:${PN}-modules = "" +RRECOMMENDS:${PN}-modules += "${PN}-modules-meta" diff --git a/meta-openembedded/meta-networking/conf/layer.conf b/meta-openembedded/meta-networking/conf/layer.conf index 67fcda3d99..3f9699ad18 100644 --- a/meta-openembedded/meta-networking/conf/layer.conf +++ b/meta-openembedded/meta-networking/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" -LAYERSERIES_COMPAT_networking-layer = "honister" +LAYERSERIES_COMPAT_networking-layer = "kirkstone" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch new file mode 100644 index 0000000000..f1d2cbc5a3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch @@ -0,0 +1,31 @@ +From 078e962d345fd0536fe7ba797485ee1a4159c032 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 4 Feb 2022 09:18:30 -0800 +Subject: [PATCH] Make alpha2 to be 3 characters long + +Fixes buffer overflow +reglib.c:969:9: error: 'sscanf' may overflow; destination buffer in argument 3 has size 2, but the corresponding specifier may require size 3 [-Werror,-Wfortify-source] + alpha2, + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + reglib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/reglib.c b/reglib.c +index e00e9b8..8565a0b 100644 +--- a/reglib.c ++++ b/reglib.c +@@ -958,7 +958,7 @@ reglib_parse_rules(FILE *fp, struct ieee80211_regdomain *trd) + static int reglib_parse_country_dfs(char *line, struct ieee80211_regdomain *rd) + { + char dfs_region_alpha[9]; +- char alpha2[2]; ++ char alpha2[3]; + int hits; + + memset(rd, 0, sizeof(*rd)); +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb index f99dfd66f9..9abfd61cf2 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://use-target-word-size-instead-of-host-s.patch \ file://fix-issues-when-USE_OPENSSL-1.patch \ file://crda-4.14-python-3.patch \ + file://0001-Make-alpha2-to-be-3-characters-long.patch \ " SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb index c86926813d..8d4be95cfe 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb @@ -8,7 +8,8 @@ HOMEPAGE = "http://www.isc.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01" -DEPENDS = "openssl libcap zlib" +DEPENDS = "openssl libcap zlib chrpath-replacement-native" +EXTRANATIVEPATH += "chrpath-native" SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \ https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;unpack=0 \ @@ -62,8 +63,11 @@ do_compile:prepend() { } do_install:append () { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + install -Dm 0755 ${B}/bind/bind-9.11.32/lib/isccfg/.libs/libisccfg.so.163 ${D}${libdir}/libisccfg.so.163 + install -Dm 0755 ${B}/bind/bind-9.11.32/lib/dns/.libs/libdns.so.1115 ${D}${libdir}/libdns.so.1115 + chrpath --delete ${D}${libdir}/libisccfg.so.163 + chrpath --delete ${D}${libdir}/libdns.so.1115 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch deleted file mode 100644 index f3ba04f51f..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-ssl_tls-Increase-size-of-padbuf-to-64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c3d7321d59e959b357a7d3d69782d9105f3d04aa Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 1 Mar 2021 21:04:57 -0800 -Subject: [PATCH] ssl_tls: Increase size of padbuf to 64 - -This fixes warnings with gcc11 - -git/library/ssl_tls.c: In function 'ssl_calc_finished_tls_sha384': -git/library/ssl_tls.c:3267:5: error: 'mbedtls_sha512_finish_ret' accessing 64 bytes in a region of size 48 [-Werror=stringop-overflow=] - 3267 | finish( &sha512, padbuf ); - | ^~~~~~~~~~~~~~~~~~~~~~~~~ -git/library/ssl_tls.c:3267:5: note: referencing argument 2 of type 'unsigned char *' - -Signed-off-by: Khem Raj ---- - library/ssl_tls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/ssl_tls.c b/library/ssl_tls.c -index a1a5859f0..4c98a4104 100644 ---- a/library/ssl_tls.c -+++ b/library/ssl_tls.c -@@ -3205,7 +3205,7 @@ static void ssl_calc_finished_tls_sha384( - { - int len = 12; - const char *sender; -- unsigned char padbuf[48]; -+ unsigned char padbuf[64]; - #if defined(MBEDTLS_USE_PSA_CRYPTO) - size_t hash_size; - psa_hash_operation_t sha384_psa = PSA_HASH_OPERATION_INIT; --- -2.30.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb deleted file mode 100644 index b62ed04ce6..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Lightweight crypto and SSL/TLS library" -DESCRIPTION = "mbedtls is a lean open source crypto library \ -for providing SSL and TLS support in your programs. It offers \ -an intuitive API and documented header files, so you can actually \ -understand what the code does. It features: \ - \ - - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ - Camellia and XTEA \ - - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ - - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ - - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ - ECDSA and ECDH \ - - SSL v3 and TLS 1.0, 1.1 and 1.2 \ - - Abstraction layers for ciphers, hashes, public key operations, \ - platform abstraction and threading \ -" - -HOMEPAGE = "https://tls.mbed.org/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SECTION = "libs" - -S = "${WORKDIR}/git" -SRCREV = "e483a77c85e1f9c1dd2eb1c5a8f552d2617fe400" -SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development" -SRC_URI += "file://0001-ssl_tls-Increase-size-of-padbuf-to-64.patch" - -inherit cmake - -PACKAGECONFIG ??= "shared-libs programs" -PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" -PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" -PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" - -EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" - -PROVIDES += "polarssl" -RPROVIDES:${PN} = "polarssl" - -PACKAGES =+ "${PN}-programs" -FILES:${PN}-programs = "${bindir}/" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb new file mode 100644 index 0000000000..d4a9c7bf8d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.0.bb @@ -0,0 +1,44 @@ +SUMMARY = "Lightweight crypto and SSL/TLS library" +DESCRIPTION = "mbedtls is a lean open source crypto library \ +for providing SSL and TLS support in your programs. It offers \ +an intuitive API and documented header files, so you can actually \ +understand what the code does. It features: \ + \ + - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4, \ + Camellia and XTEA \ + - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5 \ + - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG \ + - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \ + ECDSA and ECDH \ + - SSL v3 and TLS 1.0, 1.1 and 1.2 \ + - Abstraction layers for ciphers, hashes, public key operations, \ + platform abstraction and threading \ +" + +HOMEPAGE = "https://tls.mbed.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SECTION = "libs" + +S = "${WORKDIR}/git" +SRCREV = "8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0" +SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28" + +inherit cmake + +PACKAGECONFIG ??= "shared-libs programs" +PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" +PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" +PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" + +EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" + +PROVIDES += "polarssl" +RPROVIDES:${PN} = "polarssl" + +PACKAGES =+ "${PN}-programs" +FILES:${PN}-programs = "${bindir}/" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch index 37560f30c8..627638ec89 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -19,4 +19,4 @@ Signed-off-by: Gianfranco Costamagna + LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version" ) - install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(TARGETS libmosquitto diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb deleted file mode 100644 index 06d8211a27..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.12.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Open source MQTT implementation" -DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ -that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ -5, providing both an MQTT broker and several command-line clients. MQTT \ -provides a lightweight method of carrying out messaging using a \ -publish/subscribe model. " -HOMEPAGE = "http://mosquitto.org/" -SECTION = "console/network" -LICENSE = "EPL-2.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ - file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ - file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ - file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ -" -DEPENDS = "uthash cjson" - -SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ - file://mosquitto.init \ - file://1571.patch \ -" - -SRC_URI[sha256sum] = "31cf0065cb431d6f4e57a5f4d56663e839c9d177362eff89582d7cfde191c933" - -inherit systemd update-rc.d useradd cmake pkgconfig - -PACKAGECONFIG ??= "ssl dlt websockets \ - ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ - " - -PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" -PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" -PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" - -EXTRA_OECMAKE = " \ - -DWITH_BUNDLED_DEPS=OFF \ - -DWITH_ADNS=ON \ -" - -do_install:append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service - - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${sysconfdir}/init.d/mosquitto -} - -PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" - -PACKAGE_BEFORE_PN = "${PN}-examples" - -FILES:${PN} = "${sbindir}/mosquitto \ - ${bindir}/mosquitto_passwd \ - ${bindir}/mosquitto_ctrl \ - ${libdir}/mosquitto_dynamic_security.so \ - ${sysconfdir}/mosquitto \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/mosquitto.service \ -" - -CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" - -FILES:libmosquitto1 = "${libdir}/libmosquitto.so.*" - -FILES:libmosquittopp1 = "${libdir}/libmosquittopp.so.*" - -FILES:${PN}-clients = "${bindir}/mosquitto_pub \ - ${bindir}/mosquitto_sub \ - ${bindir}/mosquitto_rr \ -" - -FILES:${PN}-examples = "${sysconfdir}/mosquitto/*.example" - -SYSTEMD_SERVICE:${PN} = "mosquitto.service" - -INITSCRIPT_NAME = "mosquitto" -INITSCRIPT_PARAMS = "defaults 30" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ - --user-group mosquitto" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb new file mode 100644 index 0000000000..739b7de625 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.14.bb @@ -0,0 +1,90 @@ +SUMMARY = "Open source MQTT implementation" +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ +that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ +5, providing both an MQTT broker and several command-line clients. MQTT \ +provides a lightweight method of carrying out messaging using a \ +publish/subscribe model. " +HOMEPAGE = "http://mosquitto.org/" +SECTION = "console/network" +LICENSE = "EPL-2.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ + file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \ + file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \ + file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ +" +DEPENDS = "uthash cjson" + +SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ + file://mosquitto.init \ + file://1571.patch \ +" + +SRC_URI[sha256sum] = "d0dde8fdb12caf6e2426b4f28081919a2fce3448773bdb8af0d3cd5fe5776925" + +inherit systemd update-rc.d useradd cmake pkgconfig + +PACKAGECONFIG ??= "ssl dlt websockets \ + ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ + " + +PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" +PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" +PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" + +EXTRA_OECMAKE = " \ + -DWITH_BUNDLED_DEPS=OFF \ + -DWITH_ADNS=ON \ +" + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${sysconfdir}/init.d/mosquitto +} + +PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" + +PACKAGE_BEFORE_PN = "${PN}-examples" + +FILES:${PN} = "${sbindir}/mosquitto \ + ${bindir}/mosquitto_passwd \ + ${bindir}/mosquitto_ctrl \ + ${libdir}/mosquitto_dynamic_security.so \ + ${sysconfdir}/mosquitto \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/mosquitto.service \ +" + +CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" + +FILES:libmosquitto1 = "${libdir}/libmosquitto.so.*" + +FILES:libmosquittopp1 = "${libdir}/libmosquittopp.so.*" + +FILES:${PN}-clients = "${bindir}/mosquitto_pub \ + ${bindir}/mosquitto_sub \ + ${bindir}/mosquitto_rr \ +" + +FILES:${PN}-examples = "${sysconfdir}/mosquitto/*.example" + +SYSTEMD_SERVICE:${PN} = "mosquitto.service" + +INITSCRIPT_NAME = "mosquitto" +INITSCRIPT_PARAMS = "defaults 30" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ + --user-group mosquitto" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch index ddc44c3ca0..613858f6fd 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch @@ -10,14 +10,17 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 8645aee..50fc0da 100644 +index 0368e41..53d6a9d 100644 --- a/Makefile +++ b/Makefile -@@ -7,7 +7,6 @@ BUILDFLAGS = \ - -D_XOPEN_SOURCE=500 \ +@@ -8,7 +8,6 @@ BUILDFLAGS = \ -DSBINDIR=\"$(SBINDIR)\" \ + -I${CURDIR}/include \ -Wall \ - -Werror \ $(NULL) - SYSTEMD_GENERATOR_DIR=$(shell pkg-config --variable=systemdsystemgeneratordir systemd) + SRCS = \ +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch index c7d371dfa0..8779c251a5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch @@ -4,18 +4,17 @@ Date: Fri, 25 Dec 2020 11:41:43 +0900 Subject: [PATCH] don't fail if GLOB_BRACE is not defined Signed-off-by: Zang Ruochen - --- src/util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util.c b/src/util.c -index a4c0dba..fd4542d 100644 +index 841ec12..59595da 100644 --- a/src/util.c +++ b/src/util.c -@@ -25,6 +25,12 @@ - #include "util.h" - #include "netplan.h" +@@ -32,6 +32,12 @@ + #include "names.h" + #include "yaml-helpers.h" +/* Don't fail if the standard library + * doesn't provide brace expansion */ @@ -23,6 +22,9 @@ index a4c0dba..fd4542d 100644 +#define GLOB_BRACE 0 +#endif + - GHashTable* wifi_frequency_24; - GHashTable* wifi_frequency_5; + NETPLAN_ABI GHashTable* + wifi_frequency_24; +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch deleted file mode 100644 index 72f04a15ad..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2f0ff65eaa93f18d9edb5d03329b00d8e5e73869 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= -Date: Wed, 4 Aug 2021 15:55:00 +0200 -Subject: [PATCH] parse-nm: fix 32bit format string - ---- - src/parse-nm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/parse-nm.c b/src/parse-nm.c -index 9b09e34..bf998b7 100644 ---- a/src/parse-nm.c -+++ b/src/parse-nm.c -@@ -136,7 +136,7 @@ static void - handle_bridge_uint(GKeyFile* kf, const gchar* key, NetplanNetDefinition* nd, char** dataptr) { - if (g_key_file_get_uint64(kf, "bridge", key, NULL)) { - nd->custom_bridging = TRUE; -- *dataptr = g_strdup_printf("%lu", g_key_file_get_uint64(kf, "bridge", key, NULL)); -+ *dataptr = g_strdup_printf("%"G_GUINT64_FORMAT, g_key_file_get_uint64(kf, "bridge", key, NULL)); - _kf_clear_key(kf, "bridge", key); - } - } --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb deleted file mode 100644 index 81e20b9c8e..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "The network configuration abstraction renderer" -DESCRIPTION = "Netplan is a utility for easily configuring networking on a \ -linux system. You simply create a YAML description of the required network \ -interfaces and what each should be configured to do. From this description \ -Netplan will generate all the necessary configuration for your chosen renderer \ -tool." -HOMEPAGE = "https://netplan.io" -SECTION = "net/misc" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -S = "${WORKDIR}/git" -SRCREV = "51c872d856db80281ea810ebc02e05c09d5310fa" -PV = "0.103" - -SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ - file://0001-parse-nm-fix-32bit-format-string.patch \ - file://0001-Makefile-do-not-use-Werror.patch \ - " - -SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" - -DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -RDEPENDS:${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid libnetplan" - -inherit pkgconfig systemd - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OEMAKE = "generate netplan/_features.py" -EXTRA_OEMAKE =+ "${@bb.utils.contains('DISTRO_FEATURES','systemd','netplan-dbus dbus/io.netplan.Netplan.service','',d)}" - -do_install() { - install -d ${D}${sbindir} ${D}${libdir} ${D}${base_libdir}/netplan ${D}${datadir}/netplan/netplan/cli/commands ${D}${sysconfdir}/netplan - install -m 755 ${S}/generate ${D}${base_libdir}/netplan/ - install -m 644 ${S}/netplan/*.py ${D}${datadir}/netplan/netplan - install -m 644 ${S}/netplan/cli/*.py ${D}${datadir}/netplan/netplan/cli - install -m 644 ${S}/netplan/cli/commands/*.py ${D}${datadir}/netplan/netplan/cli/commands - install -m 755 ${S}/src/netplan.script ${D}${datadir}/netplan/ - ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan - sed -i -e "s#/lib/netplan/generate#${base_libdir}/netplan/generate#" ${D}${datadir}/netplan/netplan/cli/utils.py - - install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators - ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${datadir}/dbus-1/system.d ${D}${datadir}/dbus-1/system-services - install -m 755 ${S}/netplan-dbus ${D}${base_libdir}/netplan - install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d - install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services - sed -i -e "s#^Exec=/lib/#Exec=${base_libdir}/#" ${D}${datadir}/dbus-1/system-services/io.netplan.Netplan.service - fi - - install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} - ln -rfs ${D}${libdir}/libnetplan.so.0.0 ${D}${libdir}/libnetplan.so -} - -PACKAGES += "${PN}-dbus libnetplan" - -FILES:libnetplan = "${libdir}/libnetplan.so.0.0" -FILES:${PN} = "${sbindir} ${base_libdir}/netplan/generate ${datadir}/netplan ${sysconfdir}/netplan ${systemd_unitdir}" -FILES:${PN}-dbus = "${base_libdir}/netplan/netplan-dbus ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb new file mode 100644 index 0000000000..e26649744c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb @@ -0,0 +1,67 @@ +SUMMARY = "The network configuration abstraction renderer" +DESCRIPTION = "Netplan is a utility for easily configuring networking on a \ +linux system. You simply create a YAML description of the required network \ +interfaces and what each should be configured to do. From this description \ +Netplan will generate all the necessary configuration for your chosen renderer \ +tool." +HOMEPAGE = "https://netplan.io" +SECTION = "net/misc" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +S = "${WORKDIR}/git" +SRCREV = "3e522b7255310bdecca6c781137741dfc4abc021" +PV = "0.104" + +SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ + file://0001-Makefile-do-not-use-Werror.patch \ + " + +SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" + +DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG ?= "" + +PACKAGECONFIG[tests] = ",,,python3-nose python3-coverage python3-netifaces python3-pycodestyle python3-pyflakes python3-pyyaml" + +RDEPENDS:${PN} = "python3 python3-core python3-netifaces python3-pyyaml util-linux-libuuid libnetplan" + +inherit pkgconfig systemd + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OEMAKE = "generate netplan/_features.py" +EXTRA_OEMAKE =+ "${@bb.utils.contains('DISTRO_FEATURES','systemd','netplan-dbus dbus/io.netplan.Netplan.service','',d)}" + +do_install() { + install -d ${D}${sbindir} ${D}${libdir} ${D}${base_libdir}/netplan ${D}${datadir}/netplan/netplan/cli/commands ${D}${sysconfdir}/netplan + install -m 755 ${S}/generate ${D}${base_libdir}/netplan/ + install -m 644 ${S}/netplan/*.py ${D}${datadir}/netplan/netplan + install -m 644 ${S}/netplan/cli/*.py ${D}${datadir}/netplan/netplan/cli + install -m 644 ${S}/netplan/cli/commands/*.py ${D}${datadir}/netplan/netplan/cli/commands + install -m 755 ${S}/src/netplan.script ${D}${datadir}/netplan/ + ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan + sed -i -e "s#/lib/netplan/generate#${base_libdir}/netplan/generate#" ${D}${datadir}/netplan/netplan/cli/utils.py + + install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators + ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${datadir}/dbus-1/system.d ${D}${datadir}/dbus-1/system-services + install -m 755 ${S}/netplan-dbus ${D}${base_libdir}/netplan + install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d + install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services + sed -i -e "s#^Exec=/lib/#Exec=${base_libdir}/#" ${D}${datadir}/dbus-1/system-services/io.netplan.Netplan.service + fi + + install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} + ln -rfs ${D}${libdir}/libnetplan.so.0.0 ${D}${libdir}/libnetplan.so +} + +PACKAGES += "${PN}-dbus libnetplan" + +FILES:libnetplan = "${libdir}/libnetplan.so.0.0" +FILES:${PN} = "${sbindir} ${base_libdir}/netplan/generate ${datadir}/netplan ${sysconfdir}/netplan ${systemd_unitdir}" +FILES:${PN}-dbus = "${base_libdir}/netplan/netplan-dbus ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb deleted file mode 100644 index 0e125891e9..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.11.bb +++ /dev/null @@ -1,342 +0,0 @@ -HOMEPAGE = "https://www.samba.org/" -SECTION = "console/network" - -LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" - -SAMBA_MIRROR = "http://samba.org/samba/ftp" -MIRRORS += "\ -${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ -${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ -" - -SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ - file://smb.conf \ - file://volatiles.03_samba \ - file://0001-Don-t-check-xsltproc-manpages.patch \ - file://0002-do-not-import-target-module-while-cross-compile.patch \ - file://0003-Add-config-option-without-valgrind.patch \ - file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ - file://0005-samba-build-dnsserver_common-code.patch \ - file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ - " - -SRC_URI:append:libc-musl = " \ - file://netdb_defines.patch \ - file://samba-pam.patch \ - file://samba-4.3.9-remove-getpwent_r.patch \ - file://cmocka-uintptr_t.patch \ - file://samba-fix-musl-lib-without-innetgr.patch \ - " - -SRC_URI[sha256sum] = "3d9ebbf3280c7cf5eac1b15aeff8857b31151abaec4d2987be015a66c2945d98" - -UPSTREAM_CHECK_REGEX = "samba\-(?P4\.14(\.\d+)+).tar.gz" - -inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig - -# CVE-2011-2411 is valnerble only on HP NonStop Servers. -CVE_CHECK_WHITELIST += "CVE-2011-2411" - -# remove default added RDEPENDS on perl -RDEPENDS:${PN}:remove = "perl" - -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson libparse-yapp-perl-native gnutls" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" - -DEPENDS:append:libc-musl = " libtirpc" -CFLAGS:append:libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS:append:libc-musl = " -ltirpc" - -COMPATIBLE_HOST:riscv32 = "null" - -INITSCRIPT_NAME = "samba" -INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." - -SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" -SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service" -SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" -SYSTEMD_SERVICE:winbind = "winbind.service" - -# There are prerequisite settings to enable ad-dc, so disable the service by default. -# Reference: -# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller -SYSTEMD_AUTO_ENABLE:${PN}-ad-dc = "disable" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -# Use krb5. Build active domain controller. -# -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl cups ad-dc ldap mitkrb5 \ -" - -RDEPENDS:${PN}-ctdb-tests += "bash util-linux-getopt" - -PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" -PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[sasl] = ",,cyrus-sasl" -PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" -PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" -PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," -PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" -PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" -PACKAGECONFIG[libunwind] = ", , libunwind" -PACKAGECONFIG[gpgme] = ",--without-gpgme,," -PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," -PACKAGECONFIG[libbsd] = "--with-libbsd, --without-libbsd, libbsd" -PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,python3-markdown python3-dnspython," -PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," - -SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" -SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" -SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" -SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" - -# These libraries are supposed to replace others supplied by packages, but decorate the names of -# .so files so there will not be a conflict. This is not done consistantly, so be very careful -# when adding to this list. -# -SAMBA4_LIBS="heimdal,cmocka,NONE" - -EXTRA_OECONF += "--enable-fhs \ - --with-piddir=/run \ - --with-sockets-dir=/run/samba \ - --with-modulesdir=${libdir}/samba \ - --with-lockdir=${localstatedir}/lib/samba \ - --with-cachedir=${localstatedir}/lib/samba \ - --disable-rpath-install \ - --with-shared-modules=${SAMBA4_MODULES} \ - --bundled-libraries=${SAMBA4_LIBS} \ - ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \ - --with-profiling-data \ - --with-libiconv=${STAGING_DIR_HOST}${prefix} \ - --with-pam --with-pammodulesdir=${base_libdir}/security \ - " - -LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -do_configure:append () { - cd ${S}/pidl/ - perl Makefile.PL PREFIX=${prefix} - sed -e 's,VENDORPREFIX)/lib/perl,VENDORPREFIX)/${baselib}/perl,g' \ - -e 's,PERLPREFIX)/lib/perl,PERLPREFIX)/${baselib}/perl,g' -i Makefile - -} - -do_compile:append () { - oe_runmake -C ${S}/pidl -} - -do_install:append() { - for section in 1 5 7; do - install -d ${D}${mandir}/man$section - install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section - done - for section in 1 5 7 8; do - install -d ${D}${mandir}/man$section - install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section - done - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ - sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ - -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ - -i ${D}${systemd_system_unitdir}/*.service - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then - rm -f ${D}${systemd_system_unitdir}/samba.service - fi - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf - echo "d ${localstatedir}/log/samba 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - install -d ${D}${sysconfdir}/init.d - install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba - sed -e 's,/opt/samba/bin,${sbindir},g' \ - -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ - -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ - -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ - -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba - - install -d ${D}${sysconfdir}/samba - echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts - install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba - - install -d ${D}${sysconfdir}/default - install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba - - # the items are from ctdb/tests/run_tests.sh - for d in cunit eventd eventscripts onnode shellcheck takeover takeover_helper tool; do - testdir=${D}${datadir}/ctdb-tests/UNIT/$d - install -d $testdir - cp ${S}/ctdb/tests/UNIT/$d/*.sh $testdir - cp -r ${S}/ctdb/tests/UNIT/$d/scripts ${S}/ctdb/tests/UNIT/$d/stubs $testdir || true - done - - # fix file-rdeps qa warning - if [ -f ${D}${bindir}/onnode ]; then - sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode - fi - - chmod 0750 ${D}${sysconfdir}/sudoers.d || true - rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log - - for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate samba_downgrade_db; do - if [ -f "${D}${sbindir}/$f" ]; then - sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f - fi - done - if [ -f "${D}${bindir}/samba-tool" ]; then - sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool - fi - - oe_runmake -C ${S}/pidl DESTDIR=${D} install_vendor - find ${D}${libdir}/ -type f -name "perllocal.pod" | xargs rm -f - rm -rf ${D}${libdir}/perl5/vendor_perl/${PERLVERSION}/${BUILD_SYS}/auto/Parse/Pidl/.packlist - sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl -} - -PACKAGES =+ "${PN}-python3 ${PN}-pidl \ - ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ - winbind \ - ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ - smbclient ${PN}-client ${PN}-server ${PN}-test" - -python samba_populate_packages() { - def module_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN') - d.appendVar('RRECOMMENDS:%s-base' % pn, ' %s' % pkg) - - mlprefix = d.getVar('MLPREFIX') or '' - pam_libdir = d.expand('${base_libdir}/security') - pam_pkgname = mlprefix + 'pam-plugin%s' - do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) - - libdir = d.getVar('libdir') - do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) - pkglibdir = '%s/samba' % libdir - do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) - moduledir = '%s/samba/auth' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) - moduledir = '%s/samba/pdb' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) -} - -PACKAGESPLITFUNCS:prepend = "samba_populate_packages " -PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" - -RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" -RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb" - -FILES:${PN}-base = "${sbindir}/nmbd \ - ${sbindir}/smbd \ - ${sysconfdir}/init.d \ - ${systemd_system_unitdir}/nmb.service \ - ${systemd_system_unitdir}/smb.service" - -FILES:${PN}-ad-dc = "${sbindir}/samba \ - ${systemd_system_unitdir}/samba.service \ - ${libdir}/krb5/plugins/kdb/samba.so \ -" -RDEPENDS:${PN}-ad-dc = "krb5-kdc" - -FILES:${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ - ${bindir}/ctdb_run_cluster_tests \ - ${sysconfdir}/ctdb/nodes \ - ${datadir}/ctdb-tests \ - ${datadir}/ctdb/tests \ - ${localstatedir}/lib/ctdb \ - " - -FILES:${BPN}-common = "${sysconfdir}/default \ - ${sysconfdir}/samba \ - ${sysconfdir}/tmpfiles.d \ - ${localstatedir}/lib/samba \ - ${localstatedir}/spool/samba \ -" - -FILES:${PN} += "${libdir}/vfs/*.so \ - ${libdir}/charset/*.so \ - ${libdir}/*.dat \ - ${libdir}/auth/*.so \ - ${datadir}/ctdb/events/* \ -" - -FILES:${PN}-dsdb-modules = "${libdir}/samba/ldb" - -FILES:${PN}-testsuite = "${bindir}/gentest \ - ${bindir}/locktest \ - ${bindir}/masktest \ - ${bindir}/ndrdump \ - ${bindir}/smbtorture" - -FILES:registry-tools = "${bindir}/regdiff \ - ${bindir}/regpatch \ - ${bindir}/regshell \ - ${bindir}/regtree" - -FILES:winbind = "${sbindir}/winbindd \ - ${bindir}/wbinfo \ - ${bindir}/ntlm_auth \ - ${libdir}/samba/idmap \ - ${libdir}/samba/nss_info \ - ${libdir}/winbind_krb5_locator.so \ - ${libdir}/winbind-krb5-localauth.so \ - ${sysconfdir}/init.d/winbind \ - ${systemd_system_unitdir}/winbind.service" - -FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" - -FILES:smbclient = "${bindir}/cifsdd \ - ${bindir}/rpcclient \ - ${bindir}/smbcacls \ - ${bindir}/smbclient \ - ${bindir}/smbcquotas \ - ${bindir}/smbget \ - ${bindir}/smbspool \ - ${bindir}/smbtar \ - ${bindir}/smbtree \ - ${libdir}/samba/smbspool_krb5_wrapper" - -RDEPENDS:${PN}-pidl:append = " perl libparse-yapp-perl" -FILES:${PN}-pidl = "${bindir}/pidl \ - ${libdir}/perl5 \ - " - -RDEPENDS:${PN}-client = "\ - smbclient \ - winbind \ - registry-tools \ - ${PN}-pidl \ - " - -ALLOW_EMPTY:${PN}-client = "1" - -RDEPENDS:${PN}-server = "\ - ${PN} \ - winbind \ - registry-tools \ - " - -ALLOW_EMPTY:${PN}-server = "1" - -RDEPENDS:${PN}-test = "\ - ${PN}-ctdb-tests \ - ${PN}-testsuite \ - " - -ALLOW_EMPTY:${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb new file mode 100644 index 0000000000..84eee44195 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb @@ -0,0 +1,342 @@ +HOMEPAGE = "https://www.samba.org/" +SECTION = "console/network" + +LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ + file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" + +SAMBA_MIRROR = "http://samba.org/samba/ftp" +MIRRORS += "\ +${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ +${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ +" + +SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ + file://smb.conf \ + file://volatiles.03_samba \ + file://0001-Don-t-check-xsltproc-manpages.patch \ + file://0002-do-not-import-target-module-while-cross-compile.patch \ + file://0003-Add-config-option-without-valgrind.patch \ + file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ + file://0005-samba-build-dnsserver_common-code.patch \ + file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ + " + +SRC_URI:append:libc-musl = " \ + file://netdb_defines.patch \ + file://samba-pam.patch \ + file://samba-4.3.9-remove-getpwent_r.patch \ + file://cmocka-uintptr_t.patch \ + file://samba-fix-musl-lib-without-innetgr.patch \ + " + +SRC_URI[sha256sum] = "155d9c2dfb06a18104422987590858bfe5e9783ebebe63882e7e7f07eaaa512d" + +UPSTREAM_CHECK_REGEX = "samba\-(?P4\.14(\.\d+)+).tar.gz" + +inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig + +# CVE-2011-2411 is valnerble only on HP NonStop Servers. +CVE_CHECK_IGNORE += "CVE-2011-2411" + +# remove default added RDEPENDS on perl +RDEPENDS:${PN}:remove = "perl" + +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson libparse-yapp-perl-native gnutls" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +DEPENDS:append:libc-musl = " libtirpc" +CFLAGS:append:libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS:append:libc-musl = " -ltirpc" + +COMPATIBLE_HOST:riscv32 = "null" + +INITSCRIPT_NAME = "samba" +INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." + +SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" +SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" +SYSTEMD_SERVICE:winbind = "winbind.service" + +# There are prerequisite settings to enable ad-dc, so disable the service by default. +# Reference: +# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller +SYSTEMD_AUTO_ENABLE:${PN}-ad-dc = "disable" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +# Use krb5. Build active domain controller. +# +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ + acl cups ad-dc ldap mitkrb5 \ +" + +RDEPENDS:${PN}-ctdb-tests += "bash util-linux-getopt" + +PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" +PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[sasl] = ",,cyrus-sasl" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" +PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," +PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" +PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libunwind] = ", , libunwind" +PACKAGECONFIG[gpgme] = ",--without-gpgme,," +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," +PACKAGECONFIG[libbsd] = "--with-libbsd, --without-libbsd, libbsd" +PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,python3-markdown python3-dnspython," +PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," + +SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" +SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" +SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" +SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" + +# These libraries are supposed to replace others supplied by packages, but decorate the names of +# .so files so there will not be a conflict. This is not done consistantly, so be very careful +# when adding to this list. +# +SAMBA4_LIBS="heimdal,cmocka,NONE" + +EXTRA_OECONF += "--enable-fhs \ + --with-piddir=/run \ + --with-sockets-dir=/run/samba \ + --with-modulesdir=${libdir}/samba \ + --with-lockdir=${localstatedir}/lib/samba \ + --with-cachedir=${localstatedir}/lib/samba \ + --disable-rpath-install \ + --with-shared-modules=${SAMBA4_MODULES} \ + --bundled-libraries=${SAMBA4_LIBS} \ + ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ + --with-cluster-support \ + --with-profiling-data \ + --with-libiconv=${STAGING_DIR_HOST}${prefix} \ + --with-pam --with-pammodulesdir=${base_libdir}/security \ + " + +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +do_configure:append () { + cd ${S}/pidl/ + perl Makefile.PL PREFIX=${prefix} + sed -e 's,VENDORPREFIX)/lib/perl,VENDORPREFIX)/${baselib}/perl,g' \ + -e 's,PERLPREFIX)/lib/perl,PERLPREFIX)/${baselib}/perl,g' -i Makefile + +} + +do_compile:append () { + oe_runmake -C ${S}/pidl +} + +do_install:append() { + for section in 1 5 7; do + install -d ${D}${mandir}/man$section + install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section + done + for section in 1 5 7 8; do + install -d ${D}${mandir}/man$section + install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section + done + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ + sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ + -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ + -i ${D}${systemd_system_unitdir}/*.service + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then + rm -f ${D}${systemd_system_unitdir}/samba.service + fi + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf + install -d ${D}${sysconfdir}/init.d + install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba + sed -e 's,/opt/samba/bin,${sbindir},g' \ + -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ + -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ + -e 's,/usr/bin,${base_bindir},g' \ + -i ${D}${sysconfdir}/init.d/samba + + install -d ${D}${sysconfdir}/samba + echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts + install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba + + install -d ${D}${sysconfdir}/default + install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba + + # the items are from ctdb/tests/run_tests.sh + for d in cunit eventd eventscripts onnode shellcheck takeover takeover_helper tool; do + testdir=${D}${datadir}/ctdb-tests/UNIT/$d + install -d $testdir + cp ${S}/ctdb/tests/UNIT/$d/*.sh $testdir + cp -r ${S}/ctdb/tests/UNIT/$d/scripts ${S}/ctdb/tests/UNIT/$d/stubs $testdir || true + done + + # fix file-rdeps qa warning + if [ -f ${D}${bindir}/onnode ]; then + sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode + fi + + chmod 0750 ${D}${sysconfdir}/sudoers.d || true + rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log + + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate samba_downgrade_db; do + if [ -f "${D}${sbindir}/$f" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f + fi + done + if [ -f "${D}${bindir}/samba-tool" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool + fi + + oe_runmake -C ${S}/pidl DESTDIR=${D} install_vendor + find ${D}${libdir}/ -type f -name "perllocal.pod" | xargs rm -f + rm -rf ${D}${libdir}/perl5/vendor_perl/${PERLVERSION}/${BUILD_SYS}/auto/Parse/Pidl/.packlist + sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl +} + +PACKAGES =+ "${PN}-python3 ${PN}-pidl \ + ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ + winbind \ + ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ + smbclient ${PN}-client ${PN}-server ${PN}-test" + +python samba_populate_packages() { + def module_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN') + d.appendVar('RRECOMMENDS:%s-base' % pn, ' %s' % pkg) + + mlprefix = d.getVar('MLPREFIX') or '' + pam_libdir = d.expand('${base_libdir}/security') + pam_pkgname = mlprefix + 'pam-plugin%s' + do_split_packages(d, pam_libdir, r'^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) + + libdir = d.getVar('libdir') + do_split_packages(d, libdir, r'^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) + pkglibdir = '%s/samba' % libdir + do_split_packages(d, pkglibdir, r'^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) + moduledir = '%s/samba/auth' % libdir + do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) + moduledir = '%s/samba/pdb' % libdir + do_split_packages(d, moduledir, r'^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) +} + +PACKAGESPLITFUNCS:prepend = "samba_populate_packages " +PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" + +RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" +RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb" + +FILES:${PN}-base = "${sbindir}/nmbd \ + ${sbindir}/smbd \ + ${sysconfdir}/init.d \ + ${systemd_system_unitdir}/nmb.service \ + ${systemd_system_unitdir}/smb.service" + +FILES:${PN}-ad-dc = "${sbindir}/samba \ + ${systemd_system_unitdir}/samba.service \ + ${libdir}/krb5/plugins/kdb/samba.so \ +" +RDEPENDS:${PN}-ad-dc = "krb5-kdc" + +FILES:${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ + ${bindir}/ctdb_run_cluster_tests \ + ${sysconfdir}/ctdb/nodes \ + ${datadir}/ctdb-tests \ + ${datadir}/ctdb/tests \ + ${localstatedir}/lib/ctdb \ + " + +FILES:${BPN}-common = "${sysconfdir}/default \ + ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ + ${localstatedir}/lib/samba \ + ${localstatedir}/spool/samba \ +" + +FILES:${PN} += "${libdir}/vfs/*.so \ + ${libdir}/charset/*.so \ + ${libdir}/*.dat \ + ${libdir}/auth/*.so \ + ${datadir}/ctdb/events/* \ +" + +FILES:${PN}-dsdb-modules = "${libdir}/samba/ldb" + +FILES:${PN}-testsuite = "${bindir}/gentest \ + ${bindir}/locktest \ + ${bindir}/masktest \ + ${bindir}/ndrdump \ + ${bindir}/smbtorture" + +FILES:registry-tools = "${bindir}/regdiff \ + ${bindir}/regpatch \ + ${bindir}/regshell \ + ${bindir}/regtree" + +FILES:winbind = "${sbindir}/winbindd \ + ${bindir}/wbinfo \ + ${bindir}/ntlm_auth \ + ${libdir}/samba/idmap \ + ${libdir}/samba/nss_info \ + ${libdir}/winbind_krb5_locator.so \ + ${libdir}/winbind-krb5-localauth.so \ + ${sysconfdir}/init.d/winbind \ + ${systemd_system_unitdir}/winbind.service" + +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +FILES:smbclient = "${bindir}/cifsdd \ + ${bindir}/rpcclient \ + ${bindir}/smbcacls \ + ${bindir}/smbclient \ + ${bindir}/smbcquotas \ + ${bindir}/smbget \ + ${bindir}/smbspool \ + ${bindir}/smbtar \ + ${bindir}/smbtree \ + ${libdir}/samba/smbspool_krb5_wrapper" + +RDEPENDS:${PN}-pidl:append = " perl libparse-yapp-perl" +FILES:${PN}-pidl = "${bindir}/pidl \ + ${libdir}/perl5 \ + " + +RDEPENDS:${PN}-client = "\ + smbclient \ + winbind \ + registry-tools \ + ${PN}-pidl \ + " + +ALLOW_EMPTY:${PN}-client = "1" + +RDEPENDS:${PN}-server = "\ + ${PN} \ + winbind \ + registry-tools \ + " + +ALLOW_EMPTY:${PN}-server = "1" + +RDEPENDS:${PN}-test = "\ + ${PN}-ctdb-tests \ + ${PN}-testsuite \ + " + +ALLOW_EMPTY:${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb deleted file mode 100644 index 7b43b06781..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.1.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" -DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ - in C and optimized for embedded and RTOS environments. It can \ - be up to 20 times smaller than OpenSSL while still supporting \ - a full TLS client and server, up to TLS 1.3" -HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" -BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PROVIDES += "cyassl" -RPROVIDES:${PN} = "cyassl" - -SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" -SRCREV = "2b670c026debc8e70621eb5c75b60931c9aa0bc5" - -S = "${WORKDIR}/git" - -inherit autotools - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb new file mode 100644 index 0000000000..a597fb3ccd --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" +DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ + in C and optimized for embedded and RTOS environments. It can \ + be up to 20 times smaller than OpenSSL while still supporting \ + a full TLS client and server, up to TLS 1.3" +HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" +BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PROVIDES += "cyassl" +RPROVIDES:${PN} = "cyassl" + +SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" +SRCREV = "e6c07a296d2996e8d5c3cc615dfc50013bbcc794" + +S = "${WORKDIR}/git" + +inherit autotools + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index a539dfeb6c..892ecc7746 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -211,11 +211,12 @@ RDEPENDS:packagegroup-meta-networking-support = "\ netcat \ netcat-openbsd \ libtdb \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "non-commercial", "netperf", "", d)} \ yp-tools \ ypbind-mt \ yp-tools \ mtr \ + netsniff-ng \ ntp ntpdate sntp ntpdc ntpq ntp-tickadj ntp-utils \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "ntpsec", "", d)} \ nbd-client \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index 7a6243b10b..43b69f7a21 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -98,4 +98,4 @@ FILES:${PN}-staticdev += "${libdir}/sasl2/*.a" INSANE_SKIP:${PN} += "dev-so" # CVE-2020-8032 affects only openSUSE -CVE_CHECK_WHITELIST += "CVE-2020-8032" +CVE_CHECK_IGNORE += "CVE-2020-8032" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch deleted file mode 100644 index ba0ca4ca0a..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 424d5967e94f6adf4c0669d390779af8da0bef20 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Sat, 18 Sep 2021 16:10:50 -0700 -Subject: [PATCH] Fix compiler error introduced with recent IPv6 commit. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 76350316de38 ("Handle IPv6 interfaces correctly.") added -a string copy that creates this gcc-11 error message: - -> gcc-11 -O2 -g -Wall -Werror -Wextra -fvisibility=hidden -fPIC -I/usr/include/kmod -c -o idbm.o idbm.c -> idbm.c: In function ‘_idbm_node_rec_link’: -> idbm.c:999:17: error: ‘strncpy’ specified bound 65 equals destination size [-Werror=stringop-truncation] -> 999 | strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN); -> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -So copy one less character, maximum. - -Upstream-Status: Backport -[https://github.com/open-iscsi/open-iscsi/commit/424d5967e94f6adf4c0669d390779af8da0bef20] - -Signed-off-by: Yi Zhao ---- - libopeniscsiusr/idbm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c -index b2524ed..6f57e45 100644 ---- a/libopeniscsiusr/idbm.c -+++ b/libopeniscsiusr/idbm.c -@@ -996,7 +996,7 @@ static void _idbm_node_rec_link(struct iscsi_node *node, struct idbm_rec *recs, - - /* use the interface name passed in, if any */ - if (iface_name) -- strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN); -+ strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN-1); - - /* - * Note: because we do not add the iface.iscsi_ifacename to --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb deleted file mode 100644 index 26b5b5c34b..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb +++ /dev/null @@ -1,118 +0,0 @@ -SUMMARY = "iSCSI daemon and utility programs" -DESCRIPTION = "Open-iSCSI project is a high performance, transport \ -independent, multi-platform implementation of RFC3720. The iscsi package \ -provides the server daemon for the iSCSI protocol, as well as the utility \ -programs used to manage it. iSCSI is a protocol for distributed \ -disk access using SCSI commands sent over Internet Protocol networks." -HOMEPAGE = "http://www.open-iscsi.com/" -LICENSE = "GPLv2 & LGPLv2.1" -SECTION = "net" -DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV ?= "20d0aa96f2170339b1967f4be81e9c5042bbce03" - -SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ - file://0001-Makefile-Do-not-set-Werror.patch \ - file://0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch \ - file://initd.debian \ - file://99_iscsi-initiator-utils \ - file://iscsi-initiator \ - file://iscsi-initiator.service \ - file://iscsi-initiator-targets.service \ - file://set_initiatorname \ - " -S = "${WORKDIR}/git" - -inherit update-rc.d systemd autotools pkgconfig - -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ -" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}" - -EXTRA_OEMAKE = ' \ - OS="${TARGET_SYS}" \ - TARGET="${TARGET_OS}" \ - BASE="${prefix}" \ - MANDIR="${mandir}" \ - OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ - PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ -' - - -do_configure () { - cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} -} - -do_compile () { - # Make sure we DO NOT regenerate prom_lex.c. - if [ -f ${S}/utils/fwparam_ibft/prom_lex.l ]; then - mv ${S}/utils/fwparam_ibft/prom_lex.l ${S}/utils/fwparam_ibft/prom_lex.l.unused - fi - oe_runmake -C ${S} ${EXTRA_OEMAKE} user -} - -do_install () { - #install necessary directories - install -d ${D}${sbindir} \ - ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/iscsi \ - ${D}${localstatedir}/lib/iscsi/nodes \ - ${D}${localstatedir}/lib/iscsi/send_targets \ - ${D}${localstatedir}/lib/iscsi/static \ - ${D}${localstatedir}/lib/iscsi/isns \ - ${D}${localstatedir}/lib/iscsi/slp \ - ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}${libdir} \ - ${D}${mandir}/man8 - - install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ - ${S}/utils/iscsi-iname \ - ${S}/usr/iscsistart ${D}/${sbindir} - - cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} - install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 - install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi - install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid - - sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /run/${BPN}/lock - - - -" \ - > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf - install -d ${D}/etc/default/ - install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/iscsi-initiator.service \ - ${WORKDIR}/iscsi-initiator-targets.service \ - ${D}${systemd_unitdir}/system/ - install -d ${D}${nonarch_libdir}/iscsi - install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi - else - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles - fi -} - -pkg_postinst:${PN}() { - if [ "x$D" = "x" ]; then - if [ -e /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - elif command -v systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf - fi - fi -} - -SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " -INITSCRIPT_NAME = "iscsid" -INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." - -FILES:${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb new file mode 100644 index 0000000000..e85fdd7856 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb @@ -0,0 +1,117 @@ +SUMMARY = "iSCSI daemon and utility programs" +DESCRIPTION = "Open-iSCSI project is a high performance, transport \ +independent, multi-platform implementation of RFC3720. The iscsi package \ +provides the server daemon for the iSCSI protocol, as well as the utility \ +programs used to manage it. iSCSI is a protocol for distributed \ +disk access using SCSI commands sent over Internet Protocol networks." +HOMEPAGE = "http://www.open-iscsi.com/" +LICENSE = "GPLv2 & LGPLv2.1" +SECTION = "net" +DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV ?= "ee575fd19429ec6dc24b49f2ce3822b4a01f57de" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ + file://0001-Makefile-Do-not-set-Werror.patch \ + file://initd.debian \ + file://99_iscsi-initiator-utils \ + file://iscsi-initiator \ + file://iscsi-initiator.service \ + file://iscsi-initiator-targets.service \ + file://set_initiatorname \ + " +S = "${WORKDIR}/git" + +inherit update-rc.d systemd autotools pkgconfig + +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ +" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}" + +EXTRA_OEMAKE = ' \ + OS="${TARGET_SYS}" \ + TARGET="${TARGET_OS}" \ + BASE="${prefix}" \ + MANDIR="${mandir}" \ + OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ + PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ +' + + +do_configure () { + cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} +} + +do_compile () { + # Make sure we DO NOT regenerate prom_lex.c. + if [ -f ${S}/utils/fwparam_ibft/prom_lex.l ]; then + mv ${S}/utils/fwparam_ibft/prom_lex.l ${S}/utils/fwparam_ibft/prom_lex.l.unused + fi + oe_runmake -C ${S} ${EXTRA_OEMAKE} user +} + +do_install () { + #install necessary directories + install -d ${D}${sbindir} \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/iscsi \ + ${D}${localstatedir}/lib/iscsi/nodes \ + ${D}${localstatedir}/lib/iscsi/send_targets \ + ${D}${localstatedir}/lib/iscsi/static \ + ${D}${localstatedir}/lib/iscsi/isns \ + ${D}${localstatedir}/lib/iscsi/slp \ + ${D}${localstatedir}/lib/iscsi/ifaces \ + ${D}${libdir} \ + ${D}${mandir}/man8 + + install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ + ${S}/utils/iscsi-iname \ + ${S}/usr/iscsistart ${D}/${sbindir} + + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} + install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 + install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi + install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid + + sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/${BPN}/lock - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf + install -d ${D}/etc/default/ + install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/iscsi-initiator.service \ + ${WORKDIR}/iscsi-initiator-targets.service \ + ${D}${systemd_unitdir}/system/ + install -d ${D}${nonarch_libdir}/iscsi + install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi + else + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles + fi +} + +pkg_postinst:${PN}() { + if [ "x$D" = "x" ]; then + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + elif command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf + fi + fi +} + +SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " +INITSCRIPT_NAME = "iscsid" +INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." + +FILES:${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.09.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.09.bb deleted file mode 100644 index c24fccf04b..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.09.bb +++ /dev/null @@ -1,95 +0,0 @@ -SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" -DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ -middleware consistent with Service Availability Forum (SA Forum) \ -specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ -established by leading Communications and Enterprise Computing Companies to \ -facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ -code base in commercial products. \ -The OpenSAF project was launched in mid 2007 and has been under development by \ -an informal group of supporters of the OpenSAF initiative. The OpenSAF \ -Foundation was founded on January 22nd 2008 with Emerson Network Power, \ -Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." -HOMEPAGE = "http://www.opensaf.org" -SECTION = "admin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" - -DEPENDS = "libxml2 python3" -TOOLCHAIN = "gcc" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ - file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ - file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ - file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ - file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ - file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ - file://0001-immom_python-convert-to-python3.patch \ - file://0001-Fix-build-with-fno-common.patch \ - file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ - " -SRC_URI[sha256sum] = "227ae1dafb6d51ce6561c9fcaec60087a0183839a8a4da11517e09f2a662b53d" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" - -inherit autotools useradd systemd pkgconfig - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "-f -r opensaf" -USERADD_PARAM:${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" - -SYSTEMD_SERVICE:${PN} += "opensafd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -PACKAGECONFIG[systemd] = ",,systemd" -PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" -PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" - -CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" -CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" -LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" - -do_install:append() { - rm -fr "${D}${localstatedir}/lock" - rm -fr "${D}${localstatedir}/run" - rmdir "${D}${localstatedir}/log/${BPN}/saflog" - rmdir "${D}${localstatedir}/log/${BPN}" - rmdir "${D}${localstatedir}/log" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" - - # Rename /etc/init.d/opensafd to /usr/lib/opensaf/opensafd-init as it is - # needed by opensafd.service, but /etc/init.d is removed by systemd.bbclass - # if sysvinit is not in DISTRO_FEATURES. - mv ${D}${sysconfdir}/init.d/opensafd ${D}${libdir}/${BPN}/opensafd-init - ln -srf ${D}${libdir}/${BPN}/opensafd-init ${D}${sysconfdir}/init.d/opensafd - [ ! -f ${D}${systemd_system_unitdir}/opensafd.service ] || - sed -ri -e "s|/etc/init.d/opensafd|${libdir}/${BPN}/opensafd-init|" ${D}${systemd_system_unitdir}/opensafd.service - - # Create /var/log/opensaf/saflog in runtime. - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then - install -d ${D}${nonarch_libdir}/tmpfiles.d - echo "d ${localstatedir}/log/${BPN}/saflog - - - -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf - fi - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then - install -d ${D}${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/log/${BPN}/saflog none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} - fi -} - -FILES:${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" -FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" -FILES:${PN}-dev += "${libdir}/libopensaf_core.so" -FILES:${PN}-staticdev += "${PKGLIBDIR}/*.a" - -INSANE_SKIP:${PN} = "dev-so" - -RDEPENDS:${PN} += "bash python3-core" - -# http://errors.yoctoproject.org/Errors/Details/186970/ -COMPATIBLE_HOST:libc-musl = 'null' - -FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb new file mode 100644 index 0000000000..b4ee3ed4bd --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb @@ -0,0 +1,95 @@ +SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" +DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ +middleware consistent with Service Availability Forum (SA Forum) \ +specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ +established by leading Communications and Enterprise Computing Companies to \ +facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ +code base in commercial products. \ +The OpenSAF project was launched in mid 2007 and has been under development by \ +an informal group of supporters of the OpenSAF initiative. The OpenSAF \ +Foundation was founded on January 22nd 2008 with Emerson Network Power, \ +Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." +HOMEPAGE = "http://www.opensaf.org" +SECTION = "admin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" + +DEPENDS = "libxml2 python3" +TOOLCHAIN = "gcc" + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ + file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ + file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ + file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ + file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ + file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ + file://0001-immom_python-convert-to-python3.patch \ + file://0001-Fix-build-with-fno-common.patch \ + file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ + " +SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" + +inherit autotools useradd systemd pkgconfig + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "-f -r opensaf" +USERADD_PARAM:${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" + +SYSTEMD_SERVICE:${PN} += "opensafd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +PACKAGECONFIG[systemd] = ",,systemd" +PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" +PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" + +CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" +CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" +LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" + +do_install:append() { + rm -fr "${D}${localstatedir}/lock" + rm -fr "${D}${localstatedir}/run" + rmdir "${D}${localstatedir}/log/${BPN}/saflog" + rmdir "${D}${localstatedir}/log/${BPN}" + rmdir "${D}${localstatedir}/log" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" + + # Rename /etc/init.d/opensafd to /usr/lib/opensaf/opensafd-init as it is + # needed by opensafd.service, but /etc/init.d is removed by systemd.bbclass + # if sysvinit is not in DISTRO_FEATURES. + mv ${D}${sysconfdir}/init.d/opensafd ${D}${libdir}/${BPN}/opensafd-init + ln -srf ${D}${libdir}/${BPN}/opensafd-init ${D}${sysconfdir}/init.d/opensafd + [ ! -f ${D}${systemd_system_unitdir}/opensafd.service ] || + sed -ri -e "s|/etc/init.d/opensafd|${libdir}/${BPN}/opensafd-init|" ${D}${systemd_system_unitdir}/opensafd.service + + # Create /var/log/opensaf/saflog in runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN}/saflog - - - -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/log/${BPN}/saflog none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi +} + +FILES:${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" +FILES:${PN}-dev += "${libdir}/libopensaf_core.so" +FILES:${PN}-staticdev += "${PKGLIBDIR}/*.a" + +INSANE_SKIP:${PN} = "dev-so" + +RDEPENDS:${PN} += "bash python3-core" + +# http://errors.yoctoproject.org/Errors/Details/186970/ +COMPATIBLE_HOST:libc-musl = 'null' + +FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb index 21e5c1877e..fd837629b5 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" SECTION = "net" -RDEPENDS:${PN} += "bash perl" +RDEPENDS:${PN} += "bash" RRECOMMENDS:${PN} += "kernel-module-ebtables \ " diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb index 48b32eb7e2..c45cbcd925 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb @@ -69,4 +69,4 @@ RDEPENDS:${PN}-server += "tcp-wrappers xinetd rpcbind" # http://errors.yoctoproject.org/Errors/Details/186962/ COMPATIBLE_HOST:libc-musl = 'null' -PNBLACKLIST[netkit-rusers] ?= "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or directory" +SKIP_RECIPE[netkit-rusers] ?= "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or directory" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb index 5c6d220200..205dc929be 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.140.1.bb @@ -38,7 +38,7 @@ CVE_PRODUCT = "apple:mdnsresponder" # https://www.incibe-cert.es/en/early-warning/vulnerabilities/cve-2007-0613 # https://security-tracker.debian.org/tracker/CVE-2007-0613 # https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613 -CVE_CHECK_WHITELIST += "CVE-2007-0613" +CVE_CHECK_IGNORE += "CVE-2007-0613" PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb index 464f622502..1017f16add 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb @@ -74,4 +74,4 @@ FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" # CVE-2016-4983 affects only postinstall script on specific distribution -CVE_CHECK_WHITELIST += "CVE-2016-4983" +CVE_CHECK_IGNORE += "CVE-2016-4983" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb index 3ce63c457b..05d42c75ef 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb @@ -21,4 +21,4 @@ do_install () { oe_runmake install DESTDIR="${D}" } -PNBLACKLIST[drbd] ?= "Needs coccinelle to build with SPAAS" +SKIP_RECIPE[drbd] ?= "Needs coccinelle to build with SPAAS" diff --git a/meta-openembedded/meta-networking/recipes-support/fping/fping_5.0.bb b/meta-openembedded/meta-networking/recipes-support/fping/fping_5.0.bb deleted file mode 100644 index 54606e8b64..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/fping/fping_5.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "sends ICMP ECHO_REQUEST packets to network hosts" -DESCRIPTION = "fping is a ping like program which uses the Internet Control \ -Message Protocol (ICMP) echo request to determine if a target host is \ -responding. fping differs from ping in that you can specify any number of \ -targets on the command line, or specify a file containing the lists of \ -targets to ping. Instead of sending to one target until it times out or \ -replies, fping will send out a ping packet and move on to the next target \ -in a round-robin fashion." -HOMEPAGE = "http://www.fping.org/" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" - -SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" -SRC_URI[sha256sum] = "ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8" - -S = "${WORKDIR}/fping-${PV}" - -inherit autotools - -EXTRA_OECONF = "--enable-ipv4" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-openembedded/meta-networking/recipes-support/fping/fping_5.1.bb b/meta-openembedded/meta-networking/recipes-support/fping/fping_5.1.bb new file mode 100644 index 0000000000..f2dd897561 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/fping/fping_5.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "sends ICMP ECHO_REQUEST packets to network hosts" +DESCRIPTION = "fping is a ping like program which uses the Internet Control \ +Message Protocol (ICMP) echo request to determine if a target host is \ +responding. fping differs from ping in that you can specify any number of \ +targets on the command line, or specify a file containing the lists of \ +targets to ping. Instead of sending to one target until it times out or \ +replies, fping will send out a ping packet and move on to the next target \ +in a round-robin fashion." +HOMEPAGE = "http://www.fping.org/" +BUGTRACKER = "https://github.com/schweikert/fping/issues" +SECTION = "net" + +LICENSE = "fping" +NO_GENERIC_LICENSE[fping] = "COPYING" +LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" + +SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" +SRC_URI[sha256sum] = "1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe" + +S = "${WORKDIR}/fping-${PV}" + +inherit autotools + +EXTRA_OECONF = "--enable-ipv4" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 28def7b489..cc6053ba96 100644 --- a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -36,4 +36,4 @@ FILES:${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/" PACKAGES =+ "${PN}-python" FILES:${PN}-python = "${libdir}/python*" -PNBLACKLIST[lowpan-tools] ?= "WARNING these tools are deprecated! Use wpan-tools instead" +SKIP_RECIPE[lowpan-tools] ?= "WARNING these tools are deprecated! Use wpan-tools instead" diff --git a/meta-openembedded/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch new file mode 100644 index 0000000000..e535aedf51 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/files/0001-Cmds-automatically-create-folder.patch @@ -0,0 +1,26 @@ +From 7c00d75d16da18a9998fc4cca28d3c953dd54ceb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= +Date: Mon, 14 Feb 2022 18:37:22 +0100 +Subject: [PATCH] Cmds: automatically create folder + +--- + Cmds | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Cmds b/Cmds +index e590b38..3df23b8 100644 +--- a/Cmds ++++ b/Cmds +@@ -44,7 +44,8 @@ ifeq ("$(origin PREFIX)", "$(filter $(origin PREFIX), file command line)") + INSTX = echo -e " INST\t$(1)" && install -d $(2) && \ + install -C $(1) $(2)/$(shell basename $(1)) + else +- INSTX = echo -e " INST\t$(1)" && install -C $(1) $(2)/$(shell basename $(1)) ++ INSTX = echo -e " INST\t$(1)" && install -d $(2) && \ ++ install -C $(1) $(2)/$(shell basename $(1)) + endif + + MKDIR = echo -e " MKDIR\t$(1)" && mkdir -p $(1) +-- +2.32.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb new file mode 100644 index 0000000000..10e30044e8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Netsniff-ng is a fast zero-copy analyzer, pcap capturing and replaying tool" +HOMEPAGE = "http://netsniff-ng.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9dd40dfb621eed702c0775577fbb7011" +DEPENDS = "libpcap" + +SRCREV = "be3e706f00295024ebc199e70177343fdaebbc9e" +SRC_URI = " \ + git://github.com/netsniff-ng/netsniff-ng.git;protocol=https;branch=master \ + file://0001-Cmds-automatically-create-folder.patch \ + " + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE += " TERM='' " + +PACKAGECONFIG ??= "" +PACKAGECONFIG[zlib] = ",--disable-zlib,zlib," +PACKAGECONFIG[libnl] = ",--disable-libnl,libnl," +PACKAGECONFIG[geoip] = ",--disable-geoip,geoip," + +do_configure() { + ./configure --prefix=${prefix} +} + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} netsniff-ng_install +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch index 0f1ca8d324..bb5bcfbd63 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-Makefile.in-don-t-use-the-internal-lua.patch @@ -15,18 +15,18 @@ Signed-off-by: Mingli Yu 1 file changed, 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index e67623bec..99cb9f06e 100755 +index d737e74..a611b16 100755 --- a/Makefile.in +++ b/Makefile.in -@@ -31,7 +31,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) - LUA_PLATFORM=generi - LUA_HOME=${PWD}/third-party/lua-5.3.5 +@@ -36,7 +36,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME) + LUA_PLATFORM=generic + LUA_HOME=${PWD}/third-party/lua-5.4.3 LUA_INC=-I$(LUA_HOME)/src -LUA_LIB=$(LUA_HOME)/src/liblua.a ifeq ($(OS),Linux) LUA_PLATFORM=linux -@@ -123,7 +122,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm +@@ -102,7 +101,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm ###### @@ -35,5 +35,5 @@ index e67623bec..99cb9f06e 100755 ifneq ($(HAS_ZEROMQ), 0) LIB_TARGETS += $(ZEROMQ_LIB) -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch index 1cbf059efd..d5c7f5f1cc 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch @@ -12,26 +12,24 @@ Signed-off-by: Mingli Yu refresh patch to 4.0 Signed-off-by: Changqing Li --- - autogen.sh | 9 --------- - 1 file changed, 9 deletions(-) + autogen.sh | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/autogen.sh b/autogen.sh -index cf5d7057..cb73cf9d 100755 +index 0aa7507..36e0423 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -52,12 +52,3 @@ cat configure.seed | sed \ - -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ - -e "s/@FUZZY@/$FUZZY/g" \ - > configure.ac +@@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then + echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again" + exit + fi - -autoreconf -ivf --cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp --cat configure.tmp > configure - -echo "./configure $@" -chmod +x configure -./configure $@ - -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch new file mode 100644 index 0000000000..c645110f22 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch @@ -0,0 +1,39 @@ +From a913b85f720f41bf7e5819c0dc4acc252467a8a4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 15 Feb 2022 14:25:07 -0800 +Subject: [PATCH] configure.ac.in: Allow dynamic linking against ndpi 3.0 + +Linking statically is problematic since NDPI_LIBS is '-lndpi -lm' +and when we use -Bstatic it also brings in -lm to use libm.a and on some +architectures ( x86 ) which this does not work and results in missing symbols + +Fixes +ipe-sysroot/usr/lib/libm.a(e_logf.o): in function `logf_ifunc_selector': +/usr/src/debug/glibc/2.35-r0/git/math/../sysdeps/i386/i686/multiarch/ifunc-sse2.h:30: undefined reference to `_dl_x86_cpu_features' + +Upstream-Status: Submitted [https://github.com/ntop/ntopng/pull/6318] +Signed-off-by: Khem Raj +--- + configure.ac.in | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 7f4c0f893..c3299fda2 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -193,10 +193,8 @@ if test -d /usr/local/include/ndpi ; then : + fi + + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ +- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` +- # Use static libndpi library as building against the dynamic library fails +- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" +- #NDPI_LIB="$NDPI_LIBS" ++ NDPI_INC="$NDPI_CFLAGS" ++ NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch new file mode 100644 index 0000000000..d4908e3227 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-configure-error.patch @@ -0,0 +1,42 @@ +From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 4 Nov 2020 04:36:46 +0000 +Subject: [PATCH] configure.ac.in: fix configure error + +fix the below error: +configure: error: cannot run test program while cross compiling + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Mingli Yu +--- + configure.ac.in | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index a321f9bbf..03f9a31b0 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -642,18 +642,7 @@ if test x$radcli = xtrue; then + fi + fi + +-AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [ +- AC_TRY_RUN([ +- #include +- +- int main() { +- pthread_rwlock_t t; +- return 0; +- } +-] +-, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no]) +-] +-) ++AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported]) + + if test "$my_cv_rw_locks_supported" = yes; then + AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported]) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch new file mode 100644 index 0000000000..5e1440b3d6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-fix-host-contamination.patch @@ -0,0 +1,82 @@ +From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 4 Nov 2020 06:28:28 +0000 +Subject: [PATCH] configure.ac.in: fix host contamination + +Fix below error: +This autoconf log indicates errors, it looked at host include and/or +library paths while determining system capabilities. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Mingli Yu +--- + configure.ac.in | 43 +++---------------------------------------- + 1 file changed, 3 insertions(+), 40 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 1d6380c..beffc6c 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -167,31 +167,6 @@ fi + # + REVISION=`git log --pretty=oneline | wc -l` + +-if test -d "/usr/local/include"; then +- CFLAGS="${CFLAGS} -I/usr/local/include" +- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +-fi +- +-if test -d "/usr/local/lib"; then +- LIBS="${LIBS} -L/usr/local/lib" +-fi +- +-if test -d /opt/local/include; then : +- CFLAGS="${CFLAGS} -I/opt/local/include" +- CPPFLAGS="${CPPFLAGS} -I/opt/local/include" +-fi +- +-if test -d /opt/local/lib; then : +- LIBS="${LIBS} -L/opt/local/lib" +-fi +- +-if [ test -f /usr/bin/lsb_release ]; then +- CODENAME=`/usr/bin/lsb_release -c|cut -f 2` +- if [[ $CODENAME == "wheezy" ]]; then : +- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" +- fi +-fi +- + SHORT_MACHINE=`uname -m | cut -b1-3` + + GIT_RELEASE="@GIT_RELEASE@" +@@ -300,23 +275,11 @@ fi + pkg-config --exists libssl + if test "$?" -ne 1; then + AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" ++ SSL_INC="`pkg-config --cflags libssl`" + SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" + else +- dnl Workaround for MacOS Brew +- if test -d "/usr/local/opt/openssl/lib"; then +- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="-I/usr/local/opt/openssl/include" +- SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" +- dnl Workaround for FreeBSD +- elif test -f "/usr/lib/libssl.so"; then +- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="-I/usr/include" +- SSL_LIB="-L/usr/lib -lssl -lcrypto" +- else +- echo "Please install openssl-dev(el) package prerequisite" +- exit -1 +- fi ++ echo "Please install openssl-dev(el) package prerequisite" ++ exit -1 + fi + + AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LIBS="${LIBS} -lgcrypt"]) +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch new file mode 100644 index 0000000000..ffb106723c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.ac.in-not-check-clang-on-host.patch @@ -0,0 +1,44 @@ +From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 9 Nov 2020 04:05:25 +0000 +Subject: [PATCH] configure.ac.in: not check clang on host + +Don't check clang on host to avoid host contamination. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Mingli Yu +--- + configure.ac.in | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 55bd49678..94bc0bc48 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -90,22 +90,6 @@ if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then + CFLAGS="-fno-color-diagnostics $CFLAGS" + fi + fi +-else +- if test $SYSTEM = "Linux"; then +- if [ test -f /usr/bin/clang++ ]; then +- CC=clang +- CXX=clang++ +- AC_MSG_RESULT(Using clang++ compiler) +- fi +- +- if [ test -f /etc/redhat-release ]; then +- OS=`cat /etc/redhat-release` +- else +- if [ test -f /usr/bin/lsb_release ]; then +- OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2` +- fi +- fi +- fi + fi + + dnl> Remove spaces +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch deleted file mode 100644 index dffab24ca2..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-configure-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 29797dd037009d38e4976249ed21b2076240751e Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 4 Nov 2020 04:36:46 +0000 -Subject: [PATCH] configure.seed: fix configure error - -fix the below error: -configure: error: cannot run test program while cross compiling - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Mingli Yu ---- - configure.seed | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/configure.seed b/configure.seed -index a321f9bbf..03f9a31b0 100644 ---- a/configure.seed -+++ b/configure.seed -@@ -642,18 +642,7 @@ if test x$radcli = xtrue; then - fi - fi - --AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported], [ -- AC_TRY_RUN([ -- #include -- -- int main() { -- pthread_rwlock_t t; -- return 0; -- } --] --, [my_cv_rw_locks_supported=yes], [my_cv_rw_locks_supported=no]) --] --) -+AC_CACHE_CHECK([if pthread rwlocks are supported], [my_cv_rw_locks_supported]) - - if test "$my_cv_rw_locks_supported" = yes; then - AC_DEFINE_UNQUOTED(HAVE_RW_LOCK, 1, [pthread rwlocks supported]) --- -2.26.2 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch deleted file mode 100644 index 02cd94a06c..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-fix-host-contamination.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 4 Nov 2020 06:28:28 +0000 -Subject: [PATCH] configure.seed: fix host contamination - -Fix below error: -This autoconf log indicates errors, it looked at host include and/or -library paths while determining system capabilities. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Mingli Yu ---- - configure.seed | 43 +++---------------------------------------- - 1 file changed, 3 insertions(+), 40 deletions(-) - -diff --git a/configure.seed b/configure.seed -index a148c530a..55bd49678 100644 ---- a/configure.seed -+++ b/configure.seed -@@ -144,31 +144,6 @@ fi - # - REVISION=`git log --pretty=oneline | wc -l` - --if test -d "/usr/local/include"; then -- CFLAGS="${CFLAGS} -I/usr/local/include" -- CPPFLAGS="${CPPFLAGS} -I/usr/local/include" --fi -- --if test -d "/usr/local/lib"; then -- LDFLAGS="${LDFLAGS} -L/usr/local/lib" --fi -- --if test -d /opt/local/include; then : -- CFLAGS="${CFLAGS} -I/opt/local/include" -- CPPFLAGS="${CPPFLAGS} -I/opt/local/include" --fi -- --if test -d /opt/local/lib; then : -- LDFLAGS="${LDFLAGS} -L/opt/local/lib" --fi -- --if [ test -f /usr/bin/lsb_release ]; then -- CODENAME=`/usr/bin/lsb_release -c|cut -f 2` -- if [[ $CODENAME == "wheezy" ]]; then : -- CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" -- fi --fi -- - SHORT_MACHINE=`uname -m | cut -b1-3` - - GIT_RELEASE="@GIT_RELEASE@" -@@ -293,23 +268,11 @@ fi - pkg-config --exists libssl - if test "$?" -ne 1; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -+ SSL_INC="`pkg-config --cflags libssl`" - SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" - else -- dnl Workaround for MacOS Brew -- if test -d "/usr/local/opt/openssl/lib"; then -- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="-I/usr/local/opt/openssl/include" -- SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto" -- dnl Workaround for FreeBSD -- elif test -f "/usr/lib/libssl.so"; then -- AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="-I/usr/include" -- SSL_LIB="-L/usr/lib -lssl -lcrypto" -- else -- echo "Please install openssl-dev(el) package prerequisite" -- exit -1 -- fi -+ echo "Please install openssl-dev(el) package prerequisite" -+ exit -1 - fi - - AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"]) --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch b/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch deleted file mode 100644 index 80761abd53..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/files/0001-configure.seed-not-check-clang-on-host.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5867be19e53a3cc09730b83282c83bdd26147cc3 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 9 Nov 2020 04:05:25 +0000 -Subject: [PATCH] configure.seed: not check clang on host - -Don't check clang on host to avoid host contamination. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Mingli Yu ---- - configure.seed | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/configure.seed b/configure.seed -index 55bd49678..94bc0bc48 100644 ---- a/configure.seed -+++ b/configure.seed -@@ -90,22 +90,6 @@ if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then - CFLAGS="-fno-color-diagnostics $CFLAGS" - fi - fi --else -- if test $SYSTEM = "Linux"; then -- if [ test -f /usr/bin/clang++ ]; then -- CC=clang -- CXX=clang++ -- AC_MSG_RESULT(Using clang++ compiler) -- fi -- -- if [ test -f /etc/redhat-release ]; then -- OS=`cat /etc/redhat-release` -- else -- if [ test -f /usr/bin/lsb_release ]; then -- OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2` -- fi -- fi -- fi - fi - - dnl> Remove spaces --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.0.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.0.bb deleted file mode 100644 index 960c4c2012..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "A library for deep-packet inspection." -DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \ -inspection. Based on OpenDPI it includes ntop extensions" - -SECTION = "libdevel" -DEPENDS = "libpcap json-c" -RDEPENDS:${PN} += " libpcap" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" - -SRCREV = "dabab0e9515c2e6a71a91bdc807453e416f831ca" -SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable;protocol=https \ - file://0001-autogen.sh-not-generate-configure.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -CPPFLAGS += "${SELECTED_OPTIMIZATION}" - -do_configure:prepend() { - ${S}/autogen.sh -} - -EXTRA_OEMAKE = " \ - libdir=${libdir} \ -" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb new file mode 100644 index 0000000000..352d2d2426 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "A library for deep-packet inspection." +DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \ +inspection. Based on OpenDPI it includes ntop extensions" + +SECTION = "libdevel" +DEPENDS = "libpcap json-c" +RDEPENDS:${PN} += " libpcap" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" + +SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" +SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \ + file://0001-autogen.sh-not-generate-configure.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +CPPFLAGS += "${SELECTED_OPTIMIZATION}" + +do_configure:prepend() { + ${S}/autogen.sh +} + +EXTRA_OEMAKE = " \ + libdir=${libdir} \ +" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb deleted file mode 100644 index c4b8db3889..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Web-based Traffic and Security Network Traffic Monitoring" -DESCRIPTION = "ntopng is a web-based network traffic monitoring application \ -released under GPLv3. It is the new incarnation of the original \ -ntop written in 1998, and now revamped in terms of performance, \ -usability, and features." - -SECTION = "console/network" - -DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" -RDEPENDS:${PN} = "bash redis" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRCREV = "85867090d92df4365c0af8d47f54ab3106117e59" -SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.0-stable \ - file://0001-configure.seed-fix-configure-error.patch \ - file://0001-configure.seed-fix-host-contamination.patch \ - file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ - file://0001-autogen.sh-generate-configure.ac-only.patch \ - file://0001-configure.seed-not-check-clang-on-host.patch \ - file://ntopng.service \ -" - -S = "${WORKDIR}/git" - -# don't use the lua under thirdparty as it supports cross compiling badly -export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" - -LDFLAGS:append:mipsarch = " -latomic" -LDFLAGS:append:powerpc = " -latomic" -LDFLAGS:append:riscv32 = " -latomic" -inherit autotools-brokensep gettext pkgconfig systemd - -do_install:append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system -} - -FILES:${PN} += "\ - ${systemd_unitdir}/system/ntopng.service" - -FILES:${PN}-doc += "\ - /usr/man/man8/ntopng.8" - -do_configure:prepend() { - ${S}/autogen.sh -} - -SYSTEMD_SERVICE:${PN} = "ntopng.service" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb new file mode 100644 index 0000000000..1c74845cc9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "Web-based Traffic and Security Network Traffic Monitoring" +DESCRIPTION = "ntopng is a web-based network traffic monitoring application \ +released under GPLv3. It is the new incarnation of the original \ +ntop written in 1998, and now revamped in terms of performance, \ +usability, and features." + +SECTION = "console/network" + +DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" +RDEPENDS:${PN} = "bash redis" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "d3ce78948e8d81dc1e2c5298ce556f9f2247aac1" +SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \ + file://0001-configure.ac.in-fix-configure-error.patch \ + file://0001-configure.ac.in-fix-host-contamination.patch \ + file://0001-Makefile.in-don-t-use-the-internal-lua.patch \ + file://0001-autogen.sh-generate-configure.ac-only.patch \ + file://0001-configure.ac.in-not-check-clang-on-host.patch \ + file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ + file://ntopng.service \ + " + +S = "${WORKDIR}/git" + +# don't use the lua under thirdparty as it supports cross compiling badly +export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" + +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" +inherit autotools-brokensep gettext pkgconfig systemd + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system +} + +FILES:${PN} += "\ + ${systemd_unitdir}/system/ntopng.service" + +FILES:${PN}-doc += "\ + /usr/man/man8/ntopng.8" + +do_configure:prepend() { + ${S}/autogen.sh +} + +SYSTEMD_SERVICE:${PN} = "ntopng.service" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb index 4a719ae9c8..fe2bd0773c 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb @@ -29,7 +29,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" # CVE-2016-9312 is only for windows. -CVE_CHECK_WHITELIST += "CVE-2016-9312" +CVE_CHECK_IGNORE += "CVE-2016-9312" inherit autotools update-rc.d useradd systemd pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-open-vm-tools-Correct-include-path-for-poll.h.patch b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-open-vm-tools-Correct-include-path-for-poll.h.patch new file mode 100644 index 0000000000..d9823bdd5f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-open-vm-tools-Correct-include-path-for-poll.h.patch @@ -0,0 +1,36 @@ +From 2cefed441753b012c385e2d3ea5374b4d67e5696 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 7 Feb 2022 13:32:32 -0800 +Subject: [PATCH] open-vm-tools: Correct include path for poll.h + +sys/poll.h is deprecated and musl calls it out explicitly. + +Fixes +| In file included from ../../../../git/open-vm-tools/services/plugins/gdp/gdpPlugin.c:35: +| /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux-musl/open-vm-tools/11.3.5-r0/recipe-sysroot/usr/include/sys/poll.h:1:2: error: redirecting incorrect #include to [-Werror,-W#warnings] +| #warning redirecting incorrect #include to +| ^ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + open-vm-tools/services/plugins/gdp/gdpPlugin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/services/plugins/gdp/gdpPlugin.c b/open-vm-tools/services/plugins/gdp/gdpPlugin.c +index 2bba2937e..025339595 100644 +--- a/open-vm-tools/services/plugins/gdp/gdpPlugin.c ++++ b/open-vm-tools/services/plugins/gdp/gdpPlugin.c +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #endif + +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb index 38034c304d..e37e9eee74 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb @@ -43,6 +43,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=maste file://0013-misc-Do-not-print-NULL-string-into-logs.patch;patchdir=.. \ file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \ file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ + file://0001-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ " UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb index 664b716ec8..99fa9ba770 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb @@ -16,7 +16,7 @@ DEPENDS = " \ readline \ " -LICENSE = "GPLv2 & LGPLv2.1 & BSD" +LICENSE = "GPLv2 & LGPLv2.1 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb index 2dc3af6bf9..6c4514eb90 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" SRC_URI[sha256sum] = "7500df4734173bce2e95b5039079119dacaff121650b2b6ca76d2dc68bdac1c5" # CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn. -CVE_CHECK_WHITELIST += "CVE-2020-7224 CVE-2020-27569" +CVE_CHECK_IGNORE += "CVE-2020-7224 CVE-2020-27569" SYSTEMD_SERVICE:${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_38.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_38.0.bb deleted file mode 100644 index da1e013bd3..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_38.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Userspace support for InfiniBand/RDMA verbs" -DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." -SECTION = "libs" - -DEPENDS = "libnl" -RDEPENDS:${PN} = "bash perl" - -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" -SRCREV = "02361e3b865995ce251923390df0d5a5c821195a" -S = "${WORKDIR}/git" - -#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -LICENSE = "BSD-2-Clause | GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ - file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -EXTRA_OECMAKE = " \ - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ - -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ - -DNO_MAN_PAGES=1 \ -" - -LTO = "" - -FILES_SOLIBSDEV = "" -FILES:${PN} += "${libdir}/*" -INSANE_SKIP:${PN} += "dev-so" - -inherit cmake cpan-base pkgconfig python3native systemd - -SYSTEMD_SERVICE:${PN} = " \ - srp_daemon.service \ - iwpmd.service \ - ibacm.socket \ - rdma-load-modules@.service \ - srp_daemon_port@.service \ - rdma-hw.target \ - ibacm.service \ -" -SYSTEMD_AUTO_ENABLE = "disable" - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb new file mode 100644 index 0000000000..48434aa584 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Userspace support for InfiniBand/RDMA verbs" +DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." +SECTION = "libs" + +DEPENDS = "libnl" +RDEPENDS:${PN} = "bash perl" + +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" +SRCREV = "b2fedc4b1b891afd2c26ebfd21f9e440e83c28ff" +S = "${WORKDIR}/git" + +#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md +LICENSE = "BSD-2-Clause | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ + -DNO_MAN_PAGES=1 \ +" + +LTO = "" + +FILES_SOLIBSDEV = "" +FILES:${PN} += "${libdir}/*" +INSANE_SKIP:${PN} += "dev-so" + +inherit cmake cpan-base pkgconfig python3native systemd + +SYSTEMD_SERVICE:${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + rdma-load-modules@.service \ + srp_daemon_port@.service \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb new file mode 100644 index 0000000000..9ce019ed86 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb @@ -0,0 +1,19 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# + +SUMMARY = "Simple Protocol for Independent Computing Environments (protocol definition" +HOMEPAGE = "https://spice-space.org" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=b37311cb5604f3e5cc2fb0fd23527e95" + +SRCREV = "6f453a775d87087c6ba59fc180c1a1e466631a47" + +SRC_URI = "git://gitlab.freedesktop.org/spice/spice-protocol.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb deleted file mode 100644 index ca683bf220..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice-protocol_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2013 Wind River Systems, Inc. -# - -SUMMARY = "Simple Protocol for Independent Computing Environments" -DESCRIPTION = "SPICE (the Simple Protocol for Independent Computing \ -Environments) is a remote-display system built for virtual \ -environments which allows users to view a computing 'desktop' \ -environment - not only on its computer-server machine, but also from \ -anywhere on the Internet and using a wide variety of machine \ -architectures." - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=b37311cb5604f3e5cc2fb0fd23527e95" - -PV = "0.14.1+git${SRCPV}" - -SRCREV = "e0ec178a72aa33e307ee5ac02b63bf336da921a5" - -SRC_URI = " \ - git://anongit.freedesktop.org/spice/spice-protocol;branch=master \ -" - -S = "${WORKDIR}/git" - -inherit autotools gettext pkgconfig - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb index 9c6baccc7c..c9f95b0125 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb @@ -10,7 +10,7 @@ environment - not only on its computer-server machine, but also from \ anywhere on the Internet and using a wide variety of machine \ architectures." -LICENSE = "BSD & LGPLv2.1+" +LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PV = "0.14.2+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb index 2b7a7a2410..686cdb677e 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb @@ -122,12 +122,12 @@ python split_strongswan_plugins () { else: d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile) - split_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) - do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) + split_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) + do_split_packages(d, sysconfdir, r'(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) - split_dbg_packages = do_split_packages(d, dbglibdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') - split_dev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') - split_staticdev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') + split_dbg_packages = do_split_packages(d, dbglibdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + split_dev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') + split_staticdev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') if split_packages: pn = d.getVar('PN') 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 deleted file mode 100644 index bb56c4d4c9..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/0001-aclocal.m4-Skip-checking-for-pcap-config.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 867bf5c9d0fb64e1b4e64cb13b983674c270a6bf Mon Sep 17 00:00:00 2001 -From: Yi Fan Yu -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 ---- - 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_4.99.0.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb deleted file mode 100644 index 97a9027af4..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -SECTION = "net" -LICENSE = "BSD-3-Clause" -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-cwd \ - perl-module-constant \ -" - -SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ - file://add-ptest.patch \ - file://run-ptest \ - file://0001-aclocal.m4-Skip-checking-for-pcap-config.patch \ -" - -SRC_URI[md5sum] = "b10aa2f497def7283bc060f626879ce5" -SRC_URI[sha256sum] = "8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842" - -UPSTREAM_CHECK_REGEX = "tcpdump-(?P\d+(\.(?!99)\d+)+)\.tar" - -inherit autotools-brokensep ptest - -PACKAGECONFIG ?= "openssl" - -PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" -PACKAGECONFIG[openssl] = "--with-crypto,--without-crypto,openssl" -PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" -# Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) -PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" - -EXTRA_AUTORECONF += "-I m4" - -do_configure:prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi -} - -do_install:append() { - # make install installs an unneeded extra copy of the tcpdump binary - rm ${D}${bindir}/tcpdump.${PV} -} - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb new file mode 100644 index 0000000000..322a826f07 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb @@ -0,0 +1,53 @@ +SUMMARY = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +SECTION = "net" +LICENSE = "BSD-3-Clause" +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-cwd \ + perl-module-constant \ +" + +SRC_URI = " \ + http://www.tcpdump.org/release/${BP}.tar.gz \ + file://add-ptest.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "929a255c71a9933608bd7c31927760f7" +SRC_URI[sha256sum] = "79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe" + +UPSTREAM_CHECK_REGEX = "tcpdump-(?P\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep pkgconfig ptest + +PACKAGECONFIG ?= "openssl" + +PACKAGECONFIG[libcap-ng] = "--with-cap-ng,--without-cap-ng,libcap-ng" +PACKAGECONFIG[openssl] = "--with-crypto,--without-crypto,openssl" +PACKAGECONFIG[smi] = "--with-smi,--without-smi,libsmi" +# Note: CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled) +PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" + +EXTRA_AUTORECONF += "--exclude=aclocal" + +do_install:append() { + # make install installs an unneeded extra copy of the tcpdump binary + rm ${D}${bindir}/tcpdump.${PV} +} + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch deleted file mode 100644 index 386b7f83ac..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li - ---- tcpslice-1.2a3.orig/search.c 2000-09-10 10:52:40.000000000 +0200 -+++ tcpslice-1.2a3/search.c 2006-07-28 14:56:55.000000000 +0200 -@@ -53,7 +53,7 @@ - /* Size of a packet header in bytes; easier than typing the sizeof() all - * the time ... - */ --#define PACKET_HDR_LEN (sizeof( struct pcap_pkthdr )) -+#define PACKET_HDR_LEN (sizeof( struct pcap_sf_pkthdr )) - - extern int snaplen; - -@@ -111,16 +111,24 @@ - static void - extract_header( pcap_t *p, u_char *buf, struct pcap_pkthdr *hdr ) - { -- memcpy((char *) hdr, (char *) buf, sizeof(struct pcap_pkthdr)); -+ struct pcap_sf_pkthdr hdri; -+ -+ memcpy((char *) &hdri, (char *) buf, sizeof(struct pcap_sf_pkthdr)); - - if ( pcap_is_swapped( p ) ) - { -- hdr->ts.tv_sec = SWAPLONG(hdr->ts.tv_sec); -- hdr->ts.tv_usec = SWAPLONG(hdr->ts.tv_usec); -- hdr->len = SWAPLONG(hdr->len); -- hdr->caplen = SWAPLONG(hdr->caplen); -+ hdr->ts.tv_sec = SWAPLONG(hdri.ts.tv_sec); -+ hdr->ts.tv_usec = SWAPLONG(hdri.ts.tv_usec); -+ hdr->len = SWAPLONG(hdri.len); -+ hdr->caplen = SWAPLONG(hdri.caplen); -+ } -+ else -+ { -+ hdr->ts.tv_sec = hdri.ts.tv_sec; -+ hdr->ts.tv_usec = hdri.ts.tv_usec; -+ hdr->len = hdri.len; -+ hdr->caplen = hdri.caplen; - } -- - /* - * From bpf/libpcap/savefile.c: - * ---- tcpslice-1.2a3.orig/tcpslice.h 1995-11-02 00:40:53.000000000 +0100 -+++ tcpslice-1.2a3/tcpslice.h 2006-07-28 14:56:55.000000000 +0200 -@@ -20,6 +20,26 @@ - */ - - -+#include -+/* #include */ -+ -+/* -+ * This is a timeval as stored in disk in a dumpfile. -+ * It has to use the same types everywhere, independent of the actual -+ * `struct timeval' -+ */ -+ -+struct pcap_timeval { -+ bpf_int32 tv_sec; /* seconds */ -+ bpf_int32 tv_usec; /* microseconds */ -+}; -+ -+struct pcap_sf_pkthdr { -+ struct pcap_timeval ts; /* time stamp */ -+ bpf_u_int32 caplen; /* length of portion present */ -+ bpf_u_int32 len; /* length this packet (off wire) */ -+}; -+ - time_t gwtm2secs( struct tm *tm ); - - int sf_find_end( struct pcap *p, struct timeval *first_timestamp, diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch deleted file mode 100644 index 0a7359311d..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm] - -Signed-off-by: Roy Li -diff -ur tcpdump-3.8.1/tcpslice/tcpslice.c tcpdump-3.8.1.new/tcpslice/tcpslice.c ---- tcpslice/tcpslice.c 2004-01-15 17:35:53.000000000 +0100 -+++ tcpslice/tcpslice.c 2004-01-15 16:12:57.000000000 +0100 -@@ -35,7 +35,7 @@ - #include - #include - --#include -+/* #include */ - - #include - #ifdef HAVE_FCNTL_H diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb deleted file mode 100644 index e65739a5c7..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "tcpslice" -DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." -HOMEPAGE = "http://www.tcpdump.org/related.html" -SECTION = "net" - -LICENSE = "BSD-4-Clause" -LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" - -SRC_URI = "ftp://ftp.ee.lbl.gov/${BP}.tar.gz \ - file://tcpslice-1.2a3-time.patch \ - file://tcpslice-CVS.20010207-bpf.patch \ - " -SRC_URI[md5sum] = "e329cbeb7e589f132d92c3447c477190" -SRC_URI[sha256sum] = "4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840" - -inherit autotools-brokensep - -DEPENDS += "libpcap" - -# We do not want to autoreconf. We must specify srcdir as ".". -# We have to set the ac_cv_* cache variables as well as pass the normal -# cross-compilation options to configure! -# -do_configure () { - oe_runconf \ - --srcdir="." \ - ac_cv_build=${BUILD_SYS} \ - ac_cv_host=${HOST_SYS} \ - ac_cv_target=${HOST_SYS} -} - -do_install () { - mkdir -p ${D}/usr/sbin - install -c -m 555 tcpslice ${D}/usr/sbin -} - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb new file mode 100644 index 0000000000..4909acdee9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.5.bb @@ -0,0 +1,25 @@ +SUMMARY = "tcpslice" +DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace." +HOMEPAGE = "http://www.tcpdump.org/related.html" +SECTION = "net" + +LICENSE = "BSD-4-Clause" +LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e" + +SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ + " +SRC_URI[md5sum] = "8907e60376e629f6e6ce2255988aaf47" +SRC_URI[sha256sum] = "f6935e3e7ca00ef50c515d062fddd410868467ec5b6d8f2eca12066f8d91dda2" + +UPSTREAM_CHECK_REGEX = "tcpslice-(?P\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep pkgconfig + +DEPENDS = "libpcap" + +EXTRA_AUTORECONF += "--exclude=aclocal" + +do_install () { + install -d ${D}${sbindir} + install -m 0755 tcpslice ${D}${sbindir} +} diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.4.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.4.bb deleted file mode 100644 index eda51bb7f5..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.3.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Use previously captured traffic to test network devices" - -HOMEPAGE = "http://tcpreplay.synfin.net/" -SECTION = "net" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" - -SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" - -SRC_URI[md5sum] = "305a84d84265705bd28f148698142188" -SRC_URI[sha256sum] = "ee065310806c22e2fd36f014e1ebb331b98a7ec4db958e91c3d9cbda0640d92c" - -UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" - -DEPENDS = "libpcap" - -EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" - -inherit siteinfo autotools-brokensep - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb new file mode 100644 index 0000000000..f65956b630 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "Use previously captured traffic to test network devices" + +HOMEPAGE = "https://tcpreplay.appneta.com/" + +SECTION = "net" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" + +SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" + +SRC_URI[sha256sum] = "cb67b6491a618867fc4f9848f586019f1bb2ebd149f393afac5544ee55e4544f" + +UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" + +DEPENDS = "libpcap" + +EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" + +inherit siteinfo autotools-brokensep + diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index d25db911ce..93f3dc5807 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -42,7 +42,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "honister" +LAYERSERIES_COMPAT_openembedded-layer = "kirkstone" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 5257ee3477..46ca77f208 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -100,7 +100,7 @@ INITSCRIPT_PARAMS:lcdproc = "defaults 71 20" python populate_packages:prepend() { plugindir = d.expand('${libdir}/lcdproc') - do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) + do_split_packages(d, plugindir, r'(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) } PACKAGES_DYNAMIC += "^lcdd-driver-.*" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index be131cd261..b0e7475bdb 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -76,4 +76,4 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # see https://github.com/libhugetlbfs/libhugetlbfs/issues/52 -PNBLACKLIST[libhugetlbfs] ?= "Needs porting to glibc 2.34+" +SKIP_RECIPE[libhugetlbfs] ?= "Needs porting to glibc 2.34+" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb new file mode 100644 index 0000000000..a83e09d2bd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb @@ -0,0 +1,41 @@ +SUMMARY = "Phoronix Test Suite" +DESCRIPTION = "The Phoronix Test Suite is designed to carry out both qualitative \ +and quantitative benchmarks in a clean, reproducible, and easy-to-use manner." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "console/tests" + +SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" +SRC_URI[md5sum] = "9f107c080407b7ac195bb04e6cabb83b" +SRC_URI[sha256sum] = "3b58ea694419ca608d729fa6ce72ed2b4c51af444729eefbcdc6e670290caa7f" + +S = "${WORKDIR}/phoronix-test-suite" + +inherit systemd allarch mime mime-xdg + +do_install() { + DESTDIR=${D} ./install-sh ${exec_prefix} + + if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then + install -d ${D}/${systemd_unitdir}/system/ + mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ + rm -rf ${D}/usr/lib/ + fi +} + +# It is not advisable to enable these services by default since they can cause +# continual target reboots if they encounter network problems. +# +SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_SERVICE:${PN} = "phoromatic-client.service phoromatic-server.service" + +RDEPENDS:${PN} += "bash python3-core php-cli util-linux-lscpu os-release lsb-release" + +FILES:${PN} += " \ + ${datadir}/phoronix-test-suite \ + ${datadir}/appdata/phoronix-test-suite.appdata.xml \ + ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ + ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ + ${datadir}/mime/packages/openbenchmarking-mime.xml \ + ${systemd_unitdir}/* \ +" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb deleted file mode 100644 index c571013a91..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_9.2.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Phoronix Test Suite" -DESCRIPTION = "The Phoronix Test Suite is designed to carry out both qualitative \ -and quantitative benchmarks in a clean, reproducible, and easy-to-use manner." -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SECTION = "console/tests" - -SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "ad80ed9a5835929138473f764ff0d5db" -SRC_URI[sha256sum] = "675e7ca96719e2f3b42a6c13421213a398f04da0f8e78f4691fa9261fdeb8501" - -S = "${WORKDIR}/phoronix-test-suite" - -inherit systemd allarch mime mime-xdg - -do_install() { - DESTDIR=${D} ./install-sh ${exec_prefix} - - if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then - install -d ${D}/${systemd_unitdir}/system/ - mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ - rm -rf ${D}/usr/lib/ - fi -} - -# It is not advisable to enable these services by default since they can cause -# continual target reboots if they encounter network problems. -# -SYSTEMD_AUTO_ENABLE = "disable" -SYSTEMD_SERVICE:${PN} = "phoromatic-client.service phoromatic-server.service" - -RDEPENDS:${PN} += "bash python3-core php-cli util-linux-lscpu os-release lsb-release" - -FILES:${PN} += " \ - ${datadir}/phoronix-test-suite \ - ${datadir}/appdata/phoronix-test-suite.appdata.xml \ - ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ - ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ - ${datadir}/mime/packages/openbenchmarking-mime.xml \ - ${systemd_unitdir}/* \ -" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch index ac345f2752..6fd2eca941 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch @@ -20,7 +20,7 @@ index e42b365..4831a48 100755 import sys import argparse @@ -19,7 +20,7 @@ def _generate_sbat(args): - FWUPD_URL = "https://github.com/fwupd/fwupd" + FWUPD_URL = "https://github.com/fwupd/fwupd-efi" subprocess.run( - [args.cc, "-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True @@ -32,13 +32,13 @@ diff --git a/efi/meson.build b/efi/meson.build index 68ea4aa..dcf0d43 100644 --- a/efi/meson.build +++ b/efi/meson.build -@@ -184,7 +184,7 @@ o_file5 = custom_target('fwup-sbat.o', +@@ -187,7 +187,7 @@ o_file5 = custom_target('fwup-sbat.o', command : [ - join_paths(meson.current_source_dir(), 'generate_sbat.py'), + generate_sbat, '@OUTPUT@', - '--cc', efi_cc, + '--cc', ' '.join(efi_cc), - '--objcopy', efi_objcopy, + '--objcopy', objcopy, '--project-name', meson.project_name(), '--project-version', meson.project_version(), diff --git a/meson_options.txt b/meson_options.txt @@ -49,5 +49,5 @@ index d869cd2..17ef7fb 100644 -option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') +option('efi-cc', type : 'array', value : ['gcc'], description : 'the compiler to use for EFI modules') option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules') - option('efi-objcopy', type : 'string', value : 'objcopy', description : 'the objcopy utility to use for EFI modules') option('efi-libdir', type : 'string', description : 'path to the EFI lib directory') + option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory') diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb deleted file mode 100644 index 2165b42293..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "EFI executable for fwupd" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ - file://cc.patch" -SRCREV = "fee1b8f6473cb403b8ae7a56961ba0557e3f3efa" -S = "${WORKDIR}/git" - -DEPENDS = "gnu-efi" - -COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" - -inherit meson - -# These should be configured as needed -SBAT_DISTRO_ID ?= "${DISTRO}" -SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}" -SBAT_DISTRO_URL ?= "" - -EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \ - -Defi-ld='${HOST_PREFIX}ld' \ - -Defi-objcopy='${OBJCOPY}' \ - -Defi-includedir=${STAGING_INCDIR}/efi \ - -Defi-libdir=${STAGING_LIBDIR} \ - -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \ - -Defi_sbat_distro_summary='${SBAT_DISTRO_SUMMARY}' \ - -Defi_sbat_distro_url='${SBAT_DISTRO_URL}' \ - -Defi_sbat_distro_pkgname='${PN}' \ - -Defi_sbat_distro_version='${PV}'\ - " - -# The compile assumes GCC at present -TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb new file mode 100644 index 0000000000..b88db2e53c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "EFI executable for fwupd" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ + file://cc.patch" +SRCREV = "8de5918507dcc797e612aac688d6b60b90053f54" +S = "${WORKDIR}/git" + +DEPENDS = "gnu-efi" + +COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" + +inherit meson + +# These should be configured as needed +SBAT_DISTRO_ID ?= "${DISTRO}" +SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}" +SBAT_DISTRO_URL ?= "" + +EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \ + -Defi-ld='${HOST_PREFIX}ld' \ + -Defi-includedir=${STAGING_INCDIR}/efi \ + -Defi-libdir=${STAGING_LIBDIR} \ + -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \ + -Defi_sbat_distro_summary='${SBAT_DISTRO_SUMMARY}' \ + -Defi_sbat_distro_url='${SBAT_DISTRO_URL}' \ + -Defi_sbat_distro_pkgname='${PN}' \ + -Defi_sbat_distro_version='${PV}'\ + " + +# The compile assumes GCC at present +TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch deleted file mode 100644 index 1bedb4f753..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-Prepare-for-CVE-2021-30004.patch.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 14fab0772db19297c82dd1b8612c9335369dce41 Mon Sep 17 00:00:00 2001 -From: Alexander Vickberg -Date: Mon, 17 May 2021 17:54:13 +0200 -Subject: [PATCH] Prepare for CVE-2021-30004.patch - -Without this building fails for CONFIG_TLS=internal - -Signed-off-by: Alexander Vickberg ---- - src/tls/asn1.h | 6 ++++++ - src/utils/includes.h | 1 + - 2 files changed, 7 insertions(+) - -diff --git a/src/tls/asn1.h b/src/tls/asn1.h -index 6bd7df5..77b94ef 100644 ---- a/src/tls/asn1.h -+++ b/src/tls/asn1.h -@@ -66,6 +66,12 @@ void asn1_oid_to_str(const struct asn1_oid *oid, char *buf, size_t len); - unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len); - int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b); - -+static inline bool asn1_is_null(const struct asn1_hdr *hdr) -+{ -+ return hdr->class == ASN1_CLASS_UNIVERSAL && -+ hdr->tag == ASN1_TAG_NULL; -+} -+ - extern struct asn1_oid asn1_sha1_oid; - extern struct asn1_oid asn1_sha256_oid; - -diff --git a/src/utils/includes.h b/src/utils/includes.h -index 75513fc..741fc9c 100644 ---- a/src/utils/includes.h -+++ b/src/utils/includes.h -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-16275.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-16275.patch deleted file mode 100644 index 9cefd4f2ad..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-16275.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d86d66dc073bc21d3b12faf4112062ae00c1773f Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: AP: Silently ignore management frame from unexpected source -address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Upstream-Status: Accepted -CVE: CVE-2019-16275 - -Reference to upstream patch: -https://w1.fi/cgit/hostap/commit/?id=d86d66dc073bc21d3b12faf4112062ae00c1773f - -Signed-off-by: Jouni Malinen ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 3158768..34ca379 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28d..2816812 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-5061.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-5061.patch deleted file mode 100644 index 9214615d12..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2019-5061.patch +++ /dev/null @@ -1,854 +0,0 @@ -From 018edec9b2bd3db20605117c32ff79c1e625c432 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Wed, 11 Sep 2019 12:34:28 +0300 -Subject: [PATCH] Remove IAPP functionality from hostapd - -IEEE Std 802.11F-2003 was withdrawn in 2006 and as such it has not been -maintained nor is there any expectation of the withdrawn trial-use -recommended practice to be maintained in the future. Furthermore, -implementation of IAPP in hostapd was not complete, i.e., only parts of -the recommended practice were included. The main item of some real use -long time ago was the Layer 2 Update frame to update bridges when a STA -roams within an ESS, but that functionality has, in practice, been moved -to kernel drivers to provide better integration with the networking -stack. - -CVE: CVE-2019-5061 - -Upstream-Status: Backport - -Signed-off-by: Jouni Malinen -Signed-off-by: Mingli Yu ---- - hostapd/Android.mk | 5 - - hostapd/Makefile | 5 - - hostapd/android.config | 3 - - hostapd/config_file.c | 3 +- - hostapd/defconfig | 3 - - hostapd/hostapd.conf | 6 - - hostapd/main.c | 3 - - src/ap/Makefile | 2 - - src/ap/ap_config.h | 4 - - src/ap/hostapd.c | 14 - - src/ap/hostapd.h | 2 - - src/ap/iapp.c | 542 ---------------------- - src/ap/iapp.h | 39 -- - src/utils/wpa_debug.h | 1 - - 14 files changed, 1 insertion(+), 633 deletions(-) - delete mode 100644 src/ap/iapp.c - delete mode 100644 src/ap/iapp.h - -diff --git a/hostapd/Android.mk b/hostapd/Android.mk -index 3183323ef..a87ac8144 100644 ---- a/hostapd/Android.mk -+++ b/hostapd/Android.mk -@@ -205,11 +205,6 @@ endif - - L_CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX - --ifdef CONFIG_IAPP --L_CFLAGS += -DCONFIG_IAPP --OBJS += src/ap/iapp.c --endif -- - ifdef CONFIG_RSN_PREAUTH - L_CFLAGS += -DCONFIG_RSN_PREAUTH - CONFIG_L2_PACKET=y -diff --git a/hostapd/Makefile b/hostapd/Makefile -index f7f4c785b..42bb9e4c8 100644 ---- a/hostapd/Makefile -+++ b/hostapd/Makefile -@@ -248,11 +248,6 @@ ifndef CONFIG_NO_CTRL_IFACE - CFLAGS += -DCONFIG_CTRL_IFACE - endif - --ifdef CONFIG_IAPP --CFLAGS += -DCONFIG_IAPP --OBJS += ../src/ap/iapp.o --endif -- - ifdef CONFIG_RSN_PREAUTH - CFLAGS += -DCONFIG_RSN_PREAUTH - CONFIG_L2_PACKET=y -diff --git a/hostapd/android.config b/hostapd/android.config -index efe252332..e2e6c7821 100644 ---- a/hostapd/android.config -+++ b/hostapd/android.config -@@ -38,9 +38,6 @@ CONFIG_DRIVER_NL80211_QCA=y - # Driver interface for no driver (e.g., RADIUS server only) - #CONFIG_DRIVER_NONE=y - --# IEEE 802.11F/IAPP --#CONFIG_IAPP=y -- - # WPA2/IEEE 802.11i RSN pre-authentication - #CONFIG_RSN_PREAUTH=y - -diff --git a/hostapd/config_file.c b/hostapd/config_file.c -index 680f17ee0..0d340d252 100644 ---- a/hostapd/config_file.c -+++ b/hostapd/config_file.c -@@ -2712,8 +2712,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, - bss->eapol_key_index_workaround = atoi(pos); - #ifdef CONFIG_IAPP - } else if (os_strcmp(buf, "iapp_interface") == 0) { -- bss->ieee802_11f = 1; -- os_strlcpy(bss->iapp_iface, pos, sizeof(bss->iapp_iface)); -+ wpa_printf(MSG_INFO, "DEPRECATED: iapp_interface not used"); - #endif /* CONFIG_IAPP */ - } else if (os_strcmp(buf, "own_ip_addr") == 0) { - if (hostapd_parse_ip_addr(pos, &bss->own_ip_addr)) { -diff --git a/hostapd/defconfig b/hostapd/defconfig -index b1fb56c3b..1a3d9f9ba 100644 ---- a/hostapd/defconfig -+++ b/hostapd/defconfig -@@ -44,9 +44,6 @@ CONFIG_LIBNL32=y - # Driver interface for no driver (e.g., RADIUS server only) - #CONFIG_DRIVER_NONE=y - --# IEEE 802.11F/IAPP --CONFIG_IAPP=y -- - # WPA2/IEEE 802.11i RSN pre-authentication - CONFIG_RSN_PREAUTH=y - -diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf -index 6c96a760a..a3c698480 100644 ---- a/hostapd/hostapd.conf -+++ b/hostapd/hostapd.conf -@@ -41,7 +41,6 @@ interface=wlan0 - # bit 2 (4) = RADIUS - # bit 3 (8) = WPA - # bit 4 (16) = driver interface --# bit 5 (32) = IAPP - # bit 6 (64) = MLME - # - # Levels (minimum value for logged events): -@@ -1243,11 +1242,6 @@ eap_server=0 - # Whether to enable ERP on the EAP server. - #eap_server_erp=1 - --##### IEEE 802.11f - Inter-Access Point Protocol (IAPP) ####################### -- --# Interface to be used for IAPP broadcast packets --#iapp_interface=eth0 -- - - ##### RADIUS client configuration ############################################# - # for IEEE 802.1X with external Authentication Server, IEEE 802.11 -diff --git a/hostapd/main.c b/hostapd/main.c -index 08896ffe2..8bfe24281 100644 ---- a/hostapd/main.c -+++ b/hostapd/main.c -@@ -81,9 +81,6 @@ static void hostapd_logger_cb(void *ctx, const u8 *addr, unsigned int module, - case HOSTAPD_MODULE_DRIVER: - module_str = "DRIVER"; - break; -- case HOSTAPD_MODULE_IAPP: -- module_str = "IAPP"; -- break; - case HOSTAPD_MODULE_MLME: - module_str = "MLME"; - break; -diff --git a/src/ap/Makefile b/src/ap/Makefile -index bd3f33b77..54e48a0dd 100644 ---- a/src/ap/Makefile -+++ b/src/ap/Makefile -@@ -18,7 +18,6 @@ CFLAGS += -DCONFIG_IEEE80211R_AP - CFLAGS += -DCONFIG_WPS - CFLAGS += -DCONFIG_PROXYARP - CFLAGS += -DCONFIG_IPV6 --CFLAGS += -DCONFIG_IAPP - CFLAGS += -DCONFIG_AIRTIME_POLICY - - LIB_OBJS= \ -@@ -41,7 +40,6 @@ LIB_OBJS= \ - hostapd.o \ - hs20.o \ - hw_features.o \ -- iapp.o \ - ieee802_11_auth.o \ - ieee802_11.o \ - ieee802_11_ht.o \ -diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h -index e219160b0..17eb0682b 100644 ---- a/src/ap/ap_config.h -+++ b/src/ap/ap_config.h -@@ -325,10 +325,6 @@ struct hostapd_bss_config { - int erp_send_reauth_start; - char *erp_domain; - -- int ieee802_11f; /* use IEEE 802.11f (IAPP) */ -- char iapp_iface[IFNAMSIZ + 1]; /* interface used with IAPP broadcast -- * frames */ -- - enum macaddr_acl { - ACCEPT_UNLESS_DENIED = 0, - DENY_UNLESS_ACCEPTED = 1, -diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c -index ef988b634..bf7b1f89e 100644 ---- a/src/ap/hostapd.c -+++ b/src/ap/hostapd.c -@@ -28,7 +28,6 @@ - #include "accounting.h" - #include "ap_list.h" - #include "beacon.h" --#include "iapp.h" - #include "ieee802_1x.h" - #include "ieee802_11_auth.h" - #include "vlan_init.h" -@@ -361,8 +360,6 @@ static void hostapd_free_hapd_data(struct hostapd_data *hapd) - hapd->beacon_set_done = 0; - - wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface); -- iapp_deinit(hapd->iapp); -- hapd->iapp = NULL; - accounting_deinit(hapd); - hostapd_deinit_wpa(hapd); - vlan_deinit(hapd); -@@ -1296,13 +1293,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first) - return -1; - } - -- if (conf->ieee802_11f && -- (hapd->iapp = iapp_init(hapd, conf->iapp_iface)) == NULL) { -- wpa_printf(MSG_ERROR, "IEEE 802.11F (IAPP) initialization " -- "failed."); -- return -1; -- } -- - #ifdef CONFIG_INTERWORKING - if (gas_serv_init(hapd)) { - wpa_printf(MSG_ERROR, "GAS server initialization failed"); -@@ -3056,10 +3046,6 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta, - hostapd_prune_associations(hapd, sta->addr); - ap_sta_clear_disconnect_timeouts(hapd, sta); - -- /* IEEE 802.11F (IAPP) */ -- if (hapd->conf->ieee802_11f) -- iapp_new_station(hapd->iapp, sta); -- - #ifdef CONFIG_P2P - if (sta->p2p_ie == NULL && !sta->no_p2p_set) { - sta->no_p2p_set = 1; -diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h -index 5b859b8a9..2358d1664 100644 ---- a/src/ap/hostapd.h -+++ b/src/ap/hostapd.h -@@ -179,8 +179,6 @@ struct hostapd_data { - u64 acct_session_id; - struct radius_das_data *radius_das; - -- struct iapp_data *iapp; -- - struct hostapd_cached_radius_acl *acl_cache; - struct hostapd_acl_query_data *acl_queries; - -diff --git a/src/ap/iapp.c b/src/ap/iapp.c -deleted file mode 100644 -index 2556da30c..000000000 ---- a/src/ap/iapp.c -+++ /dev/null -@@ -1,542 +0,0 @@ --/* -- * hostapd / IEEE 802.11F-2003 Inter-Access Point Protocol (IAPP) -- * Copyright (c) 2002-2007, Jouni Malinen -- * -- * This software may be distributed under the terms of the BSD license. -- * See README for more details. -- * -- * Note: IEEE 802.11F-2003 was a experimental use specification. It has expired -- * and IEEE has withdrawn it. In other words, it is likely better to look at -- * using some other mechanism for AP-to-AP communication than extending the -- * implementation here. -- */ -- --/* TODO: -- * Level 1: no administrative or security support -- * (e.g., static BSSID to IP address mapping in each AP) -- * Level 2: support for dynamic mapping of BSSID to IP address -- * Level 3: support for encryption and authentication of IAPP messages -- * - add support for MOVE-notify and MOVE-response (this requires support for -- * finding out IP address for previous AP using RADIUS) -- * - add support for Send- and ACK-Security-Block to speedup IEEE 802.1X during -- * reassociation to another AP -- * - implement counters etc. for IAPP MIB -- * - verify endianness of fields in IAPP messages; are they big-endian as -- * used here? -- * - RADIUS connection for AP registration and BSSID to IP address mapping -- * - TCP connection for IAPP MOVE, CACHE -- * - broadcast ESP for IAPP ADD-notify -- * - ESP for IAPP MOVE messages -- * - security block sending/processing -- * - IEEE 802.11 context transfer -- */ -- --#include "utils/includes.h" --#include --#include --#include -- --#include "utils/common.h" --#include "utils/eloop.h" --#include "common/ieee802_11_defs.h" --#include "hostapd.h" --#include "ap_config.h" --#include "ieee802_11.h" --#include "sta_info.h" --#include "iapp.h" -- -- --#define IAPP_MULTICAST "224.0.1.178" --#define IAPP_UDP_PORT 3517 --#define IAPP_TCP_PORT 3517 -- --struct iapp_hdr { -- u8 version; -- u8 command; -- be16 identifier; -- be16 length; -- /* followed by length-6 octets of data */ --} __attribute__ ((packed)); -- --#define IAPP_VERSION 0 -- --enum IAPP_COMMAND { -- IAPP_CMD_ADD_notify = 0, -- IAPP_CMD_MOVE_notify = 1, -- IAPP_CMD_MOVE_response = 2, -- IAPP_CMD_Send_Security_Block = 3, -- IAPP_CMD_ACK_Security_Block = 4, -- IAPP_CMD_CACHE_notify = 5, -- IAPP_CMD_CACHE_response = 6, --}; -- -- --/* ADD-notify - multicast UDP on the local LAN */ --struct iapp_add_notify { -- u8 addr_len; /* ETH_ALEN */ -- u8 reserved; -- u8 mac_addr[ETH_ALEN]; -- be16 seq_num; --} __attribute__ ((packed)); -- -- --/* Layer 2 Update frame (802.2 Type 1 LLC XID Update response) */ --struct iapp_layer2_update { -- u8 da[ETH_ALEN]; /* broadcast */ -- u8 sa[ETH_ALEN]; /* STA addr */ -- be16 len; /* 6 */ -- u8 dsap; /* null DSAP address */ -- u8 ssap; /* null SSAP address, CR=Response */ -- u8 control; -- u8 xid_info[3]; --} __attribute__ ((packed)); -- -- --/* MOVE-notify - unicast TCP */ --struct iapp_move_notify { -- u8 addr_len; /* ETH_ALEN */ -- u8 reserved; -- u8 mac_addr[ETH_ALEN]; -- u16 seq_num; -- u16 ctx_block_len; -- /* followed by ctx_block_len bytes */ --} __attribute__ ((packed)); -- -- --/* MOVE-response - unicast TCP */ --struct iapp_move_response { -- u8 addr_len; /* ETH_ALEN */ -- u8 status; -- u8 mac_addr[ETH_ALEN]; -- u16 seq_num; -- u16 ctx_block_len; -- /* followed by ctx_block_len bytes */ --} __attribute__ ((packed)); -- --enum { -- IAPP_MOVE_SUCCESSFUL = 0, -- IAPP_MOVE_DENIED = 1, -- IAPP_MOVE_STALE_MOVE = 2, --}; -- -- --/* CACHE-notify */ --struct iapp_cache_notify { -- u8 addr_len; /* ETH_ALEN */ -- u8 reserved; -- u8 mac_addr[ETH_ALEN]; -- u16 seq_num; -- u8 current_ap[ETH_ALEN]; -- u16 ctx_block_len; -- /* ctx_block_len bytes of context block followed by 16-bit context -- * timeout */ --} __attribute__ ((packed)); -- -- --/* CACHE-response - unicast TCP */ --struct iapp_cache_response { -- u8 addr_len; /* ETH_ALEN */ -- u8 status; -- u8 mac_addr[ETH_ALEN]; -- u16 seq_num; --} __attribute__ ((packed)); -- --enum { -- IAPP_CACHE_SUCCESSFUL = 0, -- IAPP_CACHE_STALE_CACHE = 1, --}; -- -- --/* Send-Security-Block - unicast TCP */ --struct iapp_send_security_block { -- u8 iv[8]; -- u16 sec_block_len; -- /* followed by sec_block_len bytes of security block */ --} __attribute__ ((packed)); -- -- --/* ACK-Security-Block - unicast TCP */ --struct iapp_ack_security_block { -- u8 iv[8]; -- u8 new_ap_ack_authenticator[48]; --} __attribute__ ((packed)); -- -- --struct iapp_data { -- struct hostapd_data *hapd; -- u16 identifier; /* next IAPP identifier */ -- struct in_addr own, multicast; -- int udp_sock; -- int packet_sock; --}; -- -- --static void iapp_send_add(struct iapp_data *iapp, u8 *mac_addr, u16 seq_num) --{ -- char buf[128]; -- struct iapp_hdr *hdr; -- struct iapp_add_notify *add; -- struct sockaddr_in addr; -- -- /* Send IAPP ADD-notify to remove possible association from other APs -- */ -- -- hdr = (struct iapp_hdr *) buf; -- hdr->version = IAPP_VERSION; -- hdr->command = IAPP_CMD_ADD_notify; -- hdr->identifier = host_to_be16(iapp->identifier++); -- hdr->length = host_to_be16(sizeof(*hdr) + sizeof(*add)); -- -- add = (struct iapp_add_notify *) (hdr + 1); -- add->addr_len = ETH_ALEN; -- add->reserved = 0; -- os_memcpy(add->mac_addr, mac_addr, ETH_ALEN); -- -- add->seq_num = host_to_be16(seq_num); -- -- os_memset(&addr, 0, sizeof(addr)); -- addr.sin_family = AF_INET; -- addr.sin_addr.s_addr = iapp->multicast.s_addr; -- addr.sin_port = htons(IAPP_UDP_PORT); -- if (sendto(iapp->udp_sock, buf, (char *) (add + 1) - buf, 0, -- (struct sockaddr *) &addr, sizeof(addr)) < 0) -- wpa_printf(MSG_INFO, "sendto[IAPP-ADD]: %s", strerror(errno)); --} -- -- --static void iapp_send_layer2_update(struct iapp_data *iapp, u8 *addr) --{ -- struct iapp_layer2_update msg; -- -- /* Send Level 2 Update Frame to update forwarding tables in layer 2 -- * bridge devices */ -- -- /* 802.2 Type 1 Logical Link Control (LLC) Exchange Identifier (XID) -- * Update response frame; IEEE Std 802.2-1998, 5.4.1.2.1 */ -- -- os_memset(msg.da, 0xff, ETH_ALEN); -- os_memcpy(msg.sa, addr, ETH_ALEN); -- msg.len = host_to_be16(6); -- msg.dsap = 0; /* NULL DSAP address */ -- msg.ssap = 0x01; /* NULL SSAP address, CR Bit: Response */ -- msg.control = 0xaf; /* XID response lsb.1111F101. -- * F=0 (no poll command; unsolicited frame) */ -- msg.xid_info[0] = 0x81; /* XID format identifier */ -- msg.xid_info[1] = 1; /* LLC types/classes: Type 1 LLC */ -- msg.xid_info[2] = 1 << 1; /* XID sender's receive window size (RW) -- * FIX: what is correct RW with 802.11? */ -- -- if (send(iapp->packet_sock, &msg, sizeof(msg), 0) < 0) -- wpa_printf(MSG_INFO, "send[L2 Update]: %s", strerror(errno)); --} -- -- --/** -- * iapp_new_station - IAPP processing for a new STA -- * @iapp: IAPP data -- * @sta: The associated station -- */ --void iapp_new_station(struct iapp_data *iapp, struct sta_info *sta) --{ -- u16 seq = 0; /* TODO */ -- -- if (iapp == NULL) -- return; -- -- /* IAPP-ADD.request(MAC Address, Sequence Number, Timeout) */ -- hostapd_logger(iapp->hapd, sta->addr, HOSTAPD_MODULE_IAPP, -- HOSTAPD_LEVEL_DEBUG, "IAPP-ADD.request(seq=%d)", seq); -- iapp_send_layer2_update(iapp, sta->addr); -- iapp_send_add(iapp, sta->addr, seq); -- -- /* TODO: If this was reassociation: -- * IAPP-MOVE.request(MAC Address, Sequence Number, Old AP, -- * Context Block, Timeout) -- * TODO: Send IAPP-MOVE to the old AP; Map Old AP BSSID to -- * IP address */ --} -- -- --static void iapp_process_add_notify(struct iapp_data *iapp, -- struct sockaddr_in *from, -- struct iapp_hdr *hdr, int len) --{ -- struct iapp_add_notify *add = (struct iapp_add_notify *) (hdr + 1); -- struct sta_info *sta; -- -- if (len != sizeof(*add)) { -- wpa_printf(MSG_INFO, "Invalid IAPP-ADD packet length %d (expected %lu)", -- len, (unsigned long) sizeof(*add)); -- return; -- } -- -- sta = ap_get_sta(iapp->hapd, add->mac_addr); -- -- /* IAPP-ADD.indication(MAC Address, Sequence Number) */ -- hostapd_logger(iapp->hapd, add->mac_addr, HOSTAPD_MODULE_IAPP, -- HOSTAPD_LEVEL_INFO, -- "Received IAPP ADD-notify (seq# %d) from %s:%d%s", -- be_to_host16(add->seq_num), -- inet_ntoa(from->sin_addr), ntohs(from->sin_port), -- sta ? "" : " (STA not found)"); -- -- if (!sta) -- return; -- -- /* TODO: could use seq_num to try to determine whether last association -- * to this AP is newer than the one advertised in IAPP-ADD. Although, -- * this is not really a reliable verification. */ -- -- hostapd_logger(iapp->hapd, add->mac_addr, HOSTAPD_MODULE_IAPP, -- HOSTAPD_LEVEL_DEBUG, -- "Removing STA due to IAPP ADD-notify"); -- ap_sta_disconnect(iapp->hapd, sta, NULL, 0); --} -- -- --/** -- * iapp_receive_udp - Process IAPP UDP frames -- * @sock: File descriptor for the socket -- * @eloop_ctx: IAPP data (struct iapp_data *) -- * @sock_ctx: Not used -- */ --static void iapp_receive_udp(int sock, void *eloop_ctx, void *sock_ctx) --{ -- struct iapp_data *iapp = eloop_ctx; -- int len, hlen; -- unsigned char buf[128]; -- struct sockaddr_in from; -- socklen_t fromlen; -- struct iapp_hdr *hdr; -- -- /* Handle incoming IAPP frames (over UDP/IP) */ -- -- fromlen = sizeof(from); -- len = recvfrom(iapp->udp_sock, buf, sizeof(buf), 0, -- (struct sockaddr *) &from, &fromlen); -- if (len < 0) { -- wpa_printf(MSG_INFO, "iapp_receive_udp - recvfrom: %s", -- strerror(errno)); -- return; -- } -- -- if (from.sin_addr.s_addr == iapp->own.s_addr) -- return; /* ignore own IAPP messages */ -- -- hostapd_logger(iapp->hapd, NULL, HOSTAPD_MODULE_IAPP, -- HOSTAPD_LEVEL_DEBUG, -- "Received %d byte IAPP frame from %s%s\n", -- len, inet_ntoa(from.sin_addr), -- len < (int) sizeof(*hdr) ? " (too short)" : ""); -- -- if (len < (int) sizeof(*hdr)) -- return; -- -- hdr = (struct iapp_hdr *) buf; -- hlen = be_to_host16(hdr->length); -- hostapd_logger(iapp->hapd, NULL, HOSTAPD_MODULE_IAPP, -- HOSTAPD_LEVEL_DEBUG, -- "RX: version=%d command=%d id=%d len=%d\n", -- hdr->version, hdr->command, -- be_to_host16(hdr->identifier), hlen); -- if (hdr->version != IAPP_VERSION) { -- wpa_printf(MSG_INFO, "Dropping IAPP frame with unknown version %d", -- hdr->version); -- return; -- } -- if (hlen > len) { -- wpa_printf(MSG_INFO, "Underflow IAPP frame (hlen=%d len=%d)", -- hlen, len); -- return; -- } -- if (hlen < len) { -- wpa_printf(MSG_INFO, "Ignoring %d extra bytes from IAPP frame", -- len - hlen); -- len = hlen; -- } -- -- switch (hdr->command) { -- case IAPP_CMD_ADD_notify: -- iapp_process_add_notify(iapp, &from, hdr, len - sizeof(*hdr)); -- break; -- case IAPP_CMD_MOVE_notify: -- /* TODO: MOVE is using TCP; so move this to TCP handler once it -- * is implemented.. */ -- /* IAPP-MOVE.indication(MAC Address, New BSSID, -- * Sequence Number, AP Address, Context Block) */ -- /* TODO: process */ -- break; -- default: -- wpa_printf(MSG_INFO, "Unknown IAPP command %d", hdr->command); -- break; -- } --} -- -- --struct iapp_data * iapp_init(struct hostapd_data *hapd, const char *iface) --{ -- struct ifreq ifr; -- struct sockaddr_ll addr; -- int ifindex; -- struct sockaddr_in *paddr, uaddr; -- struct iapp_data *iapp; -- struct ip_mreqn mreq; -- int reuseaddr = 1; -- -- iapp = os_zalloc(sizeof(*iapp)); -- if (iapp == NULL) -- return NULL; -- iapp->hapd = hapd; -- iapp->udp_sock = iapp->packet_sock = -1; -- -- /* TODO: -- * open socket for sending and receiving IAPP frames over TCP -- */ -- -- iapp->udp_sock = socket(PF_INET, SOCK_DGRAM, 0); -- if (iapp->udp_sock < 0) { -- wpa_printf(MSG_INFO, "iapp_init - socket[PF_INET,SOCK_DGRAM]: %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- -- os_memset(&ifr, 0, sizeof(ifr)); -- os_strlcpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)); -- if (ioctl(iapp->udp_sock, SIOCGIFINDEX, &ifr) != 0) { -- wpa_printf(MSG_INFO, "iapp_init - ioctl(SIOCGIFINDEX): %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- ifindex = ifr.ifr_ifindex; -- -- if (ioctl(iapp->udp_sock, SIOCGIFADDR, &ifr) != 0) { -- wpa_printf(MSG_INFO, "iapp_init - ioctl(SIOCGIFADDR): %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- paddr = (struct sockaddr_in *) &ifr.ifr_addr; -- if (paddr->sin_family != AF_INET) { -- wpa_printf(MSG_INFO, "IAPP: Invalid address family %i (SIOCGIFADDR)", -- paddr->sin_family); -- iapp_deinit(iapp); -- return NULL; -- } -- iapp->own.s_addr = paddr->sin_addr.s_addr; -- -- if (ioctl(iapp->udp_sock, SIOCGIFBRDADDR, &ifr) != 0) { -- wpa_printf(MSG_INFO, "iapp_init - ioctl(SIOCGIFBRDADDR): %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- paddr = (struct sockaddr_in *) &ifr.ifr_addr; -- if (paddr->sin_family != AF_INET) { -- wpa_printf(MSG_INFO, "Invalid address family %i (SIOCGIFBRDADDR)", -- paddr->sin_family); -- iapp_deinit(iapp); -- return NULL; -- } -- inet_aton(IAPP_MULTICAST, &iapp->multicast); -- -- os_memset(&uaddr, 0, sizeof(uaddr)); -- uaddr.sin_family = AF_INET; -- uaddr.sin_port = htons(IAPP_UDP_PORT); -- -- if (setsockopt(iapp->udp_sock, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, -- sizeof(reuseaddr)) < 0) { -- wpa_printf(MSG_INFO, -- "iapp_init - setsockopt[UDP,SO_REUSEADDR]: %s", -- strerror(errno)); -- /* -- * Ignore this and try to continue. This is fine for single -- * BSS cases, but may fail if multiple BSSes enable IAPP. -- */ -- } -- -- if (bind(iapp->udp_sock, (struct sockaddr *) &uaddr, -- sizeof(uaddr)) < 0) { -- wpa_printf(MSG_INFO, "iapp_init - bind[UDP]: %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- -- os_memset(&mreq, 0, sizeof(mreq)); -- mreq.imr_multiaddr = iapp->multicast; -- mreq.imr_address.s_addr = INADDR_ANY; -- mreq.imr_ifindex = 0; -- if (setsockopt(iapp->udp_sock, SOL_IP, IP_ADD_MEMBERSHIP, &mreq, -- sizeof(mreq)) < 0) { -- wpa_printf(MSG_INFO, "iapp_init - setsockopt[UDP,IP_ADD_MEMBERSHIP]: %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- -- iapp->packet_sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); -- if (iapp->packet_sock < 0) { -- wpa_printf(MSG_INFO, "iapp_init - socket[PF_PACKET,SOCK_RAW]: %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- -- os_memset(&addr, 0, sizeof(addr)); -- addr.sll_family = AF_PACKET; -- addr.sll_ifindex = ifindex; -- if (bind(iapp->packet_sock, (struct sockaddr *) &addr, -- sizeof(addr)) < 0) { -- wpa_printf(MSG_INFO, "iapp_init - bind[PACKET]: %s", -- strerror(errno)); -- iapp_deinit(iapp); -- return NULL; -- } -- -- if (eloop_register_read_sock(iapp->udp_sock, iapp_receive_udp, -- iapp, NULL)) { -- wpa_printf(MSG_INFO, "Could not register read socket for IAPP"); -- iapp_deinit(iapp); -- return NULL; -- } -- -- wpa_printf(MSG_INFO, "IEEE 802.11F (IAPP) using interface %s", iface); -- -- /* TODO: For levels 2 and 3: send RADIUS Initiate-Request, receive -- * RADIUS Initiate-Accept or Initiate-Reject. IAPP port should actually -- * be openned only after receiving Initiate-Accept. If Initiate-Reject -- * is received, IAPP is not started. */ -- -- return iapp; --} -- -- --void iapp_deinit(struct iapp_data *iapp) --{ -- struct ip_mreqn mreq; -- -- if (iapp == NULL) -- return; -- -- if (iapp->udp_sock >= 0) { -- os_memset(&mreq, 0, sizeof(mreq)); -- mreq.imr_multiaddr = iapp->multicast; -- mreq.imr_address.s_addr = INADDR_ANY; -- mreq.imr_ifindex = 0; -- if (setsockopt(iapp->udp_sock, SOL_IP, IP_DROP_MEMBERSHIP, -- &mreq, sizeof(mreq)) < 0) { -- wpa_printf(MSG_INFO, "iapp_deinit - setsockopt[UDP,IP_DEL_MEMBERSHIP]: %s", -- strerror(errno)); -- } -- -- eloop_unregister_read_sock(iapp->udp_sock); -- close(iapp->udp_sock); -- } -- if (iapp->packet_sock >= 0) { -- eloop_unregister_read_sock(iapp->packet_sock); -- close(iapp->packet_sock); -- } -- os_free(iapp); --} -diff --git a/src/ap/iapp.h b/src/ap/iapp.h -deleted file mode 100644 -index c22118342..000000000 ---- a/src/ap/iapp.h -+++ /dev/null -@@ -1,39 +0,0 @@ --/* -- * hostapd / IEEE 802.11F-2003 Inter-Access Point Protocol (IAPP) -- * Copyright (c) 2002-2005, Jouni Malinen -- * -- * This software may be distributed under the terms of the BSD license. -- * See README for more details. -- */ -- --#ifndef IAPP_H --#define IAPP_H -- --struct iapp_data; -- --#ifdef CONFIG_IAPP -- --void iapp_new_station(struct iapp_data *iapp, struct sta_info *sta); --struct iapp_data * iapp_init(struct hostapd_data *hapd, const char *iface); --void iapp_deinit(struct iapp_data *iapp); -- --#else /* CONFIG_IAPP */ -- --static inline void iapp_new_station(struct iapp_data *iapp, -- struct sta_info *sta) --{ --} -- --static inline struct iapp_data * iapp_init(struct hostapd_data *hapd, -- const char *iface) --{ -- return NULL; --} -- --static inline void iapp_deinit(struct iapp_data *iapp) --{ --} -- --#endif /* CONFIG_IAPP */ -- --#endif /* IAPP_H */ -diff --git a/src/utils/wpa_debug.h b/src/utils/wpa_debug.h -index 1fe0b7db7..c94c4391f 100644 ---- a/src/utils/wpa_debug.h -+++ b/src/utils/wpa_debug.h -@@ -305,7 +305,6 @@ void hostapd_logger_register_cb(hostapd_logger_cb_func func); - #define HOSTAPD_MODULE_RADIUS 0x00000004 - #define HOSTAPD_MODULE_WPA 0x00000008 - #define HOSTAPD_MODULE_DRIVER 0x00000010 --#define HOSTAPD_MODULE_IAPP 0x00000020 - #define HOSTAPD_MODULE_MLME 0x00000040 - - enum hostapd_logger_level { --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch deleted file mode 100644 index 54c405b539..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 9 Nov 2020 11:43:12 +0200 -Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group - client - -Parsing and copying of WPS secondary device types list was verifying -that the contents is not too long for the internal maximum in the case -of WPS messages, but similar validation was missing from the case of P2P -group information which encodes this information in a different -attribute. This could result in writing beyond the memory area assigned -for these entries and corrupting memory within an instance of struct -p2p_device. This could result in invalid operations and unexpected -behavior when trying to free pointers from that corrupted memory. - -CVE: CVE-2021-0326 - -Upstream-Status: Backport - -Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269 -Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers") -Signed-off-by: Jouni Malinen -Signed-off-by: Mingli Yu ---- - src/p2p/p2p.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c -index 74b7b52ae..5cbfc217f 100644 ---- a/src/p2p/p2p.c -+++ b/src/p2p/p2p.c -@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev, - dev->info.config_methods = cli->config_methods; - os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); - dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; -+ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) -+ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; - os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, - dev->info.wps_sec_dev_type_list_len); - } --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch deleted file mode 100644 index fedff76b18..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Tue, 8 Dec 2020 23:52:50 +0200 -Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request - -p2p_add_device() may remove the oldest entry if there is no room in the -peer table for a new peer. This would result in any pointer to that -removed entry becoming stale. A corner case with an invalid PD Request -frame could result in such a case ending up using (read+write) freed -memory. This could only by triggered when the peer table has reached its -maximum size and the PD Request frame is received from the P2P Device -Address of the oldest remaining entry and the frame has incorrect P2P -Device Address in the payload. - -Fix this by fetching the dev pointer again after having called -p2p_add_device() so that the stale pointer cannot be used. - -CVE: CVE-2021-27803 - -Upstream-Status: Backport - -Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request") -Signed-off-by: Jouni Malinen ---- - src/p2p/p2p_pd.c | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c -index 3994ec03f..05fd59349 100644 ---- a/src/p2p/p2p_pd.c -+++ b/src/p2p/p2p_pd.c -@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, - goto out; - } - -+ dev = p2p_get_device(p2p, sa); - if (!dev) { -- dev = p2p_get_device(p2p, sa); -- if (!dev) { -- p2p_dbg(p2p, -- "Provision Discovery device not found " -- MACSTR, MAC2STR(sa)); -- goto out; -- } -+ p2p_dbg(p2p, -+ "Provision Discovery device not found " -+ MACSTR, MAC2STR(sa)); -+ goto out; - } - } else if (msg.wfd_subelems) { - wpabuf_free(dev->info.wfd_subelems); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-30004.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-30004.patch deleted file mode 100644 index e2540fc26b..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-30004.patch +++ /dev/null @@ -1,123 +0,0 @@ -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sat, 13 Mar 2021 18:19:31 +0200 -Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters - -The supported hash algorithms do not use AlgorithmIdentifier parameters. -However, there are implementations that include NULL parameters in -addition to ones that omit the parameters. Previous implementation did -not check the parameters value at all which supported both these cases, -but did not reject any other unexpected information. - -Use strict validation of digest algorithm parameters and reject any -unexpected value when validating a signature. This is needed to prevent -potential forging attacks. - -Signed-off-by: Jouni Malinen - -Upstream-Status: Backport -CVE: CVE-2021-30004 - -Reference to upstream patch: -[https://w1.fi/cgit/hostap/commit/?id=a0541334a6394f8237a4393b7372693cd7e96f15] - -Signed-off-by: Stefan Ghinea ---- - src/tls/pkcs1.c | 21 +++++++++++++++++++++ - src/tls/x509v3.c | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c -index 141ac50..e09db07 100644 ---- a/src/tls/pkcs1.c -+++ b/src/tls/pkcs1.c -@@ -240,6 +240,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", -+ hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -261,6 +263,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -269,6 +273,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "PKCS #1: Unexpected digest algorithm parameters"); -+ os_free(decrypted); -+ return -1; -+ } - - if (!asn1_oid_equal(&oid, hash_alg)) { - char txt[100], txt2[100]; -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c -index 1bd5aa0..bf2289f 100644 ---- a/src/tls/x509v3.c -+++ b/src/tls/x509v3.c -@@ -1834,6 +1834,7 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -1855,6 +1856,8 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -1862,6 +1865,23 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "X509: Unexpected digest algorithm parameters"); -+ os_free(data); -+ return -1; -+ } - - if (x509_sha1_oid(&oid)) { - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb new file mode 100644 index 0000000000..dbdc5c1bdf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb @@ -0,0 +1,51 @@ +SUMMARY = "User space daemon for extended IEEE 802.11 management" +HOMEPAGE = "http://w1.fi/hostapd/" +SECTION = "kernel/userland" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://hostapd/README;md5=c905478466c90f1cefc0df987c40e172" + +DEPENDS = "libnl openssl" + +SRC_URI = " \ + http://w1.fi/releases/hostapd-${PV}.tar.gz \ + file://defconfig \ + file://init \ + file://hostapd.service \ +" + + +SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" + +S = "${WORKDIR}/hostapd-${PV}" +B = "${WORKDIR}/hostapd-${PV}/hostapd" + +inherit update-rc.d systemd pkgconfig features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" + +INITSCRIPT_NAME = "hostapd" + +SYSTEMD_SERVICE:${PN} = "hostapd.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +do_configure:append() { + install -m 0644 ${WORKDIR}/defconfig ${B}/.config +} + +do_compile() { + export CFLAGS="-MMD -O2 -Wall -g" + export EXTRA_CFLAGS="${CFLAGS}" + make V=1 +} + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/ + install -m 0644 ${B}/hostapd.conf ${D}${sysconfdir} + install -m 0755 ${B}/hostapd ${D}${sbindir} + install -m 0755 ${B}/hostapd_cli ${D}${sbindir} + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd + install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service +} + +CONFFILES:${PN} += "${sysconfdir}/hostapd.conf" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb deleted file mode 100644 index 3356f45ca1..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "User space daemon for extended IEEE 802.11 management" -HOMEPAGE = "http://w1.fi/hostapd/" -SECTION = "kernel/userland" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://hostapd/README;md5=1ec986bec88070e2a59c68c95d763f89" - -DEPENDS = "libnl openssl" - -SRC_URI = " \ - http://w1.fi/releases/hostapd-${PV}.tar.gz \ - file://defconfig \ - file://init \ - file://hostapd.service \ - file://0001-Prepare-for-CVE-2021-30004.patch.patch \ - file://CVE-2019-16275.patch \ - file://CVE-2019-5061.patch \ - file://CVE-2021-0326.patch \ - file://CVE-2021-27803.patch \ - file://CVE-2021-30004.patch \ -" - -SRC_URI[md5sum] = "f188fc53a495fe7af3b6d77d3c31dee8" -SRC_URI[sha256sum] = "881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7" - -S = "${WORKDIR}/hostapd-${PV}" -B = "${WORKDIR}/hostapd-${PV}/hostapd" - -inherit update-rc.d systemd pkgconfig features_check - -CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" - -INITSCRIPT_NAME = "hostapd" - -SYSTEMD_SERVICE:${PN} = "hostapd.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" - -do_configure:append() { - install -m 0644 ${WORKDIR}/defconfig ${B}/.config -} - -do_compile() { - export CFLAGS="-MMD -O2 -Wall -g" - export EXTRA_CFLAGS="${CFLAGS}" - make V=1 -} - -do_install() { - install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/ - install -m 0644 ${B}/hostapd.conf ${D}${sysconfdir} - install -m 0755 ${B}/hostapd ${D}${sbindir} - install -m 0755 ${B}/hostapd_cli ${D}${sbindir} - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd - install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service -} - -CONFFILES:${PN} += "${sysconfdir}/hostapd.conf" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.21.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.21.bb deleted file mode 100644 index 834c1d897f..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.21.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Wireless daemon for Linux" -HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "ell" - -SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ - file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ - " -SRC_URI[sha256sum] = "bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851" - -inherit autotools manpages pkgconfig python3native systemd - -PACKAGECONFIG ??= " \ - client \ - monitor \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" -PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" -PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" -PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF = "--enable-external-ell" - -SYSTEMD_SERVICE:${PN} = " \ - iwd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ -" - -do_configure:prepend() { - install -d ${S}/build-aux -} - -do_install:append() { - # If client and monitor are disabled, bindir is empty, causing a QA error - rmdir --ignore-fail-on-non-empty ${D}/${bindir} -} - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${nonarch_libdir}/modules-load.d \ - ${systemd_unitdir}/network \ -" - -RDEPENDS:${PN} = "dbus" - -RRECOMMENDS:${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb new file mode 100644 index 0000000000..6ee2651afe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb @@ -0,0 +1,55 @@ +SUMMARY = "Wireless daemon for Linux" +HOMEPAGE = "https://iwd.wiki.kernel.org/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "ell" + +SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ + file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ + " +SRC_URI[sha256sum] = "61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224" + +inherit autotools manpages pkgconfig python3native systemd + +PACKAGECONFIG ??= " \ + client \ + monitor \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" +PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF = "--enable-external-ell" + +SYSTEMD_SERVICE:${PN} = " \ + iwd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ +" + +do_configure:prepend() { + install -d ${S}/build-aux +} + +do_install:append() { + # If client and monitor are disabled, bindir is empty, causing a QA error + rmdir --ignore-fail-on-non-empty ${D}/${bindir} +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${nonarch_libdir}/modules-load.d \ + ${systemd_unitdir}/network \ +" + +RDEPENDS:${PN} = "dbus" + +RRECOMMENDS:${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb deleted file mode 100644 index c337abde37..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" -DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ - devices which speak the Qualcomm MSM Interface (QMI) protocol" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = "glib-2.0 glib-2.0-native" - -inherit autotools pkgconfig bash-completion gobject-introspection - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "be01ece0ea2c2194cbea5744bf5aaf06c04ba5fb7ec7887a13116c76d114fedd" - -PACKAGECONFIG ??= "udev mbim" -PACKAGECONFIG[udev] = ",--without-udev,libgudev" -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb new file mode 100644 index 0000000000..dee36d7b45 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" +DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ + devices which speak the Qualcomm MSM Interface (QMI) protocol" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = "glib-2.0 glib-2.0-native" + +inherit autotools pkgconfig bash-completion gobject-introspection + +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6" + +PACKAGECONFIG ??= "udev mbim" +PACKAGECONFIG[udev] = ",--without-udev,libgudev" +PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.4.bb deleted file mode 100644 index fcd2546472..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A serial to network proxy" -SECTION = "console/network" -HOMEPAGE = "http://sourceforge.net/projects/ser2net/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" - -DEPENDS = "gensio libyaml" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" - -SRC_URI[sha256sum] = "c714d6777849100b2ca3f216d1cfc36d4573639ececc91d5c7809dfe27c8428e" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb new file mode 100644 index 0000000000..63b97d20ba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb @@ -0,0 +1,18 @@ +SUMMARY = "A serial to network proxy" +SECTION = "console/network" +HOMEPAGE = "http://sourceforge.net/projects/ser2net/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" + +DEPENDS = "gensio libyaml" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" + +SRC_URI[sha256sum] = "848c4fe863806e506832f1ee85b8b68258f06eb19dad43dbeee16a2cfe5d9053" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb new file mode 100644 index 0000000000..357cf4f752 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "C++ bindings for the glib library" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "mm-common glib-2.0 libsigc++-3 glib-2.0-native" + +GNOMEBASEBUILDCLASS = "meson" +GNOMEBN = "glibmm" +inherit gnomebase + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI[archive.sha256sum] = "8008fd8aeddcc867a3f97f113de625f6e96ef98cf7860379813a9c0feffdb520" + +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +do_install:append() { + for i in generate_wrap_init.pl gmmproc; do + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.68/proc/$i + done +} + +FILES:${PN} = "${libdir}/lib*.so.*" +FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/${BPN}/include/ ${libdir}/${BPN}/proc/ ${libdir}/giomm-2.68/include/" + +RDEPENDS:${PN}-dev = "perl" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb deleted file mode 100644 index 94844f21e6..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "C++ bindings for the glib library" -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ - file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -SRC_URI[archive.sha256sum] = "69bd6b5327716ca2f511ab580a969fd7bf0cd2c24ce15e1d0e530592d3ff209c" - -do_install:append() { - for i in generate_wrap_init.pl gmmproc; do - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i - done -} - -FILES:${PN} = "${libdir}/lib*.so.*" -FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" - -RDEPENDS:${PN}-dev = "perl" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb new file mode 100644 index 0000000000..2097ce84fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "C++ bindings for the glib library" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI[archive.sha256sum] = "b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d" + +do_install:append() { + for i in generate_wrap_init.pl gmmproc; do + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i + done +} + +FILES:${PN} = "${libdir}/lib*.so.*" +FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" + +RDEPENDS:${PN}-dev = "perl" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb deleted file mode 100644 index 1549c6ad0f..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.0.6.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A library for loose coupling of C++ method calls" -SECTION = "libs" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875" - -DEPENDS = "mm-common" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz" -SRC_URI[md5sum] = "8cc0c1df6b7d9c466555f4a2963ab06a" -SRC_URI[sha256sum] = "b70edcf4611651c54a426e109b17196e1fa17da090592a5000e2d134c03ac5ce" - -S = "${WORKDIR}/libsigc++-${PV}" - -inherit setuptools3 meson - -FILES:${PN}-dev += "${libdir}/sigc++-*/" -FILES:${PN}-doc += "${datadir}/devhelp" - -BBCLASSEXTEND = "native" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb new file mode 100644 index 0000000000..3726dd0b2b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A library for loose coupling of C++ method calls" +SECTION = "libs" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875" + +DEPENDS = "mm-common" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.2/libsigc++-${PV}.tar.xz" +SRC_URI[sha256sum] = "8cdcb986e3f0a7c5b4474aa3c833d676e62469509f4899110ddf118f04082651" + +S = "${WORKDIR}/libsigc++-${PV}" + +inherit setuptools3 meson + +FILES:${PN}-dev += "${libdir}/sigc++-*/" +FILES:${PN}-doc += "${datadir}/devhelp" + +BBCLASSEXTEND = "native" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb new file mode 100644 index 0000000000..9c3b3e9ad8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "C++ wrapper for libxml library" +DESCRIPTION = "C++ wrapper for libxml library" +HOMEPAGE = "http://libxmlplusplus.sourceforge.net" +BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B" +SECTION = "libs" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" +SRC_URI = "${GNOME_MIRROR}/libxml++/${SHRT_VER}/libxml++-${PV}.tar.xz \ +" +SRC_URI[sha256sum] = "15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098" + +S = "${WORKDIR}/libxml++-${PV}" +DEPENDS = "libxml2 glibmm" + +inherit meson pkgconfig ptest + +FILES:${PN}-doc += "${datadir}/devhelp" +FILES:${PN}-dev += "${libdir}/libxml++-${SHRT_VER}/include/libxml++config.h" diff --git a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch index 0d1a5186a6..dc6198fe98 100644 --- a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch +++ b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch @@ -1,20 +1,16 @@ -Index: libxml++-2.40.1/Makefile.am -=================================================================== ---- libxml++-2.40.1.orig/Makefile.am -+++ libxml++-2.40.1/Makefile.am -@@ -24,5 +24,8 @@ dist_noinst_SCRIPTS = autogen.sh - - DISTCLEANFILES = MSVC_Net2010/libxml++/libxml++config.h +--- a/Makefile.am ++++ b/Makefile.am +@@ -40,5 +40,8 @@ EXTRA_DIST = \ + tools/conf_tests/have_exception_ptr.cc \ + untracked/README +install-ptest: + make -C examples install-ptest + # Optional: auto-generate the ChangeLog file from the git log on make dist include $(top_srcdir)/build/dist-changelog.am -Index: libxml++-2.40.1/examples/Makefile.am -=================================================================== ---- libxml++-2.40.1.orig/examples/Makefile.am -+++ libxml++-2.40.1/examples/Makefile.am +--- a/examples/Makefile.am ++++ b/examples/Makefile.am @@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_ AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) @@ -51,10 +47,10 @@ Index: libxml++-2.40.1/examples/Makefile.am @@ -154,10 +173,10 @@ dist_noinst_DATA = \ # file are located in different directories. dom_read_write/make_check.sh: Makefile - echo '# Generated and used by "make check"' >$@ -- echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@ -+ echo 'cd dom_read_write && .libs/dom_read_write "example.xml" example_output.xml >/dev/null' >>$@ - chmod +x $@ + $(AM_V_GEN)echo '# Generated and used by "make check"' >$@ +- $(AM_V_at)echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@ ++ $(AM_V_at)echo 'cd dom_read_write && .libs/dom_read_write "example.xml" example_output.xml >/dev/null' >>$@ + $(AM_V_at)chmod +x $@ -script_template = cd "$(srcdir)/" && "$(abs_builddir)//" >/dev/null +script_template = cd "" && ".libs/" >/dev/null diff --git a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb deleted file mode 100644 index 7e08263ca4..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "C++ wrapper for libxml library" -DESCRIPTION = "C++ wrapper for libxml library" -HOMEPAGE = "http://libxmlplusplus.sourceforge.net" -BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B" -SECTION = "libs" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ - file://libxml++_ptest.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "377a87bea899f2b4ff62df2418c3d8a6" -SRC_URI[sha256sum] = "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9" - -DEPENDS = "libxml2 glibmm" - -inherit autotools pkgconfig ptest - -do_compile_ptest() { - oe_runmake -C examples buildtest -} - -FILES:${PN}-doc += "${datadir}/devhelp" -FILES:${PN}-dev += "${libdir}/libxml++-2.6/include/libxml++config.h" - -RDEPENDS:${PN}-ptest += "make" diff --git a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb new file mode 100644 index 0000000000..6065333d9a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb @@ -0,0 +1,33 @@ +SUMMARY = "C++ wrapper for libxml library" +DESCRIPTION = "C++ wrapper for libxml library" +HOMEPAGE = "http://libxmlplusplus.sourceforge.net" +BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B" +SECTION = "libs" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ + file://libxml++_ptest.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "9b59059abe5545d28ceb388a55e341095f197bd219c73e6623aeb6d801e00be8" + +DEPENDS = "libxml2 glibmm mm-common-native" + +inherit autotools pkgconfig ptest + +EXTRA_OECONF = "--disable-documentation" + +do_configure:prepend() { + mm-common-prepare --copy --force ${S} +} + +do_compile_ptest() { + oe_runmake -C examples buildtest +} + +FILES:${PN}-doc += "${datadir}/devhelp" +FILES:${PN}-dev += "${libdir}/libxml++-2.6/include/libxml++config.h" + +RDEPENDS:${PN}-ptest += "make" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch index 6031eaa782..7d1dbc6ee4 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -14,19 +14,23 @@ just ask for python3 executable. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller + +rebase for 1.0.4 +Signed-off-by: Wang Mingyu + --- meson.build | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build -index 3255328..7a6094c 100644 +index 8a18c36..34fd546 100644 --- a/meson.build +++ b/meson.build -@@ -6,12 +6,7 @@ project('mm-common', - license: 'GPLv2+' +@@ -7,12 +7,7 @@ project('mm-common', + # and meson.add_install_script(python3, ...) ) --python3 = import('python').find_installation('python3') +-python3 = import('python').find_installation() -python_version = python3.language_version() -python_version_req = '>= 3.5' -if not python_version.version_compare(python_version_req) @@ -37,5 +41,5 @@ index 3255328..7a6094c 100644 # Use these instead of meson.source_root() and meson.build_root(). # source_root() and build_root() are not useful, if this is a subproject. -- -2.21.0 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb deleted file mode 100644 index ae2bf2d02d..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Common GNOME build files for C++ bindings" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase - -SRC_URI[archive.sha256sum] = "e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5" -SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb new file mode 100644 index 0000000000..cee56fd55a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb @@ -0,0 +1,12 @@ +SUMMARY = "Common GNOME build files for C++ bindings" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase + +SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8" +SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 62ada76f93..d7076c211a 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -327,11 +327,13 @@ RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64 = "android-tools breakpa RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64le = "android-tools breakpad lshw luajit ply uftrace" RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" +RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php" RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit" RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply" RDEPENDS:packagegroup-meta-oe-extended ="\ bitwise \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ brotli \ byacc \ cmatrix \ @@ -407,7 +409,6 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ libstatgrab \ lockfile-progs \ logwatch \ - mailx \ mraa \ ostree \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb pam-ssh-agent-auth", "", d)} \ @@ -419,6 +420,7 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ sedutil \ libsigrok \ libsigrokdecode \ + s-nail \ sigrok-cli \ snappy \ tipcutils \ @@ -655,7 +657,7 @@ RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash makedumpfile oprofi RDEPENDS:packagegroup-meta-oe-multimedia ="\ alsa-oss \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faad2", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \ dirsplit \ genisoimage \ icedax \ @@ -669,7 +671,7 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ libburn \ libcdio-paranoia \ libcdio \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \ libmms \ libdvdread \ libopus \ @@ -683,7 +685,7 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ wavpack \ libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "mpv", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \ libopusenc \ " @@ -763,6 +765,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ hwdata \ iksemel \ gengetopt \ + googlebenchmark \ imagemagick \ iniparser \ inotify-tools \ @@ -821,7 +824,6 @@ RDEPENDS:packagegroup-meta-oe-support ="\ libusbgx \ lockdev \ logwarn \ - libjs-jquery \ libjs-sizzle \ liblinebreak \ mailcap \ diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch new file mode 100644 index 0000000000..ba2bf224a6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch @@ -0,0 +1,35 @@ +From f270f80d4c36a22a0f7b8de8fb6b1abef6f7b183 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 15 Feb 2022 16:23:10 +0800 +Subject: [PATCH] plymouth : Add the retain-splash option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Adding the "retain-splash” option to tell plymouth to keep the boot +splash’s contents on screen even after plymouth exits to make the +splash screen show more friendly on the system which boots so fast. + +Upstream-Status: Inappropriate[embedded specific] + +Signed-off-by: Mingli Yu +--- + systemd-units/plymouth-quit.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd-units/plymouth-quit.service.in b/systemd-units/plymouth-quit.service.in +index ed9f9b9..147e9ee 100644 +--- a/systemd-units/plymouth-quit.service.in ++++ b/systemd-units/plymouth-quit.service.in +@@ -3,7 +3,7 @@ Description=Terminate Plymouth Boot Screen + After=rc-local.service plymouth-start.service systemd-user-sessions.service + + [Service] +-ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit ++ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash + Type=oneshot + RemainAfterExit=yes + TimeoutSec=20 +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch new file mode 100644 index 0000000000..7ba1034e93 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch @@ -0,0 +1,31 @@ +From 658eac007d14d836cb002a5675487bac63d50324 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 7 Feb 2022 03:22:12 +0000 +Subject: [PATCH] plymouth-start.service.in: add related kernel parameter + +Add extra kernel parameter to make the plymouth splash screen +display during boot. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/156] + +Signed-off-by: Mingli Yu +--- + systemd-units/plymouth-start.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in +index 830a62d..c20aabe 100644 +--- a/systemd-units/plymouth-start.service.in ++++ b/systemd-units/plymouth-start.service.in +@@ -9,7 +9,7 @@ ConditionVirtualization=!container + IgnoreOnIsolate=true + + [Service] +-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --kernel-command-line="splash plymouth.ignore-serial-consoles" --pid-file=@plymouthruntimedir@/pid --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash + Type=forking + RemainAfterExit=yes +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch new file mode 100644 index 0000000000..eb1c8db21c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-systemd-switch-to-KillMode-mixed.patch @@ -0,0 +1,43 @@ +From 9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 25 Aug 2020 10:49:11 -0400 +Subject: [PATCH] systemd: switch to KillMode=mixed + +KillMode=none is deprecated, so we need to stop using it. + +For now, use `KillMode=mixed` and `IgnoreOnIsolate=true` instead. + +In the future, we should change plymouth to be able to exit and +start again without restarting the active animation, but that's +going to require some effort. + +https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474] + +Signed-off-by: Mingli Yu +--- + systemd-units/plymouth-start.service.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in +index 3d00cc6..830a62d 100644 +--- a/systemd-units/plymouth-start.service.in ++++ b/systemd-units/plymouth-start.service.in +@@ -6,11 +6,12 @@ After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd. + Before=systemd-ask-password-plymouth.service + ConditionKernelCommandLine=!plymouth.enable=0 + ConditionVirtualization=!container ++IgnoreOnIsolate=true + + [Service] + ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash + Type=forking + RemainAfterExit=yes +-KillMode=none ++KillMode=mixed + SendSIGKILL=no +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb index e5d8c98195..7d76ab76f0 100644 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb @@ -20,6 +20,9 @@ RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = " \ http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ + file://0001-systemd-switch-to-KillMode-mixed.patch \ + file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ + file://0001-plymouth-Add-the-retain-splash-option.patch \ " SRC_URI[md5sum] = "8a25d23f3ae732af300a56fa33cacff2" diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.2.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.2.bb deleted file mode 100644 index c41667b453..0000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.18.2.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Crypto and TLS for C++11" -HOMEPAGE = "https://botan.randombit.net" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://license.txt;md5=a02e03c8fa2c5e7b9b3fcc1b9811fd3b" -SECTION = "libs" - -SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" -SRC_URI[sha256sum] = "541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e" - -S = "${WORKDIR}/Botan-${PV}" - -inherit python3native siteinfo lib_package - -CPU ?= "${TARGET_ARCH}" -CPU:x86 = "x86_32" -CPU:armv7a = "armv7" -CPU:armv7ve = "armv7" - -do_configure() { - python3 ${S}/configure.py \ - --prefix="${D}${exec_prefix}" \ - --libdir="${D}${libdir}" \ - --cpu="${CPU}" \ - --cc-bin="${CXX}" \ - --cxxflags="${CXXFLAGS}" \ - --ldflags="${LDFLAGS}" \ - --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ - ${@bb.utils.contains("TUNE_FEATURES","neon","","--disable-neon",d)} \ - --with-sysroot-dir=${STAGING_DIR_HOST} \ - --with-build-dir="${B}" \ - --optimize-for-size \ - --with-stack-protector \ - --enable-shared-library \ - --with-python-versions=3 \ - ${EXTRA_OECONF} -} - -do_compile() { - oe_runmake -} -do_install() { - oe_runmake install - sed -i -e "s|${D}||g" ${D}${libdir}/pkgconfig/botan-2.pc -} - -PACKAGES += "${PN}-python3" - -FILES:${PN}-python3 = "${libdir}/python3" - -RDEPENDS:${PN}-python3 += "python3" - -COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.19.1.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.19.1.bb new file mode 100644 index 0000000000..4b072fc5dc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.19.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "Crypto and TLS for C++11" +HOMEPAGE = "https://botan.randombit.net" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=f4ce98476c07c34e1793daa036960fad" +SECTION = "libs" + +SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" +SRC_URI[sha256sum] = "e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560" + +S = "${WORKDIR}/Botan-${PV}" + +inherit python3native siteinfo lib_package + +CPU ?= "${TARGET_ARCH}" +CPU:x86 = "x86_32" +CPU:armv7a = "armv7" +CPU:armv7ve = "armv7" + +do_configure() { + python3 ${S}/configure.py \ + --prefix="${D}${exec_prefix}" \ + --libdir="${D}${libdir}" \ + --cpu="${CPU}" \ + --cc-bin="${CXX}" \ + --cxxflags="${CXXFLAGS}" \ + --ldflags="${LDFLAGS}" \ + --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + ${@bb.utils.contains("TUNE_FEATURES","neon","","--disable-neon",d)} \ + --with-sysroot-dir=${STAGING_DIR_HOST} \ + --with-build-dir="${B}" \ + --optimize-for-size \ + --with-stack-protector \ + --enable-shared-library \ + --with-python-versions=3 \ + ${EXTRA_OECONF} +} + +do_compile() { + oe_runmake +} +do_install() { + oe_runmake install + sed -i -e "s|${D}||g" ${D}${libdir}/pkgconfig/botan-2.pc +} + +PACKAGES += "${PN}-python3" + +FILES:${PN}-python3 = "${libdir}/python3" + +RDEPENDS:${PN}-python3 += "python3" + +COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb deleted file mode 100644 index b76ed2477f..0000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Userspace utilities for fs-verity" -DESCRIPTION = "fs-verity is a Linux kernel feature that does transparent \ -on-demand integrity/authenticity verification of the contents of read-only \ -files, using a hidden Merkle tree (hash tree) associated with the file. The \ -mechanism is similar to dm-verity, but implemented at the file level rather \ -than at the block device level." -HOMEPAGE = "https://www.kernel.org/doc/html/latest/filesystems/fsverity.html" -SECTION = "console" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" - -SRCREV = "9e082897d61a2449657651aa5a0931aca31428fd" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git;branch=master" - -S = "${WORKDIR}/git" - -DEPENDS = "openssl" - -EXTRA_OEMAKE:append = "PREFIX=${prefix} USE_SHARED_LIB=1" -# We want to statically link the binary to libfsverity on native Windows -EXTRA_OEMAKE:remove:mingw32:class-nativesdk = "USE_SHARED_LIB=1" -EXTRA_OEMAKE:remove:mingw32:class-native = "USE_SHARED_LIB=1" - -do_install() { - oe_runmake install DESTDIR=${D} -} - -PACKAGES =+ "libfsverity" -FILES:libfsverity = "${libdir}/libfsverity*${SOLIBS}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb new file mode 100644 index 0000000000..89e92d62f4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb @@ -0,0 +1,31 @@ +SUMMARY = "Userspace utilities for fs-verity" +DESCRIPTION = "fs-verity is a Linux kernel feature that does transparent \ +on-demand integrity/authenticity verification of the contents of read-only \ +files, using a hidden Merkle tree (hash tree) associated with the file. The \ +mechanism is similar to dm-verity, but implemented at the file level rather \ +than at the block device level." +HOMEPAGE = "https://www.kernel.org/doc/html/latest/filesystems/fsverity.html" +SECTION = "console" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" + +SRCREV = "20e87c13075a8e5660a8d69fd6c93d4f7c5f01a5" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git;branch=master" + +S = "${WORKDIR}/git" + +DEPENDS = "openssl" + +EXTRA_OEMAKE:append = "PREFIX=${prefix} USE_SHARED_LIB=1" +# We want to statically link the binary to libfsverity on native Windows +EXTRA_OEMAKE:remove:mingw32:class-nativesdk = "USE_SHARED_LIB=1" +EXTRA_OEMAKE:remove:mingw32:class-native = "USE_SHARED_LIB=1" + +do_install() { + oe_runmake install DESTDIR=${D} +} + +PACKAGES =+ "libfsverity" +FILES:libfsverity = "${libdir}/libfsverity*${SOLIBS}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb index afad03c9a6..ca78e5ef3c 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb @@ -6,10 +6,10 @@ certificates, or selecting a certificate directly by serialized id, handling \ card removal and card insert events, handling card ie-insert to a different \ slot, supporting session expiration and much more all using a simple API." -HOMEPAGE = "http://www.opensc-project.org/pkcs11-helper/" +HOMEPAGE = "https://github.com/OpenSC/pkcs11-helper" SECTION = "Development/Libraries" -LICENSE = "GPLv2 & BSD" +LICENSE = "GPLv2 & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://COPYING;md5=30f10d22cfb1ba98ccd714a41ad3311a \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb index 43fc69073f..cd46586512 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e S = "${WORKDIR}/${SRCNAME}-${PV}" -PNBLACKLIST[mysql-python] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" +SKIP_RECIPE[mysql-python] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)} diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch index 3d969cc7e7..39ec7c2c8c 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From 053e8fc51bd9688100ce284a9c7afab88656386f Mon Sep 17 00:00:00 2001 +From 9c9ac8b64f940bf69ecdc92abca9b58f12b401c3 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check @@ -8,17 +8,18 @@ for upgrade to autoconf 2.71 Upstream-Status: Inappropriate [disable feature] Signed-off-by: Yi Fan Yu + --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 7170f26..daf85b9 100644 +index 3b148b6..94f39c5 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [14.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [14.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -27,6 +28,3 @@ index 7170f26..daf85b9 100644 AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch new file mode 100644 index 0000000000..92a3dcc710 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch @@ -0,0 +1,38 @@ +Remove duplicate code for riscv + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/src/include/storage/s_lock.h ++++ b/src/include/storage/s_lock.h +@@ -341,30 +341,6 @@ tas(volatile slock_t *lock) + #endif /* HAVE_GCC__SYNC_INT32_TAS */ + #endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ + +- +-/* +- * RISC-V likewise uses __sync_lock_test_and_set(int *, int) if available. +- */ +-#if defined(__riscv) +-#ifdef HAVE_GCC__SYNC_INT32_TAS +-#define HAS_TEST_AND_SET +- +-#define TAS(lock) tas(lock) +- +-typedef int slock_t; +- +-static __inline__ int +-tas(volatile slock_t *lock) +-{ +- return __sync_lock_test_and_set(lock, 1); +-} +- +-#define S_UNLOCK(lock) __sync_lock_release(lock) +- +-#endif /* HAVE_GCC__SYNC_INT32_TAS */ +-#endif /* __riscv */ +- +- + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ + #if defined(__s390__) || defined(__s390x__) + #define HAS_TEST_AND_SET diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.1.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.1.bb deleted file mode 100644 index 1112cc21d1..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=255f15687738db8068fbe9b938c90217" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ - file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ -" - -SRC_URI[sha256sum] = "4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.2.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.2.bb new file mode 100644 index 0000000000..52e8867142 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.2.bb @@ -0,0 +1,13 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=75af6e3eeec4a06cdd2e578673236fc3" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ + file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ + file://remove_duplicate.patch \ +" + +SRC_URI[sha256sum] = "2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a" diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch b/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 8e32ebb0bf..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fae154eb209e068586e1adb589de5d273fcf4b4f Mon Sep 17 00:00:00 2001 -From: Denis Arnaud -Date: Tue, 18 May 2021 00:05:03 +0200 -Subject: [PATCH] Fix build when SIGSTKSZ is no longer a constant - -In the latest glibc versions SIGSTKSZ is not a constant any more, which -broke building the tests with it. - -Work around this by hard-coding a typical value for it. - -closes #886. - -Upstream-Status: Backport. ---- - tests/catch.hpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/catch.hpp b/tests/catch.hpp -index 014df2c5..85067813 100644 ---- a/tests/catch.hpp -+++ b/tests/catch.hpp -@@ -6489,7 +6489,7 @@ namespace Catch { - static bool isSet; - static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; - static stack_t oldSigStack; -- static char altStackMem[SIGSTKSZ]; -+ static char altStackMem[8192]; - - static void handleSignal( int sig ) { - std::string name = ""; -@@ -6540,7 +6540,7 @@ namespace Catch { - bool FatalConditionHandler::isSet = false; - struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; - stack_t FatalConditionHandler::oldSigStack = {}; -- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; -+ char FatalConditionHandler::altStackMem[8192] = {}; - - } // namespace Catch - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb deleted file mode 100644 index fb67e0c547..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "The C++ Database Access Library" -HOMEPAGE = "http://soci.sourceforge.net" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SECTION = "libs" -DEPENDS = "boost" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ - file://0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch" -SRC_URI[sha256sum] = "34da2d2320539463da8a5131253246fa2671e0438ab5fd1e5119edb428f558a5" - -TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ - -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ - -DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=oe password=oe"' - -OBASEDIR ?= "/opt/oracle" -OINCDIR = "rdbms/public" -OLIBDIR = "lib" - -PACKAGECONFIG[sqlite3] = "-DSOCI_SQLITE3=ON,-DSOCI_SQLITE3=OFF,sqlite3," -PACKAGECONFIG[mysql] = "-DSOCI_MYSQL=ON,-DSOCI_MYSQL=OFF,mariadb," -PACKAGECONFIG[postgresql] = "-DSOCI_POSTGRESQL=ON,-DSOCI_POSTGRESQL=OFF,postgresql," -PACKAGECONFIG[odbc] = "-DSOCI_ODBC=ON,-DSOCI_ODBC=OFF,," -PACKAGECONFIG[empty] = "-DSOCI_EMPTY=ON,-DSOCI_EMPTY=OFF,," -PACKAGECONFIG[oracle] = "-DWITH_ORACLE=ON --with-oracle-include=${OINCDIR} --with-oracle-lib=${OLIBDIR},-DWITH_ORACLE=OFF,," -PACKAGECONFIG[firebird] = "-DWITH_FIREBIRD=ON,-DWITH_FIREBIRD=OFF,," -PACKAGECONFIG[ptest] = "${TESTCONFIG},,," - -# enable your backend by default we enable 'empty' -PACKAGECONFIG ??= "empty" - -# Take the flags added by PACKAGECONFIG and pass them to cmake. -EXTRA_OECMAKE = "${EXTRA_OECONF} -DSOCI_LIBDIR=${libdir}" -DISABLE_STATIC = "" - -inherit dos2unix cmake - -PACKAGES += "${PN}-sqlite3 ${PN}-mysql ${PN}-postgresql ${PN}-odbc ${PN}-oracle" - -FILES:${PN}-sqlite3 = "${libdir}/lib${BPN}_sqlite3.so.*" -FILES:${PN}-mysql = "${libdir}/lib${BPN}_mysql.so.*" -FILES:${PN}-postgresql = "${libdir}/lib${BPN}_postgresql.so.*" -FILES:${PN}-odbc = "${libdir}/lib${BPN}_odbc.so.*" -FILES:${PN}-oracle = "${libdir}/lib${BPN}_oracle.so.*" diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb new file mode 100644 index 0000000000..ff47e5033e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "The C++ Database Access Library" +HOMEPAGE = "http://soci.sourceforge.net" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +SECTION = "libs" +DEPENDS = "boost" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz" +SRC_URI[sha256sum] = "615e5f7e4b52007f3a3b4050a99aadf6346b56b5098eb08b3a650836083c6a33" + +TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ + -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ + -DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=oe password=oe"' + +OBASEDIR ?= "/opt/oracle" +OINCDIR = "rdbms/public" +OLIBDIR = "lib" + +PACKAGECONFIG[sqlite3] = "-DSOCI_SQLITE3=ON,-DSOCI_SQLITE3=OFF,sqlite3," +PACKAGECONFIG[mysql] = "-DSOCI_MYSQL=ON,-DSOCI_MYSQL=OFF,mariadb," +PACKAGECONFIG[postgresql] = "-DSOCI_POSTGRESQL=ON,-DSOCI_POSTGRESQL=OFF,postgresql," +PACKAGECONFIG[odbc] = "-DSOCI_ODBC=ON,-DSOCI_ODBC=OFF,," +PACKAGECONFIG[empty] = "-DSOCI_EMPTY=ON,-DSOCI_EMPTY=OFF,," +PACKAGECONFIG[oracle] = "-DWITH_ORACLE=ON --with-oracle-include=${OINCDIR} --with-oracle-lib=${OLIBDIR},-DWITH_ORACLE=OFF,," +PACKAGECONFIG[firebird] = "-DWITH_FIREBIRD=ON,-DWITH_FIREBIRD=OFF,," +PACKAGECONFIG[ptest] = "${TESTCONFIG},,," + +# enable your backend by default we enable 'empty' +PACKAGECONFIG ??= "empty" + +# Take the flags added by PACKAGECONFIG and pass them to cmake. +EXTRA_OECMAKE = "${EXTRA_OECONF} -DSOCI_LIBDIR=${libdir}" +DISABLE_STATIC = "" + +inherit dos2unix cmake + +PACKAGES += "${PN}-sqlite3 ${PN}-mysql ${PN}-postgresql ${PN}-odbc ${PN}-oracle" + +FILES:${PN}-sqlite3 = "${libdir}/lib${BPN}_sqlite3.so.*" +FILES:${PN}-mysql = "${libdir}/lib${BPN}_mysql.so.*" +FILES:${PN}-postgresql = "${libdir}/lib${BPN}_postgresql.so.*" +FILES:${PN}-odbc = "${libdir}/lib${BPN}_odbc.so.*" +FILES:${PN}-oracle = "${libdir}/lib${BPN}_oracle.so.*" diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index fabf59d4b2..c752a10083 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -29,7 +29,7 @@ SRCREV_lss = "fd00dbbd0c06a309c657d89e9430143b179ff6db" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ - git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=master;protocol=https \ + git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \ git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \ git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \ git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp;branch=master \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch deleted file mode 100644 index 43da4a9ef7..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 12:10:28 -0800 -Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t - -mutex code uses SYS_futex, which it expects from system C library. -in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) -rv32 is using 64bit time_t from get go unlike other 32bit architectures -in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 -this aliases it to NR_futex so that SYS_futex is then defined for rv32 - -Upstream-Status: Submitted [https://github.com/capnproto/capnproto/pull/1103] -Signed-off-by: Khem Raj ---- - c++/src/kj/mutex.c++ | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ -index c81cead7..e1594b11 100644 ---- a/c++/src/kj/mutex.c++ -+++ b/c++/src/kj/mutex.c++ -@@ -39,7 +39,13 @@ - - #ifndef SYS_futex - // Missing on Android/Bionic. -+#ifdef __NR_futex - #define SYS_futex __NR_futex -+#elif defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#else -+#error "Need working SYS_futex" -+#endif - #endif - - #ifndef FUTEX_WAIT_PRIVATE --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb deleted file mode 100644 index 774423192e..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Cap'n Proto serialization/RPC system" -DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " -HOMEPAGE = "https://github.com/sandstorm-io/capnproto" -SECTION = "console/tools" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" - -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \ - file://0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch;patchdir=../ \ - " -SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f" - -S = "${WORKDIR}/git/c++" - -inherit cmake - -EXTRA_OECMAKE += "\ - -DBUILD_TESTING=OFF \ -" - -FILES:${PN}-compiler = "${bindir}" - -PACKAGE_BEFORE_PN = "${PN}-compiler" -RDEPENDS:${PN}-dev += "${PN}-compiler" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb new file mode 100644 index 0000000000..36004c53d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Cap'n Proto serialization/RPC system" +DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " +HOMEPAGE = "https://github.com/sandstorm-io/capnproto" +SECTION = "console/tools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" + +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \ + " +SRCREV = "b49431c48d40490ef979247d308af63345376cee" + +S = "${WORKDIR}/git/c++" + +inherit cmake + +CXXFLAGS:append:mips = " -latomic" +CXXFLAGS:append:riscv32 = " -latomic" + +EXTRA_OECMAKE += "\ + -DBUILD_TESTING=OFF \ +" + +FILES:${PN}-compiler = "${bindir}" + +PACKAGE_BEFORE_PN = "${PN}-compiler" +RDEPENDS:${PN}-dev += "${PN}-compiler" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch deleted file mode 100644 index daf90ad44d..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a3eba0fcee5e96ef47a6d3fac7196a1074f0dc17 Mon Sep 17 00:00:00 2001 -From: Adrian Bunk -Date: Wed, 30 Oct 2019 11:07:23 +0200 -Subject: Avoid use of "mips" which is reserved on mips - -Upstream-Status: Submitted [https://github.com/brasko/gdbwire/pull/9] - -Signed-off-by: Adrian Bunk - -diff --git a/src/gdbwire_mi_parser.c b/src/gdbwire_mi_parser.c -index 3f6b563..24aa0cf 100644 ---- a/lib/tgdb/gdbwire.c -+++ b/lib/tgdb/gdbwire.c -@@ -40,7 +40,7 @@ struct gdbwire_mi_parser { - /* The GDB/MI lexer state */ - yyscan_t mils; - /* The GDB/MI push parser state */ -- gdbwire_mi_pstate *mips; -+ gdbwire_mi_pstate *mipst; - /* The client parser callbacks */ - struct gdbwire_mi_parser_callbacks callbacks; - }; -@@ -71,8 +71,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) - } - - /* Create a new push parser state instance */ -- parser->mips = gdbwire_mi_pstate_new(); -- if (!parser->mips) { -+ parser->mipst = gdbwire_mi_pstate_new(); -+ if (!parser->mipst) { - gdbwire_mi_lex_destroy(parser->mils); - gdbwire_string_destroy(parser->buffer); - free(parser); -@@ -81,7 +81,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks) - - /* Ensure that the callbacks are non null */ - if (!callbacks.gdbwire_mi_output_callback) { -- gdbwire_mi_pstate_delete(parser->mips); -+ gdbwire_mi_pstate_delete(parser->mipst); - gdbwire_mi_lex_destroy(parser->mils); - gdbwire_string_destroy(parser->buffer); - free(parser); -@@ -109,9 +109,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser) - } - - /* Free the push parser instance */ -- if (parser->mips) { -- gdbwire_mi_pstate_delete(parser->mips); -- parser->mips = NULL; -+ if (parser->mipst) { -+ gdbwire_mi_pstate_delete(parser->mipst); -+ parser->mipst = NULL; - } - - free(parser); -@@ -162,7 +162,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser, - pattern = gdbwire_mi_lex(parser->mils); - if (pattern == 0) - break; -- mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL, -+ mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL, - parser->mils, &output); - } while (mi_status == YYPUSH_MORE); - --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb deleted file mode 100644 index a48e32af23..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "curses-based interface to GDB" -DESCRIPTION = "cgdb is a lightweight curses (terminal-based) interface to the GNU Debugger (GDB)." -HOMEPAGE = "http://cgdb.github.io/" -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "flex-native readline ncurses" - -inherit autotools texinfo - -SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \ - file://0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch \ -" -SRC_URI[md5sum] = "a104862ffd3145b076303992e9a3af26" -SRC_URI[sha256sum] = "bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198" - -CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" -EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \ - --with-ncurses=${STAGING_LIBDIR}" - -RDEPENDS:${PN} = "gdb" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb new file mode 100644 index 0000000000..99e09bfc62 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "curses-based interface to GDB" +DESCRIPTION = "cgdb is a lightweight curses (terminal-based) interface to the GNU Debugger (GDB)." +HOMEPAGE = "http://cgdb.github.io/" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "flex-native readline ncurses" + +inherit autotools texinfo + +SRC_URI = "http://cgdb.me/files/${BP}.tar.gz" +SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1" + +CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" +EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \ + --with-ncurses=${STAGING_LIBDIR}" + +RDEPENDS:${PN} = "gdb" diff --git a/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb index c414fd3146..0018064119 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb @@ -3,7 +3,7 @@ safe memory reclamation mechanisms and non-blocking data structures \ designed to aid in the design and implementation of high performance \ concurrent systems." -LICENSE = "BSD & Apache-2.0" +LICENSE = "BSD-2-Clause & Apache-2.0" HOMEPAGE = "http://concurrencykit.org" SECTION = "base" @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \ S = "${WORKDIR}/git" -COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64).*-linux*" +COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64).*-linux*" inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 5263aaef30..ddb93a0400 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" -SRCREV = "3ccf87915ceb70eac055a07eb80bc9105e916620" +SRCREV = "7c45fd65dcd811def66161f6d572c3930f2ba4d8" PV = "1.3" SRC_URI:append:class-target = " file://oe-remote.repo.sample" @@ -37,4 +37,4 @@ RDEPENDS:${PN} += " \ " BBCLASSEXTEND = "nativesdk" -PNBLACKLIST[dnf-plugin-tui] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" +SKIP_RECIPE[dnf-plugin-tui] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb index 06bb971541..bf74f1229f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb @@ -17,7 +17,7 @@ SRCREV = "a9a295fecf3fbd5a4f571f53b01f63202a3e2113" SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" S = "${WORKDIR}/git" -CVE_CHECK_WHITELIST += "CVE-2020-35864" +CVE_CHECK_IGNORE += "CVE-2020-35864" CXXFLAGS += "-fPIC" BUILD_CXXFLAGS += "-fPIC" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch new file mode 100644 index 0000000000..fe2d9f54ba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch @@ -0,0 +1,36 @@ +From 90c46235ad69a411d83a5e978492421e8e378934 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 18 Feb 2022 23:35:58 -0800 +Subject: [PATCH] git-changebar: Adjust structs for libgit2 1.4.x + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + git-changebar/src/gcb-plugin.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c +index f8ce20c..4488b22 100644 +--- a/git-changebar/src/gcb-plugin.c ++++ b/git-changebar/src/gcb-plugin.c +@@ -216,7 +216,7 @@ static int + gcb_git_buf_grow (git_buf *buf, + size_t target_size) + { +- if (buf->asize == 0) { ++ if (buf->reserved == 0) { + if (target_size == 0) { + target_size = buf->size; + } +@@ -234,7 +234,7 @@ buf_zero (git_buf *buf) + if (buf) { + buf->ptr = NULL; + buf->size = 0; +- buf->asize = 0; ++ buf->reserved = 0; + } + } + +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb index 16dd71c16f..bb419c976a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb @@ -31,6 +31,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ + file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \ " SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb index 8a9e762734..925907e173 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb @@ -82,6 +82,6 @@ do_configure:prepend:toolchain-clang:x86() { BBCLASSEXTEND = "native nativesdk" -SYSROOT_DIRS_BLACKLIST:append:class-target = " ${baselib}/cmake/grpc" +SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc" FILES:${PN}-compiler += "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.4.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.4.bb deleted file mode 100644 index ce8aad50c5..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \ -and classes for commonly used data structures." -HOMEPAGE = "http://live.gnome.org/Libgee" -SECTION = "libs" -DEPENDS = "glib-2.0" - -BBCLASSEXTEND = "native" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -PE = "1" -inherit gnomebase vala gobject-introspection - -do_configure:prepend() { - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do - rm -f m4/$i - done -} - -SRC_URI[archive.md5sum] = "4d7d6f1f8054f1b3466c752ac2e50946" -SRC_URI[archive.sha256sum] = "524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb new file mode 100644 index 0000000000..c0d7ea3487 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \ +and classes for commonly used data structures." +HOMEPAGE = "http://live.gnome.org/Libgee" +SECTION = "libs" +DEPENDS = "glib-2.0" + +BBCLASSEXTEND = "native" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +PE = "1" +inherit gnomebase vala gobject-introspection + +do_configure:prepend() { + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f m4/$i + done +} + +SRC_URI[archive.sha256sum] = "31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch new file mode 100644 index 0000000000..2e66a02828 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch @@ -0,0 +1,165 @@ +From 86d1c0cc6a5dcf57e413a1cc1c29203e87cf9a14 Mon Sep 17 00:00:00 2001 +From: Daniel Bevenius +Date: Sat, 16 Oct 2021 08:50:16 +0200 +Subject: [PATCH] src: add --openssl-legacy-provider option + +This commit adds an option to Node.js named --openssl-legacy-provider +and if specified will load OpenSSL 3.0 Legacy provider. + +$ ./node --help +... +--openssl-legacy-provider enable OpenSSL 3.0 legacy provider + +Example usage: + +$ ./node --openssl-legacy-provider -p 'crypto.createHash("md4")' +Hash { + _options: undefined, + [Symbol(kHandle)]: Hash {}, + [Symbol(kState)]: { [Symbol(kFinalized)]: false } +} + +Co-authored-by: Richard Lau + +Refs: https://github.com/nodejs/node/issues/40455 +--- + doc/api/cli.md | 10 ++++++++++ + src/crypto/crypto_util.cc | 10 ++++++++++ + src/node_options.cc | 10 ++++++++++ + src/node_options.h | 7 +++++++ + .../test-process-env-allowed-flags-are-documented.js | 5 +++++ + 5 files changed, 42 insertions(+) + +diff --git a/doc/api/cli.md b/doc/api/cli.md +index 74057706bf8d..608b9cdeddf1 100644 +--- a/doc/api/cli.md ++++ b/doc/api/cli.md +@@ -652,6 +652,14 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be + used to enable FIPS-compliant crypto if Node.js is built + against FIPS-enabled OpenSSL. + ++### `--openssl-legacy-provider` ++ ++ ++Enable OpenSSL 3.0 legacy provider. For more information please see ++[providers readme][]. ++ + ### `--pending-deprecation` + /usr/src/debug/python3-pyruvate/1.1.2-r0/cargo_home/bitbake/libsystemd-0.4.1/src/logging.rs:296:25 + | + 296 | device: stat.st_dev, + | ^^^^^^^^^^^ expected `u64`, found `u32` + +Upstream-Status: Submitted [https://github.com/lucab/libsystemd-rs/pull/103] +Signed-off-by: Khem Raj +--- + src/logging.rs | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/logging.rs b/src/logging.rs +index a68c36a..6e374ae 100644 +--- a/src/logging.rs ++++ b/src/logging.rs +@@ -292,7 +292,10 @@ impl JournalStream { + pub fn from_fd(fd: F) -> std::io::Result { + nix::sys::stat::fstat(fd.as_raw_fd()) + .map(|stat| JournalStream { ++ #[cfg(not(target_arch = "mips"))] + device: stat.st_dev, ++ #[cfg(target_arch = "mips")] ++ device: stat.st_dev as u64, + inode: stat.st_ino, + }) + .map_err(std::io::Error::from) +-- +2.35.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch new file mode 100644 index 0000000000..67108472ac --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch @@ -0,0 +1,32 @@ +From c711fb215de54f960a35cdc48cd506b6b5db4918 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 26 Jan 2022 11:50:58 -0800 +Subject: [PATCH] riscv64/mod.rs: Add missing error codes + +These are flagged by apps e.g. python3-pyruvate + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/2656] +Signed-off-by: Khem Raj +--- + src/unix/linux_like/linux/musl/b64/riscv64/mod.rs | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs +index b075b4a05..6b17621c7 100644 +--- a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs ++++ b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs +@@ -548,6 +548,11 @@ pub const EHOSTUNREACH: ::c_int = 113; + pub const EALREADY: ::c_int = 114; + pub const EINPROGRESS: ::c_int = 115; + pub const ESTALE: ::c_int = 116; ++pub const EUCLEAN: ::c_int = 117; ++pub const ENOTNAM: ::c_int = 118; ++pub const ENAVAIL: ::c_int = 119; ++pub const EISNAM: ::c_int = 120; ++pub const EREMOTEIO: ::c_int = 121; + pub const EDQUOT: ::c_int = 122; + pub const ENOMEDIUM: ::c_int = 123; + pub const EMEDIUMTYPE: ::c_int = 124; +-- +2.35.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb index dad18b78c2..b83302d44c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate_1.1.2.bb @@ -22,6 +22,9 @@ RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" +SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=../cargo_home/bitbake/libsystemd-0.4.1/" +SRC_URI:append = " file://0001-riscv64-mod.rs-Add-missing-error-codes.patch;patchdir=../cargo_home/bitbake/libc-0.2.112/" + SRC_URI += " \ crate://crates.io/aho-corasick/0.7.18 \ crate://crates.io/atty/0.2.14 \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb new file mode 100644 index 0000000000..c6f352bc61 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "run tests in isolated forked subprocesses" +HOMEPAGE = "https://github.com/pytest-dev/pytest-forked" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" + +SRC_URI[sha256sum] = "8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e" + +inherit pypi setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + python3-py \ + python3-pytest \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.0.2.bb deleted file mode 100644 index 7c77e4add6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "py.test plugin to abort hanging tests" -HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" - -PYPI_PACKAGE = "pytest-timeout" - -SRC_URI[sha256sum] = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = "${PYTHON_PN}-pytest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.1.0.bb new file mode 100644 index 0000000000..c4faec6c61 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.1.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "py.test plugin to abort hanging tests" +HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" + +PYPI_PACKAGE = "pytest-timeout" + +SRC_URI[sha256sum] = "c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "${PYTHON_PN}-pytest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb new file mode 100644 index 0000000000..a10ac8cc49 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "pytest xdist plugin for distributed testing and loop-on-failing modes" +HOMEPAGE = "https://github.com/pytest-dev/pytest-xdist" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" + +SRC_URI[sha256sum] = "4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf" + +inherit pypi setuptools3 + +DEPENDS += "python3-setuptools-scm-native" + +# Note that the dependency on pytest-forked is scheduled to be dropped in 3.0 +RDEPENDS:${PN} += " \ + python3-execnet \ + python3-pytest \ + python3-pytest-forked \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.22.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.22.0.bb deleted file mode 100644 index dc70b482b1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.22.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A libudev binding" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[sha256sum] = "69bb1beb7ac52855b6d1b9fe909eefb0017f38d917cba9939602c6880035b276" - -inherit pypi setuptools3 - -do_configure:prepend() { - sed -i "/import pyudev/d" ${S}/setup.py - sed -i "s/str(pyudev.__version__)/'${PV}'/g" ${S}/setup.py -} - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-fcntl \ - libudev \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb new file mode 100644 index 0000000000..183bf7273c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb @@ -0,0 +1,24 @@ +SUMMARY = "A libudev binding" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[sha256sum] = "32ae3585b320a51bc283e0a04000fd8a25599edb44541e2f5034f6afee5d15cc" + +inherit pypi setuptools3 + +do_configure:prepend() { + sed -i "/import pyudev/d" ${S}/setup.py + sed -i "s/str(pyudev.__version__)/'${PV}'/g" ${S}/setup.py +} + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-fcntl \ + libudev \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.0.2.bb deleted file mode 100644 index f39a72c609..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.0.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Python client for Redis key-value store" -DESCRIPTION = "The Python interface to the Redis key-value store." -HOMEPAGE = "http://github.com/andymccurdy/redis-py" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" - -SRC_URI[sha256sum] = "ccf692811f2c1fc7a92b466aa2599e4a6d2d73d5f736a2c70be600657c0da34a" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-cryptography \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb new file mode 100644 index 0000000000..9af7383de3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python client for Redis key-value store" +DESCRIPTION = "The Python interface to the Redis key-value store." +HOMEPAGE = "http://github.com/andymccurdy/redis-py" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" + +SRC_URI[sha256sum] = "07420a3fbedd8e012c31d4fadac943fb81568946da202c5a5bc237774e5280a0" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-cryptography \ + ${PYTHON_PN}-packaging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.0.bb deleted file mode 100644 index 12531d75fe..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=22d117a849df10d047ed9b792838e863" - -SRC_URI[md5sum] = "1ebcd55f1b1b9281940b4bc33010e2ba" -SRC_URI[sha256sum] = "b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "${PYTHON_PN}-requests" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb new file mode 100644 index 0000000000..e02ff7911e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb @@ -0,0 +1,8 @@ +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=22d117a849df10d047ed9b792838e863" + +SRC_URI[sha256sum] = "75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "${PYTHON_PN}-requests ${PYTHON_PN}-oauthlib" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.29.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.29.bb deleted file mode 100644 index b535951c00..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.29.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ -application developers the full power and flexibility of SQL" -HOMEPAGE = "http://www.sqlalchemy.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3359ed561ac16aaa25b6c6eff84df595" - -SRC_URI[sha256sum] = "fa2bad14e1474ba649cfc969c1d2ec915dd3e79677f346bbfe08e93ef9020b39" - -PYPI_PACKAGE = "SQLAlchemy" -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-profile \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb new file mode 100644 index 0000000000..510bb7d9e4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ +application developers the full power and flexibility of SQL" +HOMEPAGE = "http://www.sqlalchemy.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" + +SRC_URI[sha256sum] = "582b59d1e5780a447aada22b461e50b404a9dc05768da1d87368ad8190468418" + +PYPI_PACKAGE = "SQLAlchemy" +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-profile \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator/run-ptest deleted file mode 100644 index 5cec711696..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb deleted file mode 100644 index 7f212ddd87..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-test-generator_0.1.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Generator is a helper for generating test methods for nose while still using unittest." -DESCRIPTION = "Python package with modified subclasses of all stdlib XML \ -parsers that prevent any potentially malicious operation." - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=041a2bff595d40ccb4b36356f89dab00" - -SRC_URI += " \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "6c69e73ba5b4b3ed62f7bcda071c64f1" -SRC_URI[sha256sum] = "ad5925c814bfe79497b43df096e3bb52c166d1577f7aff160137301676232f4a" - -inherit pypi setuptools3 ptest - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-mock \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -DEPENDS += "python3-nose-native" - -RDEPENDS:${PN} += "python3-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_21.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_21.7.0.bb deleted file mode 100644 index 4e9472793b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_21.7.0.bb +++ /dev/null @@ -1,324 +0,0 @@ -DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \ -Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \ -(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more." -HOMEPAGE = "http://www.twistedmatrix.com" - -#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL. -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e33c411c0b86b1f3ca299091ed51ca31" - -SRC_URI[sha256sum] = "2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006" - -PYPI_PACKAGE = "Twisted" - -inherit pypi setuptools3 - -do_install:append() { - # remove some useless files before packaging - find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \; -} - -PACKAGES += "\ - ${PN}-zsh \ - ${PN}-test \ - ${PN}-protocols \ - ${PN}-conch \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-news \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ - ${PN}-flow \ - ${PN}-pair \ - ${PN}-core \ -" - -PACKAGES =+ "\ - ${PN}-bin \ -" - -DEPENDS += " \ - ${PYTHON_PN}-incremental-native \ -" - -RDEPENDS:${PN} = "\ - ${PN}-bin \ - ${PN}-core \ - ${PN}-conch \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-pair \ - ${PN}-protocols \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ - ${PN}-zsh \ -" - -RDEPENDS:${PN}-core = "${PYTHON_PN}-appdirs \ - ${PYTHON_PN}-automat \ - ${PYTHON_PN}-constantly \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-hyperlink \ - ${PYTHON_PN}-incremental \ - ${PYTHON_PN}-pyhamcrest \ - ${PYTHON_PN}-pyserial \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-zopeinterface \ -" -RDEPENDS:${PN}-test = "${PN}" -RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle" -RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-names = "${PN}-core" -RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-runner = "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-web += "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-words += "${PN}-core" -RDEPENDS:${PN}-flow += "${PN}-core" -RDEPENDS:${PN}-pair += "${PN}-core" -RDEPENDS:${PN}-dbg = "${PN}" - -ALLOW_EMPTY:${PN} = "1" -FILES:${PN} = "" - -FILES:${PN}-test = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \ -" - -FILES:${PN}-protocols = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \ -" - -FILES:${PN}-zsh = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \ -" - -FILES:${PN}-conch = " \ - ${bindir}/ckeygen \ - ${bindir}/tkconch \ - ${bindir}/conch \ - ${bindir}/conchftp \ - ${bindir}/cftp \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ -" - -FILES:${PN}-core = " \ -${bindir}/manhole \ -${bindir}/mktap \ -${bindir}/twistd \ -${bindir}/tap2deb \ -${bindir}/tap2rpm \ -${bindir}/tapconvert \ -${bindir}/tkmktap \ -${bindir}/trial \ -${bindir}/easy_install* \ -${bindir}/pyhtmlizer \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/application \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python\ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \ -${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/py.typed \ -" - -FILES:${PN}-mail = " \ -${bindir}/mailmail \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \ -" - -FILES:${PN}-names = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/names \ -" - -FILES:${PN}-news = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/news \ -" - -FILES:${PN}-runner = " \ -${libdir}/site-packages/twisted/runner/portmap.so \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\ -" - -FILES:${PN}-web = " \ -${bindir}/websetroot \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/web\ -" - -FILES:${PN}-words = " \ -${bindir}/im \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/words\ -" - -FILES:${PN}-flow = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \" - -FILES:${PN}-pair = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \ -" - -FILES:${PN}-dbg += " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \ -" - -FILES:${PN}-doc += " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \ -" - -RDEPENDS:${PN}-src = "${PN}" -FILES:${PN}-src = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \ -" - -FILES:${PN}-core:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ -" - -FILES:${PN}-names:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ -" - -FILES:${PN}-news:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ -" - -FILES:${PN}-protocols:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ -" - -FILES:${PN}-conch:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ -" - -FILES:${PN}-lore:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ -" -FILES:${PN}-mail:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ -" - -FILES:${PN}-web:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ -" - -FILES:${PN}-words:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ -" - -FILES:${PN}-flow:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ -" - -FILES:${PN}-pair:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ -" - -FILES:${PN}-runner:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb new file mode 100644 index 0000000000..8fd7801c35 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb @@ -0,0 +1,324 @@ +DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \ +Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \ +(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more." +HOMEPAGE = "http://www.twistedmatrix.com" + +#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL. +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0f8d67f84b6e178c92d471011b2245fc" + +SRC_URI[sha256sum] = "b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61" + +PYPI_PACKAGE = "Twisted" + +inherit pypi setuptools3 + +do_install:append() { + # remove some useless files before packaging + find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \; +} + +PACKAGES += "\ + ${PN}-zsh \ + ${PN}-test \ + ${PN}-protocols \ + ${PN}-conch \ + ${PN}-mail \ + ${PN}-names \ + ${PN}-news \ + ${PN}-runner \ + ${PN}-web \ + ${PN}-words \ + ${PN}-flow \ + ${PN}-pair \ + ${PN}-core \ +" + +PACKAGES =+ "\ + ${PN}-bin \ +" + +DEPENDS += " \ + ${PYTHON_PN}-incremental-native \ +" + +RDEPENDS:${PN} = "\ + ${PN}-bin \ + ${PN}-core \ + ${PN}-conch \ + ${PN}-mail \ + ${PN}-names \ + ${PN}-pair \ + ${PN}-protocols \ + ${PN}-runner \ + ${PN}-web \ + ${PN}-words \ + ${PN}-zsh \ +" + +RDEPENDS:${PN}-core = "${PYTHON_PN}-appdirs \ + ${PYTHON_PN}-automat \ + ${PYTHON_PN}-constantly \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-hyperlink \ + ${PYTHON_PN}-incremental \ + ${PYTHON_PN}-pyhamcrest \ + ${PYTHON_PN}-pyserial \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-zopeinterface \ +" +RDEPENDS:${PN}-test = "${PN}" +RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle" +RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-names = "${PN}-core" +RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-runner = "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-web += "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-words += "${PN}-core" +RDEPENDS:${PN}-flow += "${PN}-core" +RDEPENDS:${PN}-pair += "${PN}-core" +RDEPENDS:${PN}-dbg = "${PN}" + +ALLOW_EMPTY:${PN} = "1" +FILES:${PN} = "" + +FILES:${PN}-test = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \ +" + +FILES:${PN}-protocols = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \ +" + +FILES:${PN}-zsh = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \ +" + +FILES:${PN}-conch = " \ + ${bindir}/ckeygen \ + ${bindir}/tkconch \ + ${bindir}/conch \ + ${bindir}/conchftp \ + ${bindir}/cftp \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ +" + +FILES:${PN}-core = " \ +${bindir}/manhole \ +${bindir}/mktap \ +${bindir}/twistd \ +${bindir}/tap2deb \ +${bindir}/tap2rpm \ +${bindir}/tapconvert \ +${bindir}/tkmktap \ +${bindir}/trial \ +${bindir}/easy_install* \ +${bindir}/pyhtmlizer \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/application \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python\ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \ +${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/py.typed \ +" + +FILES:${PN}-mail = " \ +${bindir}/mailmail \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \ +" + +FILES:${PN}-names = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/names \ +" + +FILES:${PN}-news = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/news \ +" + +FILES:${PN}-runner = " \ +${libdir}/site-packages/twisted/runner/portmap.so \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\ +" + +FILES:${PN}-web = " \ +${bindir}/websetroot \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/web\ +" + +FILES:${PN}-words = " \ +${bindir}/im \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/words\ +" + +FILES:${PN}-flow = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \" + +FILES:${PN}-pair = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \ +" + +FILES:${PN}-dbg += " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \ +" + +FILES:${PN}-doc += " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \ +" + +RDEPENDS:${PN}-src = "${PN}" +FILES:${PN}-src = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \ +" + +FILES:${PN}-core:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ +" + +FILES:${PN}-names:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ +" + +FILES:${PN}-news:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ +" + +FILES:${PN}-protocols:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ +" + +FILES:${PN}-conch:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ +" + +FILES:${PN}-lore:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ +" +FILES:${PN}-mail:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ +" + +FILES:${PN}-web:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ +" + +FILES:${PN}-words:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ +" + +FILES:${PN}-flow:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ +" + +FILES:${PN}-pair:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ +" + +FILES:${PN}-runner:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.0.bb deleted file mode 100644 index b3013180d1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Unified diff parsing/metadata extraction library" -HOMEPAGE = "http://github.com/matiasb/python-unidiff" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4c434b08ef42fea235bb019b5e5a97b3" - -SRC_URI[sha256sum] = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-io \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb new file mode 100644 index 0000000000..dd5b0c3eb0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb @@ -0,0 +1,26 @@ +SUMMARY = "Unified diff parsing/metadata extraction library" +HOMEPAGE = "http://github.com/matiasb/python-unidiff" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4c434b08ef42fea235bb019b5e5a97b3" + +SRC_URI[sha256sum] = "d5f2e53a9a00db3224a8c36349b5380e0e22d1aec6c694b14fb9483ee93c6205" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-io \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.2.bb deleted file mode 100644 index 4c221cc41f..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "The Swiss Army knife of Python web development" -DESCRIPTION = "\ -Werkzeug started as simple collection of various utilities for WSGI \ -applications and has become one of the most advanced WSGI utility modules. \ -It includes a powerful debugger, full featured request and response objects, \ -HTTP utilities to handle entity tags, cache control headers, HTTP dates, \ -cookie handling, file uploads, a powerful URL routing system and a bunch \ -of community contributed addon modules." -HOMEPAGE = "http://werkzeug.pocoo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" - -PYPI_PACKAGE = "Werkzeug" - -SRC_URI[sha256sum] = "aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-simplejson \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-profile \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb new file mode 100644 index 0000000000..ed7a509ad3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.0.3.bb @@ -0,0 +1,39 @@ +SUMMARY = "The Swiss Army knife of Python web development" +DESCRIPTION = "\ +Werkzeug started as simple collection of various utilities for WSGI \ +applications and has become one of the most advanced WSGI utility modules. \ +It includes a powerful debugger, full featured request and response objects, \ +HTTP utilities to handle entity tags, cache control headers, HTTP dates, \ +cookie handling, file uploads, a powerful URL routing system and a bunch \ +of community contributed addon modules." +HOMEPAGE = "http://werkzeug.pocoo.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" + +PYPI_PACKAGE = "Werkzeug" + +SRC_URI[sha256sum] = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-simplejson \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-profile \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.37.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.37.1.bb deleted file mode 100644 index 6c7a31db9e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.37.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "The official binary distribution format for Python " -HOMEPAGE = "https://github.com/pypa/wheel" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[sha256sum] = "e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native" - diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.1.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.1.bb deleted file mode 100644 index ec3cde87d3..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "PyEphem astronomical calculations" -HOMEPAGE = "http://rhodesmill.org/pyephem/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9c930b395b435b00bb13ec83b0c99f40" - -SRC_URI[sha256sum] = "dba9e05c78ce910ae75a06351a5592479191a8dc570ac0cd6d18a77e98138873" - -PYPI_PACKAGE = "ephem" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-math \ - " diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.3.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.3.bb new file mode 100644 index 0000000000..29697bc251 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.3.bb @@ -0,0 +1,16 @@ +SUMMARY = "PyEphem astronomical calculations" +HOMEPAGE = "http://rhodesmill.org/pyephem/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9c930b395b435b00bb13ec83b0c99f40" + +SRC_URI[sha256sum] = "7fa18685981ba528edd504052a9d5212a09aa5bf15c11a734edc6a86e8a8b56a" + +PYPI_PACKAGE = "ephem" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-math \ + " diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.0.bb deleted file mode 100644 index 46b6a99605..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "A set of tools using pywbem" -DESCRIPTION = "A set of tools using pywbem to communicate with WBEM servers" -HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" - -SRC_URI[sha256sum] = "f6f36c96be46c801919fa6cc218a5d051fce381a2d9a0b99c9162d8335e96c36" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-pyyaml-native \ - ${PYTHON_PN}-pywbem-native \ - ${PYTHON_PN}-six-native \ - ${PYTHON_PN}-click-native \ -" - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-pywbem \ - ${PYTHON_PN}-click \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-prompt-toolkit \ - ${PYTHON_PN}-mock \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-nocasedict \ - ${PYTHON_PN}-yamlloader \ - ${PYTHON_PN}-click-repl \ - ${PYTHON_PN}-click-spinner \ - ${PYTHON_PN}-asciitree \ - ${PYTHON_PN}-tabulate \ - ${PYTHON_PN}-pydicti \ - ${PYTHON_PN}-nocaselist \ - ${PYTHON_PN}-custom-inherit \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb new file mode 100644 index 0000000000..c51f860fd5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "A set of tools using pywbem" +DESCRIPTION = "A set of tools using pywbem to communicate with WBEM servers" +HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" + +SRC_URI[sha256sum] = "cbe2fe67620e73a81807940a75aeed8570205e2213d6f8de4db15fbc06fe8804" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-pywbem-native \ + ${PYTHON_PN}-six-native \ + ${PYTHON_PN}-click-native \ +" + +RDEPENDS:${PN}:class-target += "\ + ${PYTHON_PN}-ply \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-pywbem \ + ${PYTHON_PN}-click \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-prompt-toolkit \ + ${PYTHON_PN}-mock \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-nocasedict \ + ${PYTHON_PN}-yamlloader \ + ${PYTHON_PN}-click-repl \ + ${PYTHON_PN}-click-spinner \ + ${PYTHON_PN}-asciitree \ + ${PYTHON_PN}-tabulate \ + ${PYTHON_PN}-pydicti \ + ${PYTHON_PN}-nocaselist \ + ${PYTHON_PN}-custom-inherit \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf index 46d5a872a1..312c39b3b3 100644 --- a/meta-openembedded/meta-webserver/conf/layer.conf +++ b/meta-openembedded/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "honister" +LAYERSERIES_COMPAT_webserver = "kirkstone" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb deleted file mode 100644 index b64824c474..0000000000 --- a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Web-based MySQL administration interface" -HOMEPAGE = "http://www.phpmyadmin.net" -# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT -LICENSE = "GPLv2 & LGPLv3 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ - file://js/vendor/jquery/MIT-LICENSE.txt;md5=75308107741f7dcdc39127209c7e3fc8 \ -" - -SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ - file://apache.conf \ -" - -SRC_URI[md5sum] = "e73377b11b7d38fa3f3014f2799c5252" -SRC_URI[sha256sum] = "1964d7190223c11e89fa1b7970c618e3a3bae2e859f5f60383f64c3848ef6921" - -UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" -UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" - -S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" - -inherit allarch - -do_install() { - install -d ${D}${datadir}/${BPN} - cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} - chown -R root:root ${D}${datadir}/${BPN} - # Don't install patches to target - rm -rf ${D}${datadir}/${BPN}/patches - - install -d ${D}${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf - - # Remove a few scripts that explicitly require bash (!) - rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh -} - -FILES:${PN} = "${datadir}/${BPN} \ - ${sysconfdir}/apache2/conf.d" - -RDEPENDS:${PN} += "bash php-cli" diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb new file mode 100644 index 0000000000..dca476cede --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb @@ -0,0 +1,40 @@ +SUMMARY = "Web-based MySQL administration interface" +HOMEPAGE = "http://www.phpmyadmin.net" +# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT +LICENSE = "GPLv2 & LGPLv3 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ + file://js/vendor/jquery/MIT-LICENSE.txt;md5=de877aa6d744cc160ff41c26a8e4811f \ +" + +SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ + file://apache.conf \ +" + +SRC_URI[sha256sum] = "c562feddc0f8ff5e69629113f273a0d024a65fb928c48e89ce614744d478296f" + +UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" +UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" + +S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/${BPN} + cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} + chown -R root:root ${D}${datadir}/${BPN} + # Don't install patches to target + rm -rf ${D}${datadir}/${BPN}/patches + + install -d ${D}${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf + + # Remove a few scripts that explicitly require bash (!) + rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh +} + +FILES:${PN} = "${datadir}/${BPN} \ + ${sysconfdir}/apache2/conf.d" + +RDEPENDS:${PN} += "bash php-cli" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb deleted file mode 100644 index dbce1c432f..0000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb +++ /dev/null @@ -1,76 +0,0 @@ -HOMEPAGE = "https://github.com/netdata/netdata/" -SUMMARY = "Real-time performance monitoring" -DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ - Open-source, free, preconfigured, opinionated, and always real-time." -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" - -DEPENDS += "libuv openssl util-linux zlib " - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-v${PV}.tar.gz" -SRC_URI[sha256sum] = "ac406513e86ad24976a66146702aeac960e43908abc51d70e4a073905275d13e" - -# default netdata.conf for netdata configuration -SRC_URI += "file://netdata.conf" - -# file for providing systemd service support -SRC_URI += "file://netdata.service" - -UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" - -S = "${WORKDIR}/${BPN}-v${PV}" - -# Stop sending anonymous statistics to Google Analytics -NETDATA_ANONYMOUS ??= "enabled" - -inherit pkgconfig autotools-brokensep useradd systemd - -LIBS:toolchain-clang:x86 = "-latomic" -LIBS:riscv64 = "-latomic" -LIBS:riscv32 = "-latomic" -LIBS:mips = "-latomic" -export LIBS - -#systemd -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "netdata.service" -SYSTEMD_AUTO_ENABLE:${PN} = "enable" - -#User specific -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" - -# ebpf doesn't compile (or detect) the cross compilation well -EXTRA_OECONF += "--disable-ebpf" - -do_install:append() { - #set S UID for plugins - chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # Install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system - sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service - fi - - # Install default netdata.conf - install -d ${D}${sysconfdir}/netdata - install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ - sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf - - if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then - touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics - fi - - install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata - install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata - - chown -R netdata:netdata ${D}${datadir}/netdata/web -} - -FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" - -RDEPENDS:${PN} = "bash zlib" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb new file mode 100644 index 0000000000..2004670f62 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb @@ -0,0 +1,80 @@ +HOMEPAGE = "https://github.com/netdata/netdata/" +SUMMARY = "Real-time performance monitoring" +DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ + Open-source, free, preconfigured, opinionated, and always real-time." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" + +DEPENDS += "libuv util-linux zlib" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz" +SRC_URI[sha256sum] = "20ba8695d87187787b27128ac3aab9b09aa29ca6b508c48542e0f7d50ec9322b" + +# default netdata.conf for netdata configuration +SRC_URI += "file://netdata.conf" + +# file for providing systemd service support +SRC_URI += "file://netdata.service" + +UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" + +S = "${WORKDIR}/${BPN}-v${PV}" + +# Stop sending anonymous statistics to Google Analytics +NETDATA_ANONYMOUS ??= "enabled" + +inherit pkgconfig autotools-brokensep useradd systemd + +LIBS:toolchain-clang:x86 = "-latomic" +LIBS:riscv64 = "-latomic" +LIBS:riscv32 = "-latomic" +LIBS:mips = "-latomic" +export LIBS + +#systemd +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "netdata.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +#User specific +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" + +PACKAGECONFIG ??= "https" +PACKAGECONFIG[compression] = "--enable-compression, --disable-compression, lz4" +PACKAGECONFIG[https] = "--enable-https, --disable-https, openssl" + +# ebpf doesn't compile (or detect) the cross compilation well +EXTRA_OECONF += "--disable-ebpf" + +do_install:append() { + #set S UID for plugins + chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system + sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service + fi + + # Install default netdata.conf + install -d ${D}${sysconfdir}/netdata + install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ + sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + + if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then + touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics + fi + + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata + install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata + + chown -R netdata:netdata ${D}${datadir}/netdata/web +} + +FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" + +RDEPENDS:${PN} = "bash zlib" diff --git a/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf index 81e7dc5ad3..be58708679 100644 --- a/meta-openembedded/meta-xfce/conf/layer.conf +++ b/meta-openembedded/meta-xfce/conf/layer.conf @@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "honister" +LAYERSERIES_COMPAT_xfce-layer = "kirkstone" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ openzone->gdk-pixbuf \ diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch new file mode 100644 index 0000000000..617d175579 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch @@ -0,0 +1,26 @@ +From d463b7e9abbbc87ec0e25216a24d9a40d347f1a6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 24 Jan 2022 09:59:02 -0800 +Subject: [PATCH] Fix build with meson >= 0.61 + +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/3] +Signed-off-by: Khem Raj +--- + panels/datetime/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 241e177..4356907 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -10,7 +10,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: 'xfce-datetime.desktop', +-- +2.34.1 + diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb index 4ae83ceca1..9d68ad272b 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -8,6 +8,7 @@ DEPENDS = "glib-2.0-native libxfce4ui" SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \ file://fix-inner-dependency.patch \ + file://0001-Fix-build-with-meson-0.61.patch \ " SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb index a8ede836e5..2c6c7424e6 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb @@ -13,6 +13,7 @@ SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.pat SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" +EXTRA_OECONF += "--disable-vala" PACKAGECONFIG ??= "" PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb index 1a0b7183ee..9462b28ac5 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb @@ -4,6 +4,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" -inherit xfce gtk-doc gobject-introspection +inherit xfce gtk-doc gobject-introspection vala SRC_URI[sha256sum] = "60598d745d1fc81ff5ad3cecc3a8d1b85990dd22023e7743f55abd87d8b55b83" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb index c9e65400d2..02038b0c12 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb @@ -14,10 +14,12 @@ SRC_URI += " \ file://0002-use-lxdm-to-replace-dm-tool.patch \ " +EXTRA_OECONF += "--disable-vala" + python populate_packages:prepend() { plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') plugin_name = d.expand('${PN}-plugin-%s') - do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + do_split_packages(d, plugin_dir, r'^lib(.*)\.so$', plugin_name, '${PN} plugin for %s', extra_depends='', prepend=True, aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', '${sysconfdir}/xdg/xfce/panel/%s-*', diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb index 5214b2ea7e..0bbef847ce 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" -inherit xfce gtk-doc gobject-introspection bash-completion +inherit xfce gtk-doc gobject-introspection bash-completion vala EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -- cgit v1.2.3