From 69721092c033f1c69060d2a5ae865f72a862e583 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 23 Jul 2021 12:57:00 -0400 Subject: meta-openembedded: subtree update:2449e5f07a..8fbcfb9f02 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Zaharia (1): ntp: fix ntpdate to wait for subprocesses Akifumi Chikazawa (1): openvpn: add CVE-2020-7224 and CVE-2020-27569 to allowlist Andrea Adami (3): initramfs-kexecboot-image: support cases where machines override IMAGE_FSTYPES initramfs-debug-image: support cases where machines override IMAGE_FSTYPES rapidjson: remove stale LIB_INSTALL_DIR Andreas Müller (50): poppler: upgrade 21.05.0 -> 21.06.0 dbus-broker: upgrade 28 -> 29 libmbim: upgrade 1.24.6 -> 1.24.8 icewm: upgrade 2.3.3 -> 2.3.4 poppler: upgrade 21.06.0 -> 21.06.1 gnome-disk-utility: upgrade 3.36.3 -> 40.1 gnome-font-viewer: upgrade 3.34.0 -> 40.0 pipewire: upgrade 0.3.24 -> 0.3.29 libqmi: upgrade 1.28.4 -> 1.28.6 ttf-noto-emoji: upgrade 20190815 -> 20200916 remmina: upgrade 1.4.17 -> 1.4.18 metacity: upgrade 3.36.1 -> 3.40.0 gnome-flashback: upgrade 3.36.3 -> 3.40.0 gthumb: initial add 3.10.3 atkmm: upgrade 2.28.0 -> 2.28.2 atkmm: build with meson dconf: upgrade 0.38.0 -> 0.40.0 evolution-data-server: upgrade 3.40.1 -> 3.40.2 file-roller: upgrade 3.38.1 -> 3.40.0 glibmm: upgrade 2.62.0 -> 2.66.1 / build with meson / cleanup recipe gmime: upgrade 3.2.6 -> 3.2.7 gnome-autoar; upgrade 0.3.2 -> 0.3.3 gnome-keyring: upgrade 3.36.0 -> 40.0 gnome-online-accounts: upgrade 3.36.0 -> 3.40.0 gnome-terminal: upgrade 3.36.2 -> 3.40.2 gspell: upgrade 1.8.4 -> 1.9.1 gtkmm3: upgrade 3.24.3 -> 3.24.5 gtksourceview4: upgrade 4.6.1 -> 4.8.1 gupnp: upgrade 1.2.6 -> 1.2.7 gvfs: upgrade 1.44.1 -> 1.48.1 libgdata: upgrade 0.17.13 -> 0.18.1 libmediaart 0.7.0: remove libmediaart-2.0: upgrade 1.9.4 -> 1.9.5 / merge inc file / build with meson libsigc++-2.0: upgrade 2.10.6 -> 2.10.7 nautilus: upgrade 40.1 -> 40.2 pangomm: upgrade 2.42.1 -> 2.46.1 / build with meson yelp-xsl: upgrade 3.36.0 -> 4.02 yelp-tools: upgrade 3.32.2 -> 40.0 yelp: upgrade 3.36.0 -> 40.2 modemmanager: upgrade 1.16.4 -> 1.16.6 xfce4-settings: 4.16.1 upgrade 4.16.2 blueman: upgrade 2.1.4 -> 2.2.1 pipewire: upgrade 0.3.30 -> 0-3-31 cmark: upgrade 0.29.0 -> 0.30.0 networkmanager: upgrade 1.30.4 -> 1.32.2 ristretto: upgrade 0.10.0 -> 0.11.0 libgusb: upgrade 0.3.6 -> 0.3.7 poppler: upgrade 21.06.1 -> 21.07.0 gegl: Disable pango on native build to fix gimp build segfaults gimp: remove --disable-vector-icons Bartosz Golaszewski (13): libgpiod: coding style fixes libgpiod: list all packages in a single assignment libgpiod: fix RRECOMMENDS for python bindings libgpiod: correctly split output files into packages libgpiod: add RDEPENDS for tests libgpiod: redirect stdout from the ptest executable to a file libgpiod: ptest: run all test-suites if possible libgpiod: ptest: warn if the gpio-mockup kernel module is not selected libgpiod: ptest: add kernel-modules to RRECOMMENDS libgpiod: ptest: only rrecommend a single module that we need libgpiod: add the python test-suite to the ptest package libgpiod: update my email address python3-joblib: new package Ben Horgan (1): cpputest: Add initial recipe. Version 4.0. Carlos Rafael Giani (2): pipewire: Add filter-chain files to modules-filter-chain package pipewire: Upgrade to 0.3.30 Changqing Li (1): mousepad: fix warning during postinst Chen Qi (1): minifi-cpp: set CLEANBROKEN to 1 Daiane Angolini (1): wireguard-module: Stop overriding modules_install in the recipe Daniel Klauer (1): spidev-test: Update common-licenses reference David Sterling (1): can-isotp: Upgrade to latest on master Ed Tanous (1): Use the built-in options for removing pack tools Geoff Parker (1): cifs-utils: set ROOTSBINDIR to /usr/sbin if DISTRO_FEATURES has usrmerge Gianfranco (2): vboxguestdrivers: add a fix for build failure with kernel 5.13 dlt-daemon: update from 2.18.6 to 2.18.7 Hongxu Jia (1): debootstrap: fix runtime failure on nativesdk Joshua Watt (1): gnome: gnome-shell: Move gsettings to their own package Kai Kang (4): python3-m2crypto: fix word size for qemuppc64 little endian python3-m2crypto: avoid host contamination for swig bats: fix qa issue when multilib eanbled mariadb: fix failures to start install_db.service Khem Raj (57): glog: Upgrade to 0.5.0 mbedtls: Upgrade to 2.26.0 mbedtls: Add packageconfig for warning-as-errors memcached: upgrade to 1.6.9 indent: Remove dead code using count_parens function glm: Fix additional clang warnings tbb: Fix warnings with clang libwebsockets: Update to latest on v4.2-stable packagegroup-meta-oe: Add libparse-yapp-perl netplan: Fix a warning with clang python3-yappi: Fix patching errors packagegroup-meta-oe: Add zsync-curl klibc: Add clang's -rtlib to known options libpfm4: Upgrade to 4.11.0 ltrace: Remove unused static function flashrom: Fix build with clang mongodb: Enable wiredtiger only on aarch64/x86_64 hosts mariadb: Fix build with clang/musl c-ares: Upgrade to 1.17.1 release nodejs: Update to 14.17.1 rocksdb: Upgrade to 6.20.3 rocksdb: Implement toku_time_now function for rv32/rv64 rocksdb: Fix build with ppc64/musl rocksdb: Implement timer for mips rocksdb: Implement timer for armv6+ rocksdb: Fix build with gcc on rv32 and mips libzip: Upgrade to 1.8.0 czmq: Inherit pkgconfig czmq: Add libmicrohttpd feature via packageconfig czmq: Use Cmake knobs to enable/disable designed packageconfigs czmq: Add nss packageconfig meta-python: Add python3-fastjsonschema and its dependencies packagegroup-meta-python: Add newly added recipes python3-process-tests: Add recipe python3-aspectlib: Add ptests python3-execnet: Add ptests python3-py-cpuinfo: Add ptests libc-bench: Do not override ldflags in makefile mpich: Add libgcc to ldflags on x86/glibc mpd: Update to 0.22.9 imlib2: Use propert git SHA in SRCREV suitesparse: Update to 5.10.1 packagegroup-meta-oe: Add libyang sysdig: Disable JIT on ppc64 portaudio-v19: Use GNUInstallDirs to make it portable keepalived: Upgrade to 2.2.2 suitesparse: Fix LIC_FILES_CHKSUM xscreensaver: Update to 6.01 ltrace: Fix mips build with kernels 5.13+ python3-pyusb: Add missing runtime dependency on libusb1 can-isotp: Ignore in world builds postfix: Upgrade to 3.6.1 packagegroup-meta-oe: Add new package cpputest apitrace: Update to latest trunk fatresize: Disable building documentation files layers: Fix git send-email instructions in README autofs: Upgrade to 5.1.7 Leon Anavi (61): python3-oauthlib: Upgrade 3.1.0 -> 3.1.1 python3-django: Upgrade 3.2.3 -> 3.2.4 python3-sqlalchemy: Upgrade 1.4.15 -> 1.4.17 python3-aiohue: Upgrade 2.5.0 -> 2.5.1 python3-typeguard: Upgrade 2.12.0 -> 2.12.1 python3-cbor2: Upgrade 5.3.0 -> 5.4.0 python3-ipython: Upgrade 7.24.0 -> 7.24.1 python3-pkgconfig: Upgrade 1.5.2 -> 1.5.4 python3-humanize: Upgrade 3.6.0 -> 3.7.1 python3-fasteners: Upgrade 0.16 -> 0.16.1 python3-pythonping: Upgrade 1.0.16 -> 1.1.0 python3-bitarray: Upgrade 2.1.0 -> 2.1.2 python3-coloredlogs: Upgrade 15.0 -> 15.0.1 python3-pysonos: Upgrade 0.0.50 -> 0.0.51 python3-dill: Upgrade 0.3.3 -> 0.3.4 python3-humanfriendly: Upgrade 9.1 -> 9.2 python3-zeroconf: Add recipe python3-pychromecast: Upgrade 9.1.2 -> 9.2.0 python3-ifaddr: Fix RDEPENDS python3-bitarray: Upgrade 2.1.2 -> 2.1.3 python3-astroid: Upgrade 2.5.7 -> 2.5.8 python3-license-expression: Upgrade 1.2 -> 21.6.14 python3-humanize: Upgrade 3.7.1 -> 3.9.0 python3-ruamel-yaml: Upgrade 0.17.7 -> 0.17.9 python3-cmd2: Upgrade 1.5.0 -> 2.1.1 python3-fasteners: Upgrade 0.16.1 -> 0.16.3 python3-elementpath: Upgrade 2.2.2 -> 2.2.3 python3-prompt-toolkit: Upgrade 3.0.18 -> 3.0.19 python3-mypy: Upgrade 0.812 -> 0.902 python3-send2trash: Upgrade 1.5.0 -> 1.7.1 python3-pandas: Upgrade 1.2.4 -> 1.2.5 python3-mypy: Upgrade 0.902 -> 0.910 python3-astroid: Upgrade 2.5.8 -> 2.6.0 python3-tqdm: Upgrade 4.61.0 -> 4.61.1 python3-ruamel-yaml: Upgrade 0.17.9 -> 0.17.10 python3-httplib2: Fix runtime dependencies python3-google-api-core: Add recipe python3-google-auth: Add recipe python3-googleapis-common-protos: Add recipe python3-google-api-python-client: Upgrade 2.6.0 -> 2.10.0 python3-ipython: Upgrade 7.24.1 -> 7.25.0 python3-croniter: Upgrade 1.0.13 -> 1.0.15 python3-priority: Upgrade 1.3.0 -> 2.0.0 python3-astroid: Upgrade 2.6.0 -> 2.6.2 python3-watchdog: Upgrade 2.1.2 -> 2.1.3 python3-humanize: Upgrade 3.9.0 -> 3.10.0 python3-pillow: Upgrade 8.2.0 -> 8.3.1 python3-bitarray: Upgrade 2.1.3 -> 2.2.1 python3-cmd2: Upgrade 2.1.1 -> 2.1.2 python3-pandas: Upgrade 1.2.5 -> 1.3.0 python3-texttable: Upgrade 1.6.3 -> 1.6.4 python3-dateutil: Upgrade 2.8.1 -> 2.8.2 python3-requests: Upgrade 2.25.1 -> 2.26.0 python3-websocket-client: Upgrade 1.0.1 -> 1.1.0 python3-pysonos: Upgrade 0.0.51 -> 0.0.53 python3-bitarray: Upgrade 2.2.1 -> 2.2.2 python3-pyusb: Upgrade 1.2.0 -> 1.2.1 python3-zeroconf: Upgrade 0.31.0 -> 0.33.1 python3-yamlloader: Upgrade 1.0.0 -> 1.1.0 python3-astroid: Upgrade 2.6.2 -> 2.6.5 python3-pkgconfig: Upgrade 1.5.4 -> 1.5.5 Luan Rafael Carneiro (1): libwebsockets: Update 4.2.0 -> 4.2.1 Luca Boccassi (2): dbus-broker: remove deprecated linux-4-17 option dbus-broker: enforce required versions of libselinux and libaudit Marek Vasut (1): nss: Fix build on Centos 7 Martin Jansa (1): rygel: require gobject-introspection-data in DISTRO_FEATURES Masaki Ambai (1): nss: add CVE-2006-5201 to allowlist Oleksandr Kravchuk (1): iwd: update to 1.15 Olivier Georget (1): libpfm4 4.10.1 : enable arm64 host platform Ovidiu Panait (1): libeigen: update LICENSE information Pascal Bach (1): python3-thrift: support native recipe Persian Prince (1): samba: Don't guess dirs for perllocal.pod removing Peter Bergin (4): linuxptp: use install from makefile and install more apps linuxptp: add homepage linuxptp: ship example configurations in separate package hiredis: add cmake config file for pkgconfig Peter Kjellerstedt (3): net-snmp: A little clean up net-snmp: Support building for native cryptsetup: Only recommend kernel modules when building for target Philip Balister (1): fftw: Update recipe to 3.3.9. Pierre-Jean Texier (5): libtinyxml2: upgrade 8.1.0 -> 9.0.0 sshfs-fuse: upgrade 3.7.1 -> 3.7.2 monit: upgrade 5.27.2 -> 5.28.0 spitools: upgrade 0.8.7 -> 1.0.0 linuxptp: fix upstream version check Ross Burton (1): zsync-curl: add recipe Sam Van Den Berge (1): libiio: fix installing libiio when python3 bindings are enabled Sekine Shigeki (2): add CVE-2011-2411 to allowlist ntp: add CVE-2016-9312 to allowlist Signed-off-by: Bartosz Golaszewski (1): Revert "libgpiod: ptest: warn if the gpio-mockup kernel module is not selected" Tim Orling (8): libcgi-perl: upgrade 4.51 -> 4.53 libcrypt-openssl-guess-perl: upgrade 0.12 -> 0.13 libextutils-cppguess-perl: upgrade 0.21 -> 0.23 libio-socket-ssl-perl: upgrade 2.068 -> 2.071 libmoo-perl: upgrade 2.004000 -> 2.005004 libnet-dns-perl: upgrade 1.26 -> 1.31 libtest-warnings-perl: upgrade 0.028 -> 0.030 logcheck: upgrade 1.3.20 -> 1.3.23 Tony Tascioglu (2): libyang: create recipe for libyang redis: upgrade to 6.2.4 Trevor Gamblin (9): libnftnl: upgrade 1.1.9 -> 1.2.0 nftables: upgrade 0.9.8 -> 0.9.9 python3-yarl: backport fix for test_url_query test python3-yappi: fix ptests python3-django: upgrade 2.2.23 -> 2.2.24 python3-django: upgrade 3.2.4 -> 3.2.5 python3-geomet: add recipe python3-cassandra-driver: add geomet to RDEPENDS, remove DISTUTILS options python3-geomet: Add missing RDEPENDS; add to packagegroup-meta-python Yi Zhao (14): libldb: upgrade 1.5.8 -> 2.3.0 samba: upgrade 4.10.18 -> 4.14.4 samba: update smb.conf libparse-yapp-perl: add recipe dhcp-relay: update bundled bind to 9.11.32 dhcp-relay: disable backtrace in bundled bind dhcp-relay: update 4.4.2 -> 4.4.2-P1 packagegroup-meta-networking: add dhcp-relay samba: disable check fcntl RW_HINTS when configure samba: upgrade 4.14.4 -> 4.14.5 minifi-cpp: set correct python processor directory in configure file samba: fix shebang for pidl samba: add missing runtime dependency for pidl audit: upgrade 3.0.1 -> 3.0.2 Zoltán Böszörményi (2): mariadb: Use qemu to run cross-compiled binaries mariadb: Upgrade to 10.5.11 hayashi.satoshi@fujitsu.com (1): dracut: add CVE-2010-4176 to allowlist ito-yuichi@fujitsu.com (2): cyrus-sasl: add CVE-2020-8032 to allowlist dovecot: add CVE-2016-4983 to allowlist massimo toscanelli (1): sysbench: fix memory test wangmy (8): samba: Solve the dependency problem when installing Samba fatresize: upgrade 1.0.2 -> 1.1.0 xfsprogs: upgrade 5.10.0 -> 5.12.0 ctags: upgrade 5.9.20210627.0 -> 5.9.20210711.0 icewm: upgrade 2.3.4 -> 2.6.0 yelp: upgrade 40.2 -> 40.3 live555: upgrade 20210406 -> 20210710 modemmanager: upgrade 1.16.6 -> 1.16.8 zangrc (49): python3-idna: upgrade 3.1 -> 3.2 netplan: upgrade 0.101 -> 0.102 wireshark: upgrade 3.4.5 -> 3.4.6 tracker: upgrade 3.0.4 -> 3.1.1 tracker-miners: upgrade 3.0.5 -> 3.1.1 rasdaemon: upgrade 0.6.6 -> 0.6.7 speedtest-cli: upgrade 2.1.2 -> 2.1.3 abseil-cpp: upgrade 20210324 -> 20210324.2 cryptsetup: upgrade 2.3.5 -> 2.3.6 ctags: upgrade 5.9.20210502.0 -> 5.9.20210606.0 opencl-clhpp: upgrade 2.0.13 -> 2.0.14 protobuf: upgrade 3.17.0 -> 3.17.3 toybox: upgrade 0.8.4 -> 0.8.5 fuse3: upgrade 3.10.3 -> 3.10.4 evince: upgrade 40.1 -> 40.2 mosquitto: upgrade 2.0.10 -> 2.0.11 ctags: upgrade 5.9.20210606.0 -> 20210613.0 fsverity-utils: upgrade 1.3 -> 1.4 googletest: upgrade 1.10.0 -> 1.11.0 mg: upgrade 20210314 -> 20210609 nano: upgrade 5.7 -> 5.8 openvpn: upgrade 2.5.2 -> 2.5.3 snort: upgrade 2.9.17.1 -> 2.9.18 function2: upgrade 4.1.0 -> 4.2.0 python3-configargparse: upgrade 1.4.1 -> 1.5 python3-grpcio-tools: upgrade 1.37.0 -> 1.38.1 python3-h5py: upgrade 3.2.1 -> 3.3.0 python3-isort: upgrade 5.8.0 -> 5.9.1 can-utils: upgrade 2020.12.0 -> 2021.06.0 ctags: upgrade 5.9.20210620.0 -> 5.9.20210627.0 python3-gast: upgrade 0.4.0 -> 0.5.0 python3-grpcio: upgrade 1.38.0 -> 1.38.1 python3-haversine: upgrade 2.3.0 -> 2.3.1 python3-m2crypto: upgrade 0.37.1 -> 0.38.0 python3-pyrsistent: upgrade 0.17.3 -> 0.18.0 babl: upgrade 0.1.86 -> 0.1.88 python3-pyusb: upgrade 1.1.1 -> 1.2.0 python3-google-api-python-client: upgrade 2.10.0 -> 2.12.0 firewalld: upgrade 0.9.3 -> 0.9.4 strongswan: upgrade 5.9.2 -> 5.9.3 opencl-clhpp: upgrade 2.0.14 -> 2.0.15 python3-cffi: upgrade 1.14.5 -> 1.14.6 python3-configargparse: upgrade 1.5 -> 1.5.1 python3-cryptography-vectors: upgrade 3.4.6 -> 3.4.7 python3-flask-migrate: upgrade 3.0.0 -> 3.0.1 python3-flask-socketio: upgrade 5.0.3 -> 5.1.0 python3-isort: upgrade 5.9.1 -> 5.9.2 python3-networkx: upgrade 2.5.1 -> 2.6.1 python3-gnupg: upgrade 0.4.6 -> 0.4.7 zhengruoqin (30): opensaf: upgrade 5.21.03 -> 5.21.06 fio: upgrade 3.26 -> 3.27 gensio: upgrade 2.2.5 -> 2.2.7 memtester: upgrade 4.5.0 -> 4.5.1 graphene: upgrade 1.10.2 -> 1.10.6 iozone3: upgrade 490 -> 492 net-snmp: upgrade 5.9 -> 5.9.1 rsnapshot: upgrade 1.4.3 -> 1.4.4 rsyslog: upgrade 8.2104.0 -> 8.2106.0 python3-absl: upgrade 0.12.0 -> 0.13.0 ctags: upgrade 5.9.20210613.0 -> 5.9.20210620.0 fwts: upgrade 21.03.00 -> 21.06.00 grpc: upgrade 1.38.0 -> 1.38.1 libconfig: upgrade 1.7.2 -> 1.7.3 satyr: upgrade 0.37 -> 0.38 libnet-telnet-perl: upgrade 3.04 -> 3.05 python3-scrypt: upgrade 0.8.17 -> 0.8.18 python3-urllib3: upgrade 1.26.5 -> 1.26.6 python3-sqlalchemy: upgrade 1.4.17 -> 1.4.20 python3-qrcode: upgrade 6.1 -> 7.1 python3-regex: upgrade 2021.4.4 -> 2021.7.6 python3-sentry-sdk: upgrade 1.1.0 -> 1.2.0 python3-tqdm: upgrade 4.61.1 -> 4.61.2 python3-xlsxwriter: upgrade 1.4.3 -> 1.4.4 ostree: upgrade 2021.2 -> 2021.3 span-lite: upgrade 0.9.2 -> 0.10.0 python3-pymisp: upgrade 2.4.143 -> 2.4.144 python3-protobuf: upgrade 3.17.0 -> 3.17.3 python3-pulsectl: upgrade 21.5.17 -> 21.5.18 python3-pytun: upgrade 2.3.0 -> 2.4.1 Signed-off-by: Andrew Geissler Change-Id: Ie45184e6f308aa2fc98ee6edf4a3ca1c4afbb5b4 --- .../recipes-support/cifs/cifs-utils_6.13.bb | 17 +- .../recipes-support/dovecot/dovecot_2.3.14.bb | 3 + ...-import-target-module-while-cross-compile.patch | 71 +++++++++ .../0001-waf-add-support-of-cross_compile.patch | 62 -------- ...02-ldb-Add-configure-options-for-packages.patch | 173 +++++++++++++++++++++ .../libldb/0003-avoid-openldap-unless-wanted.patch | 30 ++++ .../libldb/avoid-openldap-unless-wanted.patch | 23 --- ...-import-target-module-while-cross-compile.patch | 67 -------- .../libldb-fix-musl-libc-unkown-type-error.patch | 31 ---- .../libldb/libldb/options-1.5.4.patch | 171 -------------------- .../recipes-support/libldb/libldb_1.5.8.bb | 71 --------- .../recipes-support/libldb/libldb_2.3.0.bb | 69 ++++++++ .../0001-Replace-sigignore-with-signal-API.patch | 74 --------- ...x.c-Check-for-NDEBUG-before-using-total_w.patch | 48 ++++++ .../recipes-support/memcached/memcached_1.6.6.bb | 52 ------- .../recipes-support/memcached/memcached_1.6.9.bb | 52 +++++++ .../recipes-support/nghttp2/nghttp2_1.43.0.bb | 6 +- .../recipes-support/ntp/ntp/ntpdate | 5 + .../recipes-support/ntp/ntp_4.2.8p15.bb | 3 + .../recipes-support/openvpn/openvpn_2.5.2.bb | 73 --------- .../recipes-support/openvpn/openvpn_2.5.3.bb | 76 +++++++++ .../recipes-support/strongswan/strongswan_5.9.2.bb | 144 ----------------- .../recipes-support/strongswan/strongswan_5.9.3.bb | 143 +++++++++++++++++ .../recipes-support/wireshark/wireshark_3.4.5.bb | 88 ----------- .../recipes-support/wireshark/wireshark_3.4.6.bb | 88 +++++++++++ 25 files changed, 776 insertions(+), 864 deletions(-) create mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-waf-add-support-of-cross_compile.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-unkown-type-error.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.5.4.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb (limited to 'meta-openembedded/meta-networking/recipes-support') diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb index 41a9b8e76..bf8b18043 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb @@ -22,10 +22,21 @@ PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disab inherit autotools pkgconfig +do_configure_prepend() { + # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant + # must override ROOTSBINDIR (default '/sbin'), + # setting --exec-prefix or --prefix in EXTRA_OECONF does not work + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','fakse',d)}; then + export ROOTSBINDIR=${sbindir} + fi +} + do_install_append() { - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + fi } FILES_${PN} += "${base_libdir}/security" 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 19ba2b1fc..26b4f5ee8 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 @@ -72,3 +72,6 @@ FILES_${PN} += "${libdir}/dovecot/*plugin.so \ FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" 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" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch new file mode 100644 index 000000000..74f8d8ad0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch @@ -0,0 +1,71 @@ +From 00500909ebb0f51dd3b4e90c665f07158e7fe255 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 25 Jun 2019 14:25:08 +0800 +Subject: [PATCH] do not import target module while cross compile + +Some modules such as dynamic library maybe cann't be imported +while cross compile, we just check whether does the module exist. + +Signed-off-by: Bian Naimeng + +update to version 4.10.5, and switch to python3 +Signed-off-by: Changqing Li + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- + 1 file changed, 19 insertions(+), 8 deletions(-) + +diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py +index 5f080dd..cdc115e 100644 +--- a/buildtools/wafsamba/samba_bundled.py ++++ b/buildtools/wafsamba/samba_bundled.py +@@ -4,6 +4,7 @@ import sys + from waflib import Build, Options, Logs + from waflib.Configure import conf + from wafsamba import samba_utils ++import importlib.util, os + + def PRIVATE_NAME(bld, name, private_extension, private_library): + '''possibly rename a library to include a bundled extension''' +@@ -249,17 +250,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): + # versions + minversion = minimum_library_version(conf, libname, minversion) + +- try: +- m = __import__(modulename) +- except ImportError: +- found = False +- else: ++ # Find module in PYTHONPATH ++ spec = importlib.util._find_spec_from_path(modulename, [os.environ["PYTHONPATH"]]) ++ if spec: + try: +- version = m.__version__ +- except AttributeError: ++ module = importlib.util.module_from_spec(spec) ++ spec.loader.load_module(module) ++ except ImportError: + found = False ++ ++ if conf.env.CROSS_COMPILE: ++ # Some modules such as dynamic library maybe cann't be imported ++ # while cross compile, we just check whether the module exist ++ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (spec.name)) ++ found = True + else: +- found = tuplize_version(version) >= tuplize_version(minversion) ++ try: ++ version = module.__version__ ++ except AttributeError: ++ found = False ++ else: ++ found = tuplize_version(version) >= tuplize_version(minversion) + if not found and not conf.LIB_MAY_BE_BUNDLED(libname): + Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) + sys.exit(1) +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-waf-add-support-of-cross_compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-waf-add-support-of-cross_compile.patch deleted file mode 100644 index 45c5acabb..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-waf-add-support-of-cross_compile.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 25 Jan 2019 15:00:59 +0800 -Subject: [PATCH] waf: add support of cross_compile - -After upgrade, waf build system also upgraded. - -on 1.5.19, for cross_compile, subprocess.Popen is set to be -samba_cross.cross_Popen, which will not execute testprog on -host, but only read result from cross-answers.txt which is -passed by option --cross-answer - -part of old code: - args = Utils.to_list(kw.get('exec_args', [])) - proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) - -but on new version, exec_args is not used and cause do_configure -failed with Exec format error - -fixed by append cross anser related args to cmd - -Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211] - -Signed-off-by: Changqing Li ---- - third_party/waf/waflib/Tools/c_config.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py -index 7608215..767cf33 100644 ---- a/third_party/waf/waflib/Tools/c_config.py -+++ b/third_party/waf/waflib/Tools/c_config.py -@@ -660,20 +660,21 @@ class test_exec(Task.Task): - """ - color = 'PINK' - def run(self): -+ args = self.generator.bld.kw.get('exec_args', []) - if getattr(self.generator, 'rpath', None): - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) -- else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args) -+ else: -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args) - else: - env = self.env.env or {} - env.update(dict(os.environ)) - for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): - env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) - else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env) - - @feature('test_exec') - @after_method('apply_link') --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch new file mode 100644 index 000000000..a55d46bf7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch @@ -0,0 +1,173 @@ +From 100d16aaa6fe9a28a5ba77b2de2bde81a3fa3dac Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 1 Jul 2019 16:14:16 +0800 +Subject: [PATCH] ldb: Add configure options for packages + +Add configure options for the following packages: + - acl + - attr + - libaio + - libbsd + - libcap + - valgrind + +Upstream-Status: Inappropriate [oe deterministic build specific] + +Signed-off-by: Jackie Huang + +upgrade to version 1.5.4 +Signed-off-by: Changqing Li + +Rebase to 2.3.0 +Signed-off-by: Yi Zhao +--- + lib/replace/wscript | 90 +++++++++++++++++++++++++++++++++++---------- + wscript | 8 ++++ + 2 files changed, 78 insertions(+), 20 deletions(-) + +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 2c856b6..36b696d 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -25,6 +25,41 @@ def options(opt): + opt.PRIVATE_EXTENSION_DEFAULT('') + opt.RECURSE('buildtools/wafsamba') + ++ opt.add_option('--with-acl', ++ help=("Enable use of acl"), ++ action="store_true", dest='enable_acl') ++ opt.add_option('--without-acl', ++ help=("Disable use of acl"), ++ action="store_false", dest='enable_acl', default=False) ++ ++ opt.add_option('--with-attr', ++ help=("Enable use of attr"), ++ action="store_true", dest='enable_attr') ++ opt.add_option('--without-attr', ++ help=("Disable use of attr"), ++ action="store_false", dest='enable_attr', default=False) ++ ++ opt.add_option('--with-libaio', ++ help=("Enable use of libaio"), ++ action="store_true", dest='enable_libaio') ++ opt.add_option('--without-libaio', ++ help=("Disable use of libaio"), ++ action="store_false", dest='enable_libaio', default=False) ++ ++ opt.add_option('--with-libbsd', ++ help=("Enable use of libbsd"), ++ action="store_true", dest='enable_libbsd') ++ opt.add_option('--without-libbsd', ++ help=("Disable use of libbsd"), ++ action="store_false", dest='enable_libbsd', default=False) ++ ++ opt.add_option('--with-libcap', ++ help=("Enable use of libcap"), ++ action="store_true", dest='enable_libcap') ++ opt.add_option('--without-libcap', ++ help=("Disable use of libcap"), ++ action="store_false", dest='enable_libcap', default=False) ++ + @Utils.run_once + def configure(conf): + conf.RECURSE('buildtools/wafsamba') +@@ -35,12 +70,25 @@ def configure(conf): + conf.DEFINE('HAVE_LIBREPLACE', 1) + conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) + +- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') +- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') +- conf.CHECK_HEADERS('shadow.h sys/acl.h') +- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') ++ conf.CHECK_HEADERS('shadow.h') ++ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') ++ ++ if Options.options.enable_acl: ++ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') ++ ++ if Options.options.enable_attr: ++ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') ++ ++ if Options.options.enable_libaio: ++ conf.CHECK_HEADERS('libaio.h') ++ ++ if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_HEADERS('port.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') + conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') +@@ -121,8 +169,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') + +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') ++ if Options.options.enable_valgrind: ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') + conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') +@@ -418,20 +467,21 @@ def configure(conf): + + strlcpy_in_bsd = False + +- # libbsd on some platforms provides strlcpy and strlcat +- if not conf.CHECK_FUNCS('strlcpy strlcat'): +- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True): +- strlcpy_in_bsd = True +- if not conf.CHECK_FUNCS('getpeereid'): +- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS('setproctitle_init'): +- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') +- +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True ++ if not conf.CHECK_FUNCS('getpeereid'): ++ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): ++ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') ++ ++ if not conf.CHECK_FUNCS('closefrom'): ++ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + + conf.CHECK_CODE(''' + struct ucred cred; +diff --git a/wscript b/wscript +index bf6129b..722fdf6 100644 +--- a/wscript ++++ b/wscript +@@ -39,6 +39,14 @@ def options(opt): + help='disable new LMDB backend for LDB', + action='store_true', dest='without_ldb_lmdb', default=False) + ++ opt.add_option('--with-valgrind', ++ help=("enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) ++ ++ + + def configure(conf): + conf.RECURSE('lib/tdb') +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch new file mode 100644 index 000000000..dd1246538 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch @@ -0,0 +1,30 @@ +From 1f24231095a59debcf25d0e3309dc5d1056a7fad Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Thu, 19 Nov 2015 20:45:56 +0100 +Subject: [PATCH] avoid openldap unless wanted + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + wscript | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/wscript b/wscript +index 722fdf6..22700d5 100644 +--- a/wscript ++++ b/wscript +@@ -153,9 +153,7 @@ def configure(conf): + if conf.env.standalone_ldb: + conf.CHECK_XSLTPROC_MANPAGES() + +- # we need this for the ldap backend +- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): +- conf.env.ENABLE_LDAP_BACKEND = True ++ conf.env.ENABLE_LDAP_BACKEND = False + + # we don't want any libraries or modules to rely on runtime + # resolution of symbols +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch deleted file mode 100644 index b30afeee2..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 63570b98ef63c91d8508478fcbe6b89c90c8398f Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Thu, 19 Nov 2015 20:45:56 +0100 - ---- - wscript | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/wscript b/wscript -index e7c05d2..1633593 100644 ---- a/wscript -+++ b/wscript -@@ -161,9 +161,7 @@ def configure(conf): - if conf.env.standalone_ldb: - conf.CHECK_XSLTPROC_MANPAGES() - -- # we need this for the ldap backend -- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -- conf.env.ENABLE_LDAP_BACKEND = True -+ conf.env.ENABLE_LDAP_BACKEND = False - - # we don't want any libraries or modules to rely on runtime - # resolution of symbols diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch deleted file mode 100644 index 3f2921ed3..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch +++ /dev/null @@ -1,67 +0,0 @@ -From cc0576405803bcae45ee353c4333c449cead9207 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 25 Jun 2019 14:25:08 +0800 -Subject: [PATCH] do not import target module while cross compile - -Some modules such as dynamic library maybe cann't be imported -while cross compile, we just check whether does the module exist. - -Signed-off-by: Bian Naimeng - -update to version 4.10.5, and switch to python3 -Signed-off-by: Changqing Li ---- - buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py -index 60ce7da..5468a36 100644 ---- a/buildtools/wafsamba/samba_bundled.py -+++ b/buildtools/wafsamba/samba_bundled.py -@@ -4,6 +4,7 @@ import sys - from waflib import Build, Options, Logs - from waflib.Configure import conf - from wafsamba import samba_utils -+import importlib.util, os - - def PRIVATE_NAME(bld, name, private_extension, private_library): - '''possibly rename a library to include a bundled extension''' -@@ -249,17 +250,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): - # versions - minversion = minimum_library_version(conf, libname, minversion) - -- try: -- m = __import__(modulename) -- except ImportError: -- found = False -- else: -+ # Find module in PYTHONPATH -+ spec = importlib.util._find_spec_from_path(modulename, [os.environ["PYTHONPATH"]]) -+ if spec: - try: -- version = m.__version__ -- except AttributeError: -+ module = importlib.util.module_from_spec(spec) -+ spec.loader.load_module(module) -+ except ImportError: - found = False -+ -+ if conf.env.CROSS_COMPILE: -+ # Some modules such as dynamic library maybe cann't be imported -+ # while cross compile, we just check whether the module exist -+ Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (spec.name)) -+ found = True - else: -- found = tuplize_version(version) >= tuplize_version(minversion) -+ try: -+ version = module.__version__ -+ except AttributeError: -+ found = False -+ else: -+ found = tuplize_version(version) >= tuplize_version(minversion) - if not found and not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) - sys.exit(1) --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-unkown-type-error.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-unkown-type-error.patch deleted file mode 100644 index c0e7e8907..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-unkown-type-error.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d90534469c5c43bf2a97e5698a5ddb4b7471f92a Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 24 Jul 2018 10:53:16 +0800 -Subject: [PATCH] libldb: fix musl libc unkoown type error - -tevent.h:1440:8: error: unknown type name 'pid_t'; did you mean 'div_t'? - pid_t *pid, - ^~~~~ - div_t - -Signed-off-by: Changqing Li ---- - lib/tevent/tevent.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h -index aa6fe0d..2572696 100644 ---- a/lib/tevent/tevent.h -+++ b/lib/tevent/tevent.h -@@ -32,6 +32,8 @@ - #include - #include - #include -+#include -+#include - - struct tevent_context; - struct tevent_ops; --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.5.4.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.5.4.patch deleted file mode 100644 index bffd0653b..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.5.4.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 0841c3ed69c388251c1aeae63f2c3813555a54f6 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 1 Jul 2019 16:14:16 +0800 -Subject: [PATCH] ldb: Add configure options for packages - -Add configure options for the following packages: - - acl - - attr - - libaio - - libbsd - - libcap - - valgrind - -Upstream-Status: Inappropriate [oe deterministic build specific] - -Signed-off-by: Jackie Huang - -upgrade to version 1.5.4 -Signed-off-by: Changqing Li ---- - lib/replace/wscript | 92 +++++++++++++++++++++++++++++++++++++++++------------ - wscript | 8 +++++ - 2 files changed, 79 insertions(+), 21 deletions(-) - -diff --git a/lib/replace/wscript b/lib/replace/wscript -index a7fd25d..ad26041 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -24,6 +24,41 @@ def options(opt): - opt.BUILTIN_DEFAULT('NONE') - opt.PRIVATE_EXTENSION_DEFAULT('') - opt.RECURSE('buildtools/wafsamba') -+ -+ opt.add_option('--with-acl', -+ help=("Enable use of acl"), -+ action="store_true", dest='enable_acl') -+ opt.add_option('--without-acl', -+ help=("Disable use of acl"), -+ action="store_false", dest='enable_acl', default=False) -+ -+ opt.add_option('--with-attr', -+ help=("Enable use of attr"), -+ action="store_true", dest='enable_attr') -+ opt.add_option('--without-attr', -+ help=("Disable use of attr"), -+ action="store_false", dest='enable_attr', default=False) -+ -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ -+ opt.add_option('--with-libbsd', -+ help=("Enable use of libbsd"), -+ action="store_true", dest='enable_libbsd') -+ opt.add_option('--without-libbsd', -+ help=("Disable use of libbsd"), -+ action="store_false", dest='enable_libbsd', default=False) -+ -+ opt.add_option('--with-libcap', -+ help=("Enable use of libcap"), -+ action="store_true", dest='enable_libcap') -+ opt.add_option('--without-libcap', -+ help=("Disable use of libcap"), -+ action="store_false", dest='enable_libcap', default=False) - - @Utils.run_once - def configure(conf): -@@ -34,12 +69,25 @@ def configure(conf): - conf.DEFINE('HAVE_LIBREPLACE', 1) - conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) - -- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') -- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') -+ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') -+ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') - conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') -- conf.CHECK_HEADERS('shadow.h sys/acl.h') -- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') -+ conf.CHECK_HEADERS('shadow.h') -+ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') -+ -+ if Options.options.enable_acl: -+ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') -+ -+ if Options.options.enable_attr: -+ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') -+ -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ -+ if Options.options.enable_libcap: -+ conf.CHECK_HEADERS('sys/capability.h') -+ - conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') - conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,9 @@ def configure(conf): - conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') - conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - -- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') -+ if Options.options.enable_valgrind: -+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') - conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') - conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') - conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -380,20 +429,21 @@ def configure(conf): - - strlcpy_in_bsd = False - -- # libbsd on some platforms provides strlcpy and strlcat -- if not conf.CHECK_FUNCS('strlcpy strlcat'): -- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True): -- strlcpy_in_bsd = True -- if not conf.CHECK_FUNCS('getpeereid'): -- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') -- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): -- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- if not conf.CHECK_FUNCS('setproctitle_init'): -- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -+ if Options.options.enable_libbsd: -+ # libbsd on some platforms provides strlcpy and strlcat -+ if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True): -+ strlcpy_in_bsd = True -+ if not conf.CHECK_FUNCS('getpeereid'): -+ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') -+ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): -+ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -+ if not conf.CHECK_FUNCS('setproctitle_init'): -+ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') -+ -+ if not conf.CHECK_FUNCS('closefrom'): -+ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') - - conf.CHECK_CODE(''' - struct ucred cred; -diff --git a/wscript b/wscript -index d3402a7..d4e0ce1 100644 ---- a/wscript -+++ b/wscript -@@ -38,6 +38,14 @@ def options(opt): - help='disable new LMDB backend for LDB', - action='store_true', dest='without_ldb_lmdb', default=False) - -+ opt.add_option('--with-valgrind', -+ help=("enable use of valgrind"), -+ action="store_true", dest='enable_valgrind') -+ opt.add_option('--without-valgrind', -+ help=("disable use of valgrind"), -+ action="store_false", dest='enable_valgrind', default=False) -+ -+ - - def configure(conf): - conf.RECURSE('lib/tdb') --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb deleted file mode 100644 index 199db797a..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://ldb.samba.org" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" - -DEPENDS += "libtdb libtalloc libtevent popt" -RDEPENDS_pyldb += "python3" - -SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ - file://do-not-import-target-module-while-cross-compile.patch \ - file://libldb-fix-musl-libc-unkown-type-error.patch \ - file://libldb-fix-musl-libc-conflict-type-error.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://options-1.5.4.patch \ - " - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[ldap] = ",,openldap" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" -PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" - -LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ - file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ - file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" - -SRC_URI[md5sum] = "d9b4bea8b48cd4c4d0c492e65881164b" -SRC_URI[sha256sum] = "ddf7f770643e0a0dda60f2818913f883caeed37fa1e8d6eda0dfe9588c1e3a83" - -inherit waf-samba - -S = "${WORKDIR}/ldb-${PV}" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --disable-rpath-install \ - --bundled-libraries=cmocka \ - --builtin-libraries=replace \ - --with-modulesdir=${libdir}/ldb/modules \ - --with-privatelibdir=${libdir}/ldb \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" - -NOAUTOPACKAGEDEBUG = "1" - -FILES_${PN} += "${libdir}/ldb/*" -FILES_${PN}-dbg += "${bindir}/.debug/* \ - ${libdir}/.debug/* \ - ${libdir}/ldb/.debug/* \ - ${libdir}/ldb/modules/ldb/.debug/*" - -FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpyldb-util.*.so.* \ - " -FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ - ${libdir}/.debug/libpyldb-util.*.so.*" -FILES_pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb new file mode 100644 index 000000000..3731c260b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb @@ -0,0 +1,69 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://ldb.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" + +DEPENDS += "libtdb libtalloc libtevent popt" +RDEPENDS_pyldb += "python3" + +SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ + file://0001-do-not-import-target-module-while-cross-compile.patch \ + file://0002-ldb-Add-configure-options-for-packages.patch \ + file://libldb-fix-musl-libc-conflict-type-error.patch \ + " + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[ldap] = ",,openldap" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://0003-avoid-openldap-unless-wanted.patch', d)}" + +LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ + file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ + file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" + +SRC_URI[md5sum] = "fe4b1f17f77e2ea52b4e1320d927844c" +SRC_URI[sha256sum] = "a4d308b3d0922ef01f3661a69ebc373e772374defa76cf0979ad21b21f91922d" + +inherit waf-samba + +S = "${WORKDIR}/ldb-${PV}" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=cmocka \ + --builtin-libraries=replace \ + --with-modulesdir=${libdir}/ldb/modules \ + --with-privatelibdir=${libdir}/ldb \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" + +NOAUTOPACKAGEDEBUG = "1" + +FILES_${PN} += "${libdir}/ldb/*" +FILES_${PN}-dbg += "${bindir}/.debug/* \ + ${libdir}/.debug/* \ + ${libdir}/ldb/.debug/* \ + ${libdir}/ldb/modules/ldb/.debug/*" + +FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpyldb-util.*.so.* \ + " +FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ + ${libdir}/.debug/libpyldb-util.*.so.*" +FILES_pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch deleted file mode 100644 index e4aa8fda3..000000000 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b9040acdba1245f8cdf5e94384830e3d04fde98a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 22 Jul 2020 21:32:14 -0700 -Subject: [PATCH] Replace sigignore with signal API - -sigignore has been deprecated in glibc 2.32+ [1] and eventually it will be -removed, therefore substitute it - -[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=02802fafcf6e11ea3f998f685035ffe568dfddeb - -Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/702] - -Signed-off-by: Khem Raj ---- - configure.ac | 1 - - memcached.c | 16 ++-------------- - 2 files changed, 2 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ffc98b2..4567b30 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -630,7 +630,6 @@ AC_CHECK_FUNCS(mlockall) - AC_CHECK_FUNCS(getpagesizes) - AC_CHECK_FUNCS(sysconf) - AC_CHECK_FUNCS(memcntl) --AC_CHECK_FUNCS(sigignore) - AC_CHECK_FUNCS(clock_gettime) - AC_CHECK_FUNCS(preadv) - AC_CHECK_FUNCS(pread) -diff --git a/memcached.c b/memcached.c -index 9cb778d..91ced9e 100644 ---- a/memcached.c -+++ b/memcached.c -@@ -8292,18 +8292,6 @@ static void sig_usrhandler(const int sig) { - stop_main_loop = GRACE_STOP; - } - --#ifndef HAVE_SIGIGNORE --static int sigignore(int sig) { -- struct sigaction sa = { .sa_handler = SIG_IGN, .sa_flags = 0 }; -- -- if (sigemptyset(&sa.sa_mask) == -1 || sigaction(sig, &sa, 0) == -1) { -- return -1; -- } -- return 0; --} --#endif -- -- - /* - * On systems that supports multiple page sizes we may reduce the - * number of TLB-misses by using the biggest available page size -@@ -9996,7 +9984,7 @@ int main (int argc, char **argv) { - /* daemonize if requested */ - /* if we want to ensure our ability to dump core, don't chdir to / */ - if (do_daemonize) { -- if (sigignore(SIGHUP) == -1) { -+ if (signal(SIGHUP, SIG_IGN) == SIG_ERR) { - perror("Failed to ignore SIGHUP"); - } - if (daemonize(maxcore, settings.verbose) == -1) { -@@ -10146,7 +10134,7 @@ int main (int argc, char **argv) { - * ignore SIGPIPE signals; we can use errno == EPIPE if we - * need that information - */ -- if (sigignore(SIGPIPE) == -1) { -+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { - perror("failed to ignore SIGPIPE; sigaction"); - exit(EX_OSERR); - } --- -2.27.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch new file mode 100644 index 000000000..2979552a3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch @@ -0,0 +1,48 @@ +From d6294e9166e4875a0572349aabcc5e51acbd2e3c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 4 Jun 2021 11:33:12 -0700 +Subject: [PATCH] stats_prefix.c: Check for NDEBUG before using total_written + variable + +When using NDEBUG assert macro is ineffective which is caught by latest +clang and reports that total_written is set but unused. Therefore check +for NDEBUG to make sure assert is used only when its effective + +Fixes +error: variable 'total_written' set but not used [-Werror,-Wunused-but-set-variable] + size_t size = 0, written = 0, total_written = 0; + ^ +Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/792] +Signed-off-by: Khem Raj +--- + stats_prefix.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/stats_prefix.c b/stats_prefix.c +index 62f0d04..d72e514 100644 +--- a/stats_prefix.c ++++ b/stats_prefix.c +@@ -127,8 +127,10 @@ char *stats_prefix_dump(int *length) { + PREFIX_STATS *pfs; + char *buf; + int i, pos; +- size_t size = 0, written = 0, total_written = 0; +- ++ size_t size = 0, written = 0; ++#ifndef NDEBUG ++ size_t total_written = 0; ++#endif + /* + * Figure out how big the buffer needs to be. This is the sum of the + * lengths of the prefixes themselves, plus the size of one copy of +@@ -154,8 +156,10 @@ char *stats_prefix_dump(int *length) { + pfs->prefix, pfs->num_gets, pfs->num_hits, + pfs->num_sets, pfs->num_deletes); + pos += written; ++#ifndef NDEBUG + total_written += written; + assert(total_written < size); ++#endif + } + } + diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb deleted file mode 100644 index 2eb24db9a..000000000 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "A high-performance memory object caching system" -DESCRIPTION = "\ - memcached optimizes specific high-load serving applications that are designed \ - to take advantage of its versatile no-locking memory access system. Clients \ - are available in several different programming languages, to suit the needs \ - of the specific application. Traditionally this has been used in mod_perl \ - apps to avoid storing large chunks of data in Apache memory, and to share \ - this burden across several machines." -SECTION = "web" -HOMEPAGE = "http://memcached.org/" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" - -inherit autotools - -DEPENDS += "libevent" -RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ - perl-module-tie-hash bash \ - " - -SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ - file://memcached-add-hugetlbfs-check.patch \ - file://0001-Replace-sigignore-with-signal-API.patch \ - " -SRC_URI[sha256sum] = "908f0eecfa559129c9e44edc46f02e73afe8faca355b4efc5c86d902fc3e32f7" - -# set the same COMPATIBLE_HOST as libhugetlbfs -COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" - -python __anonymous () { - endianness = d.getVar('SITEINFO_ENDIANNESS') - if endianness == 'le': - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") - else: - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" - -inherit update-rc.d - -INITSCRIPT_NAME = "memcached" -INITSCRIPT_PARAMS = "defaults" - -do_install_append() { - install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached - mkdir -p ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts -} diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb new file mode 100644 index 000000000..73e18a403 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb @@ -0,0 +1,52 @@ +SUMMARY = "A high-performance memory object caching system" +DESCRIPTION = "\ + memcached optimizes specific high-load serving applications that are designed \ + to take advantage of its versatile no-locking memory access system. Clients \ + are available in several different programming languages, to suit the needs \ + of the specific application. Traditionally this has been used in mod_perl \ + apps to avoid storing large chunks of data in Apache memory, and to share \ + this burden across several machines." +SECTION = "web" +HOMEPAGE = "http://memcached.org/" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" + +inherit autotools + +DEPENDS += "libevent" +RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ + perl-module-tie-hash bash \ + " + +SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ + file://memcached-add-hugetlbfs-check.patch \ + file://0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch \ + " +SRC_URI[sha256sum] = "d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1" + +# set the same COMPATIBLE_HOST as libhugetlbfs +COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" + +python __anonymous () { + endianness = d.getVar('SITEINFO_ENDIANNESS') + if endianness == 'le': + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") + else: + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" + +inherit update-rc.d + +INITSCRIPT_NAME = "memcached" +INITSCRIPT_PARAMS = "defaults" + +do_install_append() { + install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached + mkdir -p ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts +} diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb index 959cccf35..08b855262 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb @@ -18,11 +18,7 @@ PACKAGECONFIG[manpages] = "" # examples are never installed, and don't need to be built in the # first place -EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON" - -do_install_append() { - rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd -} +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON -DENABLE_HPACK_TOOLS=OFF" PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate index 17b64d133..be3bacfcd 100755 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate @@ -52,3 +52,8 @@ if [ -x /usr/bin/lockfile-create ] ; then fi ) & + +# wait for all subprocesses to finish +# this is required when using systemd service as ntpd will start before ntpdate finishes +# and results in a bind error (port 123) +wait 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 7e168825e..e668113c5 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 @@ -26,6 +26,9 @@ 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" + inherit autotools update-rc.d useradd systemd pkgconfig # The ac_cv_header_readline_history is to stop ntpdc depending on either diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb deleted file mode 100644 index f82107dbe..000000000 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "https://openvpn.net/" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba" -DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -inherit autotools systemd update-rc.d - -SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ - file://openvpn \ - file://openvpn@.service \ - file://openvpn-volatile.conf" - -UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" - -SRC_URI[md5sum] = "7643f135b49aee49df7d83c1f434dc4e" -SRC_URI[sha256sum] = "b9d295988b34e39964ac475b619c3585d667b36c350cf1adec19e5e3c843ba11" - -SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" -SYSTEMD_AUTO_ENABLE = "disable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "openvpn" -INITSCRIPT_PARAMS_${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ." - -CFLAGS += "-fno-inline" - -# I want openvpn to be able to read password from file (hrw) -EXTRA_OECONF += "--enable-iproute2" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" - -# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. -EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d - - install -d ${D}/${sysconfdir}/openvpn - install -d ${D}/${sysconfdir}/openvpn/sample - install -m 755 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf - install -m 755 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf - install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys - install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-client.service - - install -d ${D}/${localstatedir} - install -d ${D}/${localstatedir}/lib - install -d -m 710 ${D}/${localstatedir}/lib/openvpn - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/tmpfiles.d/openvpn.conf - fi -} - -PACKAGES =+ " ${PN}-sample " - -RRECOMMENDS_${PN} = "kernel-module-tun" - -FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug" -FILES_${PN} += "${systemd_unitdir}/system/openvpn@.service \ - ${sysconfdir}/tmpfiles.d \ - " -FILES_${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ - ${systemd_unitdir}/system/openvpn@loopback-client.service \ - ${sysconfdir}/openvpn/sample/" diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb new file mode 100644 index 000000000..7f4cc189c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb @@ -0,0 +1,76 @@ +SUMMARY = "A full-featured SSL VPN solution via tun device." +HOMEPAGE = "https://openvpn.net/" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=377a495e6f12b2a3adcee797e59540b8" +DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +inherit autotools systemd update-rc.d + +SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ + file://openvpn \ + file://openvpn@.service \ + file://openvpn-volatile.conf" + +UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" + +SRC_URI[md5sum] = "08895fd1142f25fdd94a98315632e1bf" +SRC_URI[sha256sum] = "75f0044df449430555ca7b995a2b77ab24f2946fdc3668301b8edc23986a5f7e" + +# CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn. +CVE_CHECK_WHITELIST += "CVE-2020-7224 CVE-2020-27569" + +SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" +SYSTEMD_AUTO_ENABLE = "disable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "openvpn" +INITSCRIPT_PARAMS_${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ." + +CFLAGS += "-fno-inline" + +# I want openvpn to be able to read password from file (hrw) +EXTRA_OECONF += "--enable-iproute2" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" + +# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. +EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d + + install -d ${D}/${sysconfdir}/openvpn + install -d ${D}/${sysconfdir}/openvpn/sample + install -m 755 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf + install -m 755 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf + install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys + install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service + install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-client.service + + install -d ${D}/${localstatedir} + install -d ${D}/${localstatedir}/lib + install -d -m 710 ${D}/${localstatedir}/lib/openvpn + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf + sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/tmpfiles.d/openvpn.conf + fi +} + +PACKAGES =+ " ${PN}-sample " + +RRECOMMENDS_${PN} = "kernel-module-tun" + +FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug" +FILES_${PN} += "${systemd_unitdir}/system/openvpn@.service \ + ${sysconfdir}/tmpfiles.d \ + " +FILES_${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ + ${systemd_unitdir}/system/openvpn@loopback-client.service \ + ${sysconfdir}/openvpn/sample/" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb deleted file mode 100644 index c178b4cda..000000000 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb +++ /dev/null @@ -1,144 +0,0 @@ -DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ -Linux operating system." -SUMMARY = "strongSwan is an OpenSource IPsec implementation" -HOMEPAGE = "http://www.strongswan.org" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gmp openssl flex-native flex bison-native" - -SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ - file://fix-funtion-parameter.patch \ - file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ - " - -SRC_URI[md5sum] = "8918e6675e1be3784817641f07eadeb8" -SRC_URI[sha256sum] = "61c72f741edb2c1295a7b7ccce0317a104b3f9d39efd04c52cd05b01b55ab063" - -UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" - -EXTRA_OECONF = " \ - --without-lib-prefix \ - --with-dev-headers=${includedir}/strongswan \ -" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ -" -PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" -PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" -PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" -PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity" -PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2" -PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" -PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" -PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," -PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" -PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" -PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" -PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" - -# requires swanctl -PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," - -inherit autotools systemd pkgconfig - -RRECOMMENDS_${PN} = "kernel-module-ipsec" - -FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" -FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" -FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" -FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" - -CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" - -PACKAGES += "${PN}-plugins" -ALLOW_EMPTY_${PN}-plugins = "1" - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" -NOAUTOPACKAGEDEBUG = "1" - -python split_strongswan_plugins () { - sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') - libdir = d.expand('${libdir}/ipsec/plugins') - dbglibdir = os.path.join(libdir, '.debug') - - def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): - dvar = d.getVar('PKGD') - oldfiles = d.getVar('CONFFILES_' + pkg) - newfile = '/' + os.path.relpath(f, dvar) - - if not oldfiles: - d.setVar('CONFFILES_' + pkg, newfile) - 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_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') - - if split_packages: - pn = d.getVar('PN') - d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) -} - -PACKAGESPLITFUNCS_prepend = "split_strongswan_plugins " - -# Install some default plugins based on default strongSwan ./configure options -# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist -RDEPENDS_${PN} += "\ - ${PN}-plugin-aes \ - ${PN}-plugin-attr \ - ${PN}-plugin-cmac \ - ${PN}-plugin-constraints \ - ${PN}-plugin-des \ - ${PN}-plugin-dnskey \ - ${PN}-plugin-hmac \ - ${PN}-plugin-kernel-netlink \ - ${PN}-plugin-md5 \ - ${PN}-plugin-nonce \ - ${PN}-plugin-pem \ - ${PN}-plugin-pgp \ - ${PN}-plugin-pkcs1 \ - ${PN}-plugin-pkcs7 \ - ${PN}-plugin-pkcs8 \ - ${PN}-plugin-pkcs12 \ - ${PN}-plugin-pubkey \ - ${PN}-plugin-random \ - ${PN}-plugin-rc2 \ - ${PN}-plugin-resolve \ - ${PN}-plugin-revocation \ - ${PN}-plugin-sha1 \ - ${PN}-plugin-sha2 \ - ${PN}-plugin-socket-default \ - ${PN}-plugin-sshkey \ - ${PN}-plugin-updown \ - ${PN}-plugin-vici \ - ${PN}-plugin-x509 \ - ${PN}-plugin-xauth-generic \ - ${PN}-plugin-xcbc \ - ${PN}-plugin-curve25519 \ - " - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - -# The deprecated legacy 'strongswan-starter' service should only be used when charon and -# stroke are enabled. When swanctl is in use, 'strongswan.service' is needed. -# See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd -SYSTEMD_SERVICE_${PN} = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ -" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb new file mode 100644 index 000000000..8a704f6dc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb @@ -0,0 +1,143 @@ +DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ +Linux operating system." +SUMMARY = "strongSwan is an OpenSource IPsec implementation" +HOMEPAGE = "http://www.strongswan.org" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gmp openssl flex-native flex bison-native" + +SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ + file://fix-funtion-parameter.patch \ + file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ + " + +SRC_URI[sha256sum] = "9325ab56a0a4e97e379401e1d942ce3e0d8b6372291350ab2caae0755862c6f7" + +UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" + +EXTRA_OECONF = " \ + --without-lib-prefix \ + --with-dev-headers=${includedir}/strongswan \ +" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" + +PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ +" +PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" +PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" +PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" +PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity" +PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2" +PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" +PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" +PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" +PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" +PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" + +# requires swanctl +PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," + +inherit autotools systemd pkgconfig + +RRECOMMENDS_${PN} = "kernel-module-ipsec" + +FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" +FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" +FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" + +CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" + +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY_${PN}-plugins = "1" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" + +python split_strongswan_plugins () { + sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') + libdir = d.expand('${libdir}/ipsec/plugins') + dbglibdir = os.path.join(libdir, '.debug') + + def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): + dvar = d.getVar('PKGD') + oldfiles = d.getVar('CONFFILES_' + pkg) + newfile = '/' + os.path.relpath(f, dvar) + + if not oldfiles: + d.setVar('CONFFILES_' + pkg, newfile) + 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_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') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) + d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) + d.appendVar('RRECOMMENDS_' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) +} + +PACKAGESPLITFUNCS_prepend = "split_strongswan_plugins " + +# Install some default plugins based on default strongSwan ./configure options +# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist +RDEPENDS_${PN} += "\ + ${PN}-plugin-aes \ + ${PN}-plugin-attr \ + ${PN}-plugin-cmac \ + ${PN}-plugin-constraints \ + ${PN}-plugin-des \ + ${PN}-plugin-dnskey \ + ${PN}-plugin-hmac \ + ${PN}-plugin-kernel-netlink \ + ${PN}-plugin-md5 \ + ${PN}-plugin-nonce \ + ${PN}-plugin-pem \ + ${PN}-plugin-pgp \ + ${PN}-plugin-pkcs1 \ + ${PN}-plugin-pkcs7 \ + ${PN}-plugin-pkcs8 \ + ${PN}-plugin-pkcs12 \ + ${PN}-plugin-pubkey \ + ${PN}-plugin-random \ + ${PN}-plugin-rc2 \ + ${PN}-plugin-resolve \ + ${PN}-plugin-revocation \ + ${PN}-plugin-sha1 \ + ${PN}-plugin-sha2 \ + ${PN}-plugin-socket-default \ + ${PN}-plugin-sshkey \ + ${PN}-plugin-updown \ + ${PN}-plugin-vici \ + ${PN}-plugin-x509 \ + ${PN}-plugin-xauth-generic \ + ${PN}-plugin-xcbc \ + ${PN}-plugin-curve25519 \ + " + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" + +# The deprecated legacy 'strongswan-starter' service should only be used when charon and +# stroke are enabled. When swanctl is in use, 'strongswan.service' is needed. +# See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd +SYSTEMD_SERVICE_${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ +" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb deleted file mode 100644 index 3100e4c2c..000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb +++ /dev/null @@ -1,88 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" - -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" - -DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " - -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" - -SRC_URI += " \ - file://0001-wireshark-src-improve-reproducibility.patch \ - file://0002-flex-Remove-line-directives.patch \ - file://0003-bison-Remove-line-directives.patch \ - file://0004-lemon-Remove-line-directives.patch \ -" - -UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" - -SRC_URI[sha256sum] = "de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333" - -PE = "1" - -inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" - -PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" - -PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" -PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" -PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" -PACKAGECONFIG[libnl] = ",,libnl" -PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" -PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" -PACKAGECONFIG[ssl] = ",,openssl" -PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" -PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" -PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" -PACKAGECONFIG[geoip] = ",, geoip" -PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" -PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" -PACKAGECONFIG[libssh] = ",,libssh2" -PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" -PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" - -# these next two options require addional layers -PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ - -DBUILD_mmdbresolve=OFF \ - -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=OFF \ - -DBUILD_dcerpcidl2wrs=OFF \ - -DM_INCLUDE_DIR=${includedir} \ - -DM_LIBRARY=${libdir} \ - " -CFLAGS_append = " -lm" - -do_install_append_class-native() { - install -d ${D}${bindir} - for f in lemon - do - install -m 0755 ${B}/run/$f ${D}${bindir} - done -} - -do_install_append_class-target() { - for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` - do - chrpath --delete $f - done -} - -PACKAGE_BEFORE_PN += "tshark" - -FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" - -FILES_${PN} += "${datadir}*" - -RDEPENDS_tshark = "wireshark" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb new file mode 100644 index 000000000..3062633bc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb @@ -0,0 +1,88 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" + +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" + +DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " + +SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" + +SRC_URI += " \ + file://0001-wireshark-src-improve-reproducibility.patch \ + file://0002-flex-Remove-line-directives.patch \ + file://0003-bison-Remove-line-directives.patch \ + file://0004-lemon-Remove-line-directives.patch \ +" + +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[sha256sum] = "12a678208f8cb009e6b9d96026e41a6ef03c7ad086b9e1029f42053b249b4628" + +PE = "1" + +inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" + +PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" + +PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" +PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" +PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" +PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" +PACKAGECONFIG[ssl] = ",,openssl" +PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" +PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" +PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" +PACKAGECONFIG[geoip] = ",, geoip" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" +PACKAGECONFIG[libssh] = ",,libssh2" +PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" +PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" + +# these next two options require addional layers +PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ + -DBUILD_mmdbresolve=OFF \ + -DBUILD_randpktdump=OFF \ + -DBUILD_androiddump=OFF \ + -DBUILD_dcerpcidl2wrs=OFF \ + -DM_INCLUDE_DIR=${includedir} \ + -DM_LIBRARY=${libdir} \ + " +CFLAGS_append = " -lm" + +do_install_append_class-native() { + install -d ${D}${bindir} + for f in lemon + do + install -m 0755 ${B}/run/$f ${D}${bindir} + done +} + +do_install_append_class-target() { + for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` + do + chrpath --delete $f + done +} + +PACKAGE_BEFORE_PN += "tshark" + +FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" + +FILES_${PN} += "${datadir}*" + +RDEPENDS_tshark = "wireshark" + +BBCLASSEXTEND = "native" -- cgit v1.2.3