From 97771a30474a164ca08efd09209692a1fb8a4574 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Mar 2021 15:23:11 -0600 Subject: meta-openembedded: subtree update:7206f7f5bc..98175fd0cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adam Miartus (4): libcereal: update to newer version libcereal: pick up additional licenses of cereal components libcereal: add dev package that can be included into toolchain sdk cereal: Remove Alejandro Hernandez Samaniego (2): freerdp: Upgrade 2.2.0 -> 2.3.0 remmina: Upgrade 1.4.10 -> 1.4.11 Anatol Belski (2): abseil-cpp: Relax build requirements grpc: Upgrade 1.24.3 -> 1.35.0 Andrei Gherzan (1): nss: Fix warnings generated by getcwd Bartosz Golaszewski (1): pydbus-manager: new package Carlos Rafael Giani (2): pipewire: Move to meta-multimedia pipewire: Rework 0.3 recipe and upgrade to 0.3.22 Christian B. Sørensen (1): libgpiod: packageqa problem => static python lib to ${PN}-staticdev Clément Péron (2): grpc: Add PackageConfig to build only required plugins grpc: remove gflags dependency Diego Santa Cruz (1): php: split out phpdbg into a separate package Enrico Jörns (1): python3-aiohttp: add missing RDEPENDS on python3-typing-extensions Gianfranco (1): mosquitto: Upgrade 2.0.7 -> 2.0.8 Hongxu Jia (1): lvm2/libdevmapper: 2.03.06 -> 2.03.11 Kai Kang (2): xfsprogs: 5.9.0 -> 5.10.0 libinih: install header files without prefix dir inih Khem Raj (39): yelp-xsl: Mark native libxml2 in rdeps liburing: Do not build examples on risc/musl aom: Disable neon on arm when not present in TUNE_FEATURES python3-grpcio: Upgrade to 1.35.0 python3-grpcio-tools: Upgrade to 1.35.0 recipes: Update common-licenses references to match new names openldap: Refresh patches to remove fuzz abseil-cpp: Remove libexecinfo band-aid for musl nss: Add powerpc64 little endian support luajit: Upgrade to latest on v2.1 release influxdb: Generate checksums for term module libauthen-sasl-perl,libhtml-tree-perl: allow PERL_USE_UNSAFE_INC dvb-apps: Allow insecure inc paths glog: Upgrade to 0.4.0 mpd: Upgrade to 0.22 series mbedtls: Fix gcc11 stringop-overflow warning v4l-utils: Package systemd fragment for systemd-udevd.service.d mpich: Upgrade to 3.4.1 srt: Backport fix for missing header gerbera: Update to 1.7.0 nautilus: Drop use of volatile vlc: Fix build with gcc 11 squid: Include for using std::numeric_limits minifi-cpp: include limits header for numeric_limits definition opencv: Upgrade to 4.5.1 mozjs: Drop using JS_VOLATILE_ARM opengl-es-cts: Disable -Wuninitialized for external/amber grpc: Upgrade to 1.36.1 mongodb: Include c++ header libyui,libyui-ncurses: Upgrade to 4.0.0 libyui-ncurses: Disable Werror libyui: Adopt to new cmake option to disable Werror libyui-ncurses: Pass -DNCURSES_WIDECHAR in CXXFLAGS gimp: Add missing dependencies gimp: Disable svg icons on arm libcamera: Update to latest abseil-cpp: Ask for C++14 std explicitly opencv: Add packageconfig for building tests opencv: Remove duplicate patch Leon Anavi (30): python3-h5py: Upgrade 2.10.0 -> 3.1.0 python3-transitions: Upgrade 0.8.6 -> 0.8.7 python3-tabulate: Upgrade 0.8.7 -> 0.8.9 python3-pyperclip: Upgrade 1.8.1 -> 1.8.2 python3-elementpath: Upgrade 2.1.3 -> 2.1.4 python3-mpmath: Upgrade 1.1.0 -> 1.2.1 python3-prompt-toolkit: Upgrade 3.0.14 -> 3.0.16 python3-pkgconfig: Upgrade 1.5.1 -> 1.5.2 python3-mypy: Upgrade 0.800 -> 0.812 python3-typeguard: Upgrade 2.11.0 -> 2.11.1 python3-httplib2: Upgrade 0.18.1 -> 0.19.0 python3-autobahn: Upgrade 20.12.3 -> 21.2.1 python3-iso8601: Upgrade 0.1.13 -> 0.1.14 python3-alembic: Upgrade 1.5.4 -> 1.5.5 python3-txaio: Upgrade 20.12.1 -> 21.2.1 python3-watchdog: Upgrade 2.0.0 -> 2.0.2 python3-rsa: Upgrade 4.7 -> 4.7.1 python3-pandas: Upgrade 1.2.1 -> 1.2.2 python3-cffi: Upgrade 1.14.4 -> 1.14.5 python3-pymisp: Upgrade 2.4.137.3 -> 2.4.138 python3-pytest-runner: Upgrade 5.2 -> 5.3.0 python3-markdown: Upgrade 3.3.3 -> 3.3.4 python3-pulsectl: Upgrade 20.5.1 -> 21.2.0 python3-cvxopt: Upgrade 1.2.5 -> 1.2.6 python3-rsa: Upgrade 4.7.1 -> 4.7.2 python3-pyzmq: Upgrade 22.0.2 -> 22.0.3 python3-tqdm: Upgrade 4.57.0 -> 4.58.0 python3-autobahn: Upgrade 21.2.1 -> 21.2.2 python3-aiohttp: Upgrade 3.7.3 -> 3.7.4 python3-semantic-version: Add recipe Matteo Croce (1): recipes-kernel: add libbpf Michael Vetter (1): jasper: upgrade 2.0.24 -> 2.0.25 Mingli Yu (3): crash: add support for lockless ringbuffer gtkmm3: use relative path mcelog: Upgrade to 175 Oleksandr Kravchuk (21): rfkill: update to 1.0 python3-idna: update to 3.1 python3-pika: update to 1.2.0 python3-protobuf: update to 3.14.0 python3-pychromecast: update to 8.1.0 python3-pykickstart: update to 3.32 python3-watchdog: update to 2.0.0 wolfssl: updae to 4.7.0 ncmpc: update to 0.45 rocksdb: update to 6.15.5 stm32flash: update to 0.6 python3-astroid: update to 2.5 python3-configargparse: update to 1.3 python3-cryptography-vectors: update to 3.4.6 python3-periphery: update to 2.3.0 python3-sentry-sdk: update to 0.20.3 python3-soupsieve: update to 2.2 python3-supervisor: update to 4.2.1 python3-tqdm: update 4.57.0 python3-typeguard: update to 2.11.0 python3-xmlschema: update to 1.5.1 Oleksiy Obitotskyy (2): wireshark-src: improve reproducibility smartmontools: Improve reproducibility Patrick Williams (2): boost-url: update to latest catch2: upgrade to 2.13.4 Peter Kjellerstedt (1): librcereal: A couple of improvements Randy MacLeod (2): libssh2: remove the recipe since it moved to oe-core libgit2: remove the recipe since it moved to oe-core Ross Burton (1): python3-intelhex: add recipe for the intelhex package Sean Nyekjaer (3): nodejs: 12.20.1 -> 12.20.2 zstd: split bin into separate package can-utils: split into more packages Ulrich ?lmann (1): v4l-utils: update to 1.20.0 Wang Mingyu (7): stunnel: upgrade 5.57 -> 5.58 iwd: upgrade 1.11 -> 1.12 protobuf: upgrade 3.14.0 -> 3.15.2 redis-plus-plus: upgrade 1.2.1 -> 1.2.2 tesseract-lang: upgrade 4.0.0 -> 4.1.0 gphoto2: upgrade 2.5.26 -> 2.5.27 libgphoto2: upgrade 2.5.26 -> 2.5.27 Yanfei Xu (1): lmbench: Install cache command and fix typos in manual page Yi Fan Yu (4): rsyslog: upgrade 8.2006.0->8.2012.0 tcpdump: update 4.9.3 -> 4.99.0 rsyslog: Add imhttp to packageconfig rsyslog: Update 8.2012.0 -> 8.2102.0 Yi Zhao (1): vsftpd: allow newfstatat and pselect6 syscalls in the seccomp sandbox akuster (1): softhsm: update to 2.6.1 and align zangrc (11): fuse3: upgrade 3.10.1 -> 3.10.2 enca: upgrade 1.9 -> 1.19 gensio: upgrade 2.2.3 -> 2.2.4 lcms: upgrade 2.11 -> 2.12 libburn: upgrade 1.5.2 -> 1.5.4 opensaf: upgrade 5.20.11 -> 5.21.03 openvpn: upgrade 2.5.0 -> 2.5.1 strongswan: upgrade 5.9.1 -> 5.9.2 wireguard-tools: upgrade 1.0.20200827 -> 1.0.20210223 hwdata: upgrade 0.343 -> 0.345 mailcap: upgrade 2.1.49 -> 2.1.52 zhengruoqin (7): libjcat: upgrade 0.1.4 -> 0.1.6 postgresql: upgrade 13.1 -> 13.2 ser2net: upgrade 4.3.0 -> 4.3.3 Fix do_package error when enable multilib. nano: upgrade 5.5 -> 5.6 qpdf: upgrade 10.0.4 -> 10.2.0 sigrok-cli: upgrade 0.7.1 -> 0.7.2 Signed-off-by: Andrew Geissler Change-Id: Ibbbafaa846b1dcc3c03ac585e7d5075826e4ee37 --- .../recipes-daemons/opensaf/opensaf_5.20.11.bb | 78 -------------- .../recipes-daemons/opensaf/opensaf_5.21.03.bb | 78 ++++++++++++++ .../0001-Fix-build-on-Fedora-Rawhide-772.patch | 105 ++++++++++++++++++ .../recipes-daemons/squid/squid_4.13.bb | 117 --------------------- .../recipes-daemons/squid/squid_4.14.bb | 117 +++++++++++++++++++++ ...box.c-allow-newfstatat-and-pselect6-sysca.patch | 51 +++++++++ .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 1 + 7 files changed, 352 insertions(+), 195 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.13.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch (limited to 'meta-openembedded/meta-networking/recipes-daemons') diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb deleted file mode 100644 index ade2816f58..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" -DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ -middleware consistent with Service Availability Forum (SA Forum) \ -specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ -established by leading Communications and Enterprise Computing Companies to \ -facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ -code base in commercial products. \ -The OpenSAF project was launched in mid 2007 and has been under development by \ -an informal group of supporters of the OpenSAF initiative. The OpenSAF \ -Foundation was founded on January 22nd 2008 with Emerson Network Power, \ -Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." -HOMEPAGE = "http://www.opensaf.org" -SECTION = "admin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" - -DEPENDS = "libxml2 python3" -TOOLCHAIN = "gcc" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ - file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ - file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ - file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ - file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ - file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ - file://0001-immom_python-convert-to-python3.patch \ - file://0001-Fix-build-with-fno-common.patch \ - file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ - " -SRC_URI[md5sum] = "9c7871a2b45f262b7aee2e9d073798e4" -SRC_URI[sha256sum] = "11b62e6d20c449a297da0c0c15b560747c9ec884305beffed4ca4c192fa9f22c" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" - -inherit autotools useradd systemd pkgconfig - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-f -r opensaf" -USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" - -SYSTEMD_SERVICE_${PN} += "opensafd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -PACKAGECONFIG[systemd] = ",,systemd" -PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" -PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" - -CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" -CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" -LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" - -do_install_append() { - rm -fr "${D}${localstatedir}/lock" - rm -fr "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" - if [ ! -d "${D}${sysconfdir}/init.d" ]; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ - fi -} - -FILES_${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" -FILES_${PN}-dev += "${libdir}/libopensaf_core.so" -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" - -INSANE_SKIP_${PN} = "dev-so" - -RDEPENDS_${PN} += "bash python3-core" - -# http://errors.yoctoproject.org/Errors/Details/186970/ -COMPATIBLE_HOST_libc-musl = 'null' - -FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb new file mode 100644 index 0000000000..118c5fea30 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb @@ -0,0 +1,78 @@ +SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" +DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ +middleware consistent with Service Availability Forum (SA Forum) \ +specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ +established by leading Communications and Enterprise Computing Companies to \ +facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ +code base in commercial products. \ +The OpenSAF project was launched in mid 2007 and has been under development by \ +an informal group of supporters of the OpenSAF initiative. The OpenSAF \ +Foundation was founded on January 22nd 2008 with Emerson Network Power, \ +Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." +HOMEPAGE = "http://www.opensaf.org" +SECTION = "admin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" + +DEPENDS = "libxml2 python3" +TOOLCHAIN = "gcc" + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ + file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ + file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ + file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ + file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ + file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ + file://0001-immom_python-convert-to-python3.patch \ + file://0001-Fix-build-with-fno-common.patch \ + file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ + " +SRC_URI[md5sum] = "0433650ba9c25f2cf36145e11bf96a2a" +SRC_URI[sha256sum] = "ed40386852e34bbec0ca7e9534ce315b93a17b587614c8118aea1ecd082e1723" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" + +inherit autotools useradd systemd pkgconfig + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-f -r opensaf" +USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" + +SYSTEMD_SERVICE_${PN} += "opensafd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +PACKAGECONFIG[systemd] = ",,systemd" +PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" +PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" + +CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" +CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" +LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" + +do_install_append() { + rm -fr "${D}${localstatedir}/lock" + rm -fr "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" + if [ ! -d "${D}${sysconfdir}/init.d" ]; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ + fi +} + +FILES_${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" +FILES_${PN}-dev += "${libdir}/libopensaf_core.so" +FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" + +INSANE_SKIP_${PN} = "dev-so" + +RDEPENDS_${PN} += "bash python3-core" + +# http://errors.yoctoproject.org/Errors/Details/186970/ +COMPATIBLE_HOST_libc-musl = 'null' + +FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch new file mode 100644 index 0000000000..28a410c26f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch @@ -0,0 +1,105 @@ +From 1f8b5f0e1cc27634a7310be4c9674112f919d974 Mon Sep 17 00:00:00 2001 +From: uhliarik +Date: Thu, 18 Feb 2021 01:08:40 +0000 +Subject: [PATCH] Fix build on Fedora Rawhide (#772) + +* add SYSTEMD_LIBS to all binaries using client_side.cc, fixing linking +* add `` to all sources using std::numeric_limits, fixing gcc-11 + builds +--- +Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634a7310be4c9674112f919d974] + src/Makefile.am | 4 ++++ + src/ip/QosConfig.cc | 1 + + src/ipc/mem/PageStack.cc | 1 + + src/proxyp/Parser.cc | 1 + + src/security/ServerOptions.cc | 2 ++ + src/ssl/helper.cc | 2 ++ + 6 files changed, 11 insertions(+) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2320,6 +2320,7 @@ tests_test_http_range_LDADD = \ + $(SSLLIB) \ + $(KRB5LIBS) \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_test_http_range_LDFLAGS = $(LIBADD_DL) +@@ -2624,6 +2625,7 @@ tests_testHttpRequest_LDADD = \ + $(SSLLIB) \ + $(KRB5LIBS) \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_testHttpRequest_LDFLAGS = $(LIBADD_DL) +@@ -3487,6 +3489,7 @@ tests_testURL_LDADD = \ + $(SSLLIB) \ + $(KRB5LIBS) \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_testURL_LDFLAGS = $(LIBADD_DL) +@@ -3646,6 +3649,7 @@ nodist_tests_testYesNoNone_SOURCES = \ + tests_testYesNoNone_LDADD= \ + base/libbase.la \ + $(LIBCPPUNIT_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(COMPAT_LIB) \ + $(XTRA_LIBS) + tests_testYesNoNone_LDFLAGS = $(LIBADD_DL) +--- a/src/ip/QosConfig.cc ++++ b/src/ip/QosConfig.cc +@@ -21,6 +21,7 @@ + #include "Parsing.h" + + #include ++#include + + CBDATA_CLASS_INIT(acl_tos); + +--- a/src/ipc/mem/PageStack.cc ++++ b/src/ipc/mem/PageStack.cc +@@ -14,6 +14,7 @@ + #include "Debug.h" + #include "ipc/mem/Page.h" + #include "ipc/mem/PageStack.h" ++#include + + /// used to mark a stack slot available for storing free page offsets + const Ipc::Mem::PageStack::Value Writable = 0; +--- a/src/security/ServerOptions.cc ++++ b/src/security/ServerOptions.cc +@@ -24,6 +24,8 @@ + #endif + #endif + ++#include ++ + Security::ServerOptions & + Security::ServerOptions::operator =(const Security::ServerOptions &old) { + if (this != &old) { +--- a/src/ssl/helper.cc ++++ b/src/ssl/helper.cc +@@ -19,6 +19,8 @@ + #include "ssl/helper.h" + #include "wordlist.h" + ++#include ++ + Ssl::CertValidationHelper::LruCache *Ssl::CertValidationHelper::HelperCache = nullptr; + + #if USE_SSL_CRTD +--- a/src/acl/ConnMark.cc ++++ b/src/acl/ConnMark.cc +@@ -16,6 +16,8 @@ + #include "http/Stream.h" + #include "sbuf/Stream.h" + ++#include ++ + bool + Acl::ConnMark::empty() const + { diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.13.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.13.bb deleted file mode 100644 index 873d09344d..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.13.bb +++ /dev/null @@ -1,117 +0,0 @@ -SUMMARY = "A fully-featured http proxy and web-cache daemon for Linux" -DESCRIPTION = "A fully-featured http proxy and web-cache daemon for Linux. \ -Squid offers a rich access control, authorization and logging environment to \ -develop web proxy and content serving applications. \ -Squid offers a rich set of traffic optimization options, most of which are \ -enabled by default for simpler installation and high performance. \ -" -HOMEPAGE = "http://www.squid-cache.org" -SECTION = "web" -LICENSE = "GPLv2+" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" -MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 \ - file://Set-up-for-cross-compilation.patch \ - file://Skip-AC_RUN_IFELSE-tests.patch \ - file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \ - file://squid-use-serial-tests-config-needed-by-ptest.patch \ - file://run-ptest \ - file://volatiles.03_squid \ - file://set_sysroot_patch.patch \ - file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ - file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ - file://0001-tools.cc-fixed-unused-result-warning.patch \ - file://0001-splay.cc-fix-bind-is-not-a-member-of-std.patch \ - " - -SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" - -SRC_URI[md5sum] = "31e524a416715d6bfef30e072d2ca076" -SRC_URI[sha256sum] = "d09d3c31e3a7d158bda75501e763bd1cd3c3a99f5af6781ec1fd30eed2f771ed" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://errors/COPYRIGHT;md5=4c3268f394af77fbbf541875cef96a6c \ - " -DEPENDS = "libtool krb5 openldap db cyrus-sasl" - -inherit autotools pkgconfig useradd ptest perlnative - -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ - " -PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," -PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" -PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" - -BASIC_AUTH = "DB SASL LDAP" - -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" - -EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' \ - --sysconfdir=${sysconfdir}/${BPN} \ - --with-logdir=${localstatedir}/log/${BPN} \ - 'PERL=${USRBINPATH}/env perl'" - -export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" - -TESTDIR = "test-suite" - -do_configure_prepend() { - export SYSROOT=$PKG_CONFIG_SYSROOT_DIR -} - -do_compile_ptest() { - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} - cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} - - # do NOT need to rebuild Makefile itself - sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # Add squid-conf-tests for runtime tests - sed -e 's/^\(runtest-TESTS:\)/\1 squid-conf-tests/' \ - -e "s/\(list=' \$(TESTS)\)/\1 squid-conf-tests/" \ - -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # Ensure the path for command true is correct - sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - fi - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid - - rmdir "${D}${localstatedir}/run/${BPN}" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" - - rmdir "${D}${localstatedir}/log/${BPN}" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" -} - -FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" -FILES_${PN}-dbg += "/usr/src/debug" -FILES_${PN}-doc += "${datadir}/*.txt" - -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-ptest += "make" diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb new file mode 100644 index 0000000000..6d154c87e0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.14.bb @@ -0,0 +1,117 @@ +SUMMARY = "A fully-featured http proxy and web-cache daemon for Linux" +DESCRIPTION = "A fully-featured http proxy and web-cache daemon for Linux. \ +Squid offers a rich access control, authorization and logging environment to \ +develop web proxy and content serving applications. \ +Squid offers a rich set of traffic optimization options, most of which are \ +enabled by default for simpler installation and high performance. \ +" +HOMEPAGE = "http://www.squid-cache.org" +SECTION = "web" +LICENSE = "GPLv2+" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 \ + file://Set-up-for-cross-compilation.patch \ + file://Skip-AC_RUN_IFELSE-tests.patch \ + file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \ + file://squid-use-serial-tests-config-needed-by-ptest.patch \ + file://run-ptest \ + file://volatiles.03_squid \ + file://set_sysroot_patch.patch \ + file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ + file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ + file://0001-tools.cc-fixed-unused-result-warning.patch \ + file://0001-splay.cc-fix-bind-is-not-a-member-of-std.patch \ + file://0001-Fix-build-on-Fedora-Rawhide-772.patch \ + " + +SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" + +SRC_URI[sha256sum] = "4ad08884f065f8e1dac166aa13db6a872cde419a1717dff4c82c2c5337ee5756" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://errors/COPYRIGHT;md5=0e03cd976052c45697ad5d96e7dff8dc \ + " +DEPENDS = "libtool krb5 openldap db cyrus-sasl" + +inherit autotools pkgconfig useradd ptest perlnative + +LDFLAGS_append_mipsarch = " -latomic" +LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_riscv64 = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ + " +PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," +PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" +PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" + +BASIC_AUTH = "DB SASL LDAP" + +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" + +EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' \ + --sysconfdir=${sysconfdir}/${BPN} \ + --with-logdir=${localstatedir}/log/${BPN} \ + 'PERL=${USRBINPATH}/env perl'" + +export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" + +TESTDIR = "test-suite" + +do_configure_prepend() { + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR +} + +do_compile_ptest() { + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} + + # do NOT need to rebuild Makefile itself + sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # Add squid-conf-tests for runtime tests + sed -e 's/^\(runtest-TESTS:\)/\1 squid-conf-tests/' \ + -e "s/\(list=' \$(TESTS)\)/\1 squid-conf-tests/" \ + -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # Ensure the path for command true is correct + sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile +} + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid + + rmdir "${D}${localstatedir}/run/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" + + rmdir "${D}${localstatedir}/log/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" +} + +FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" +FILES_${PN}-dbg += "/usr/src/debug" +FILES_${PN}-doc += "${datadir}/*.txt" + +RDEPENDS_${PN} += "perl" +RDEPENDS_${PN}-ptest += "make" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch new file mode 100644 index 0000000000..29ce85cc19 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch @@ -0,0 +1,51 @@ +From 7bc261076ec94efa3197beaca39eba095d162b5e Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Fri, 26 Feb 2021 16:32:27 +0800 +Subject: [PATCH] seccompsandbox.c: allow newfstatat and pselect6 syscalls in + the seccomp sandbox + +Allow newfstatat and pselect6 in the seccomp sanbox for glibc 2.33. + +Fixes the following OOPS error: +root@qemux86-64:~# tnftp 192.168.1.1 +Connected to 192.168.1.1. +220 (vsFTPd 3.0.3) +Name (192.168.1.1:root): anonymous +331 Please specify the password. +Password: +230 Login successful. +Remote system type is UNIX. +Using binary mode to transfer files. +ftp> ls +OOPS: priv_sock_get_cmd + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao +--- + seccompsandbox.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/seccompsandbox.c b/seccompsandbox.c +index 377c50e..f601241 100644 +--- a/seccompsandbox.c ++++ b/seccompsandbox.c +@@ -267,6 +267,7 @@ seccomp_sandbox_setup_data_connections() + 3, IPPROTO_TCP); + allow_nr(__NR_bind); + allow_nr(__NR_select); ++ allow_nr(__NR_pselect6); + if (tunable_port_enable) + { + allow_nr(__NR_connect); +@@ -411,6 +412,7 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) + allow_nr(__NR_getdents); + allow_nr(__NR_getdents64); + allow_nr(__NR_sysinfo); ++ allow_nr(__NR_newfstatat); + /* Misc */ + allow_nr(__NR_umask); + +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index df0d7f4551..024b776def 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -22,6 +22,7 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ + file://0001-seccompsandbox.c-allow-newfstatat-and-pselect6-sysca.patch \ " UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/v/vsftpd/" -- cgit v1.2.3