From fa53c7bc991eddf277a39468b32c1fd47fa8119d Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 6 Aug 2020 20:54:14 +0200 Subject: [PATCH] Update buildroot v2020.02.4 (#811) * Update buildroot to 2020.02.4 Signed-off-by: Pascal Vizeli * fix patches Signed-off-by: Pascal Vizeli --- .../0010-Bump-wireguard-linux-compat.patch | 37 -- ...10-package-rauc-bump-version-to-1.4.patch} | 0 buildroot/CHANGES | 59 +++ buildroot/Config.in | 5 +- buildroot/DEVELOPERS | 2 +- buildroot/Makefile | 12 +- buildroot/arch/Config.in.x86 | 6 + .../raspberrypi/genimage-raspberrypi4-64.cfg | 4 +- .../raspberrypi/genimage-raspberrypi4.cfg | 4 +- ...x-GRUB-i386-pc-build-with-Ubuntu-gcc.patch | 313 ++++++++++++ buildroot/boot/grub2/grub2.mk | 8 + .../docs/manual/adding-packages-generic.txt | 2 +- buildroot/docs/manual/manual.html | 8 +- buildroot/docs/manual/manual.pdf | Bin 565247 -> 565242 bytes buildroot/docs/manual/manual.text | 8 +- buildroot/fs/cpio/cpio.mk | 6 +- buildroot/fs/ubi/Config.in | 5 + buildroot/fs/ubi/ubi.mk | 2 +- buildroot/linux/Config.in | 2 +- buildroot/linux/linux.hash | 10 +- buildroot/package/a10disp/a10disp.hash | 3 +- buildroot/package/a10disp/a10disp.mk | 1 + buildroot/package/asterisk/asterisk.hash | 2 +- buildroot/package/asterisk/asterisk.mk | 2 +- buildroot/package/bind/bind.hash | 4 +- buildroot/package/bind/bind.mk | 2 +- ...ar-outfile-declaration-to-fix-build-.patch | 30 ++ ...ckpolicy-remove-unused-te_assertions.patch | 45 ++ buildroot/package/clamav/clamav.hash | 2 +- buildroot/package/clamav/clamav.mk | 2 +- buildroot/package/dbus/dbus.hash | 6 +- buildroot/package/dbus/dbus.mk | 4 +- buildroot/package/docker-cli/docker-cli.hash | 2 +- buildroot/package/docker-cli/docker-cli.mk | 2 +- .../package/docker-engine/docker-engine.hash | 2 +- .../package/docker-engine/docker-engine.mk | 2 +- buildroot/package/dvb-apps/dvb-apps.hash | 6 + buildroot/package/e2fsprogs/e2fsprogs.mk | 4 +- buildroot/package/exim/exim.mk | 4 +- buildroot/package/exiv2/exiv2.mk | 6 +- buildroot/package/freerdp/freerdp.hash | 4 +- buildroot/package/freerdp/freerdp.mk | 2 +- ...Fix-gnulib-stdio.h-include-on-uclibc.patch | 49 ++ buildroot/package/gnutls/gnutls.hash | 8 +- buildroot/package/gnutls/gnutls.mk | 2 +- buildroot/package/go/go.hash | 2 +- buildroot/package/go/go.mk | 2 +- buildroot/package/gssdp/gssdp.hash | 4 +- buildroot/package/gssdp/gssdp.mk | 2 +- .../gstreamer1/gst1-plugins-good/Config.in | 1 + .../gst1-plugins-good/gst1-plugins-good.mk | 7 + .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 4 - buildroot/package/gupnp/gupnp.hash | 4 +- buildroot/package/gupnp/gupnp.mk | 2 +- .../intel-microcode/intel-microcode.hash | 4 +- .../intel-microcode/intel-microcode.mk | 2 +- buildroot/package/iproute2/iproute2.mk | 8 + ...e-LDFLAGS-and-remove-obsolete-X11R6-.patch | 36 ++ buildroot/package/iwd/Config.in | 6 +- buildroot/package/jq/Config.in | 4 + buildroot/package/jq/jq.hash | 4 +- buildroot/package/jq/jq.mk | 4 +- ...patibility-with-libmicrohttpd-0.9.71.patch | 469 ++++++++++++++++++ buildroot/package/libcamera/libcamera.mk | 2 +- buildroot/package/libconfuse/libconfuse.hash | 6 +- buildroot/package/libconfuse/libconfuse.mk | 2 +- ...ix-build-with-disabled-proxy-support.patch | 50 ++ ...ix-build-with-disabled-proxy-support.patch | 159 ++++++ buildroot/package/libcurl/libcurl.hash | 8 +- buildroot/package/libcurl/libcurl.mk | 5 +- .../0003-remove-cpp-requirement.patch | 2 +- buildroot/package/libglib2/libglib2.hash | 4 +- buildroot/package/libglib2/libglib2.mk | 2 +- ...bility-with-libmicrohttpd-0.9.71-199.patch | 254 ++++++++++ .../package/libhttpserver/libhttpserver.mk | 4 +- .../package/libmicrohttpd/libmicrohttpd.hash | 4 +- .../package/libmicrohttpd/libmicrohttpd.mk | 2 +- buildroot/package/libopenssl/Config.in | 2 +- ...1-CMakeLists.txt-fix-build-without-C.patch | 33 -- ...lient-server-.pc.cmakein-remove-zlib.patch | 45 -- ...-in-rfbProcessFileTransferReadBuffer.patch | 47 -- ...on-t-leak-stack-memory-to-the-remote.patch | 26 - ...on-t-build-tight.c-without-png-or-zl.patch | 54 -- ...rsor-limit-width-height-input-values.patch | 40 -- .../package/libvncserver/libvncserver.hash | 2 +- .../package/libvncserver/libvncserver.mk | 12 +- buildroot/package/libxml2/libxml2.mk | 5 + buildroot/package/libxmlrpc/libxmlrpc.mk | 7 + .../package/linux-headers/Config.in.host | 10 +- buildroot/package/lxc/lxc.mk | 5 +- buildroot/package/mbedtls/mbedtls.hash | 4 +- buildroot/package/mbedtls/mbedtls.mk | 5 +- buildroot/package/mesa3d/mesa3d.mk | 6 + ...dencies-base.py-add-pkg_config_stati.patch | 17 +- buildroot/package/mongodb/mongodb.hash | 2 +- buildroot/package/mongodb/mongodb.mk | 2 +- buildroot/package/mtools/Config.in | 2 + ...sible-IMAP-MITM-via-PREAUTH-response.patch | 60 +++ buildroot/package/mutt/mutt.hash | 2 +- buildroot/package/mutt/mutt.mk | 5 +- buildroot/package/nghttp2/nghttp2.hash | 4 +- buildroot/package/nghttp2/nghttp2.mk | 2 +- buildroot/package/ngircd/ngircd.hash | 4 +- buildroot/package/ngircd/ngircd.mk | 6 +- buildroot/package/nodejs/nodejs.hash | 6 +- buildroot/package/nodejs/nodejs.mk | 14 +- buildroot/package/ntp/ntp.hash | 6 +- buildroot/package/ntp/ntp.mk | 2 +- .../package/open-plc-utils/open-plc-utils.mk | 3 +- buildroot/package/open2300/open2300.mk | 8 +- buildroot/package/openjdk-bin/openjdk-bin.mk | 13 +- buildroot/package/openjdk/openjdk.mk | 2 +- buildroot/package/openssh/openssh.mk | 7 + .../{0008-gcc7.patch => 0009-gcc7.patch} | 0 .../0010-fix-build-without-zlib.patch | 52 ++ .../package/oracle-mysql/oracle-mysql.mk | 3 + ...ists.txt-fix-build-on-uclibc-or-musl.patch | 45 -- ...X-language-to-support-using-Generate.patch | 46 -- .../package/paho-mqtt-c/paho-mqtt-c.hash | 2 +- buildroot/package/paho-mqtt-c/paho-mqtt-c.mk | 2 +- .../pcre/0001-Kill-compatibility-bits.patch | 7 +- buildroot/package/pcre/pcre.hash | 4 +- buildroot/package/pcre/pcre.mk | 2 +- buildroot/package/php/php.hash | 2 +- buildroot/package/php/php.mk | 2 +- buildroot/package/pkg-download.mk | 2 +- buildroot/package/pkg-python.mk | 8 +- buildroot/package/poco/Config.in | 16 +- buildroot/package/prosody/Config.in | 2 +- buildroot/package/putty/putty.hash | 11 +- buildroot/package/putty/putty.mk | 2 +- ...ix-several-request-smuggling-attacks.patch | 271 ++++++++++ .../python-urllib3/python-urllib3.hash | 5 +- .../package/python-urllib3/python-urllib3.mk | 4 +- .../python-validators/python-validators.mk | 2 +- ...e-the-build-of-pyc-files-conditional.patch | 2 +- ...taddrinfo-configure-test-when-cross-.patch | 2 +- ...re-to-disable-the-build-of-certain-e.patch | 2 +- ...-disable-installation-of-test-module.patch | 2 +- .../0014-Add-an-option-to-disable-pydoc.patch | 2 +- ...015-Add-an-option-to-disable-lib2to3.patch | 2 +- ...option-to-disable-the-sqlite3-module.patch | 2 +- ...d-an-option-to-disable-the-tk-module.patch | 2 +- ...-option-to-disable-the-curses-module.patch | 2 +- .../0019-Add-an-option-to-disable-expat.patch | 2 +- ...-Add-an-option-to-disable-CJK-codecs.patch | 2 +- .../0021-Add-an-option-to-disable-NIS.patch | 2 +- ...Add-an-option-to-disable-unicodedata.patch | 2 +- .../0023-Add-an-option-to-disable-IDLE.patch | 2 +- ...024-Add-an-option-to-disable-decimal.patch | 6 +- ...on-to-disable-the-ossaudiodev-module.patch | 6 +- ...an-option-to-disable-openssl-support.patch | 2 +- ...ption-to-disable-the-readline-module.patch | 2 +- ...to-disable-zlib-bzip2-and-xz-modules.patch | 2 +- ...Add-an-option-to-disable-uuid-module.patch | 2 +- ...up-CC-print-multiarch-output-for-mus.patch | 2 +- buildroot/package/python3/python3.hash | 6 +- buildroot/package/python3/python3.mk | 2 +- .../package/qt5/qt5declarative/Config.in | 1 - .../qt5/qt5declarative/qt5declarative.mk | 2 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 11 + buildroot/package/readline/Config.in | 2 +- buildroot/package/redis/redis.hash | 2 +- buildroot/package/redis/redis.mk | 2 +- buildroot/package/rpi-firmware/Config.in | 7 +- buildroot/package/rpi-firmware/config.txt | 5 + .../package/rpi-firmware/rpi-firmware.mk | 15 +- ...-fallthrough-comments-for-kernel-5.3.patch | 28 ++ ...river-crashes-from-aircrack-ng-rtl88.patch | 168 +++++++ buildroot/package/samba4/samba4.hash | 4 +- buildroot/package/samba4/samba4.mk | 2 +- buildroot/package/sdl2/sdl2.mk | 22 + buildroot/package/sqlite/sqlite.hash | 8 +- buildroot/package/sqlite/sqlite.mk | 4 +- buildroot/package/squid/squid.hash | 8 +- buildroot/package/squid/squid.mk | 9 +- buildroot/package/sysdig/Config.in | 4 +- buildroot/package/syslog-ng/syslog-ng@default | 8 - ...-Fix-build-with-libmicrohttpd-0.9.71.patch | 71 +++ buildroot/package/systemd/systemd.mk | 20 +- buildroot/package/tcpreplay/tcpreplay.hash | 6 +- buildroot/package/tcpreplay/tcpreplay.mk | 2 +- ...kefile.in-to-allow-cross-compilation.patch | 170 ------- ...-sha2-sha2.c-fix-build-on-big-endian.patch | 119 +++++ ...2-Fix-compilation-of-tests-directory.patch | 31 -- buildroot/package/tinydtls/Config.in | 2 +- buildroot/package/tinydtls/tinydtls.hash | 4 +- buildroot/package/tinydtls/tinydtls.mk | 12 +- ...dapt-streamproxy-to-newer-microhttpd.patch | 106 ++++ buildroot/package/upx/upx.hash | 2 +- buildroot/package/upx/upx.mk | 12 +- buildroot/package/vlc/vlc.hash | 16 +- buildroot/package/vlc/vlc.mk | 9 +- buildroot/package/webkitgtk/webkitgtk.hash | 8 +- buildroot/package/webkitgtk/webkitgtk.mk | 2 +- .../wireguard-linux-compat.hash | 4 +- .../wireguard-linux-compat.mk | 2 +- buildroot/package/wireshark/wireshark.hash | 6 +- buildroot/package/wireshark/wireshark.mk | 2 +- .../wpebackend-fdo/wpebackend-fdo.hash | 8 +- .../package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- buildroot/package/wpewebkit/wpewebkit.hash | 8 +- buildroot/package/wpewebkit/wpewebkit.mk | 2 +- .../xfont_font-adobe-100dpi.mk | 7 +- .../xfont_font-adobe-75dpi.mk | 7 +- .../xfont_font-adobe-utopia-100dpi.mk | 7 +- .../xfont_font-adobe-utopia-75dpi.mk | 7 +- .../xfont_font-arabic-misc.mk | 7 +- .../xfont_font-bh-100dpi.mk | 7 +- .../xfont_font-bh-75dpi.mk | 7 +- .../xfont_font-bh-lucidatypewriter-100dpi.mk | 7 +- .../xfont_font-bh-lucidatypewriter-75dpi.mk | 7 +- .../xfont_font-bitstream-100dpi.mk | 7 +- .../xfont_font-bitstream-75dpi.mk | 7 +- .../xfont_font-cronyx-cyrillic.mk | 7 +- .../xfont_font-cursor-misc.mk | 7 +- .../xfont_font-daewoo-misc.mk | 7 +- .../xfont_font-dec-misc.mk | 7 +- .../xfont_font-isas-misc.mk | 7 +- .../xfont_font-jis-misc.mk | 7 +- .../xfont_font-micro-misc.mk | 7 +- .../xfont_font-misc-cyrillic.mk | 7 +- .../xfont_font-misc-misc.mk | 7 +- .../xfont_font-mutt-misc.mk | 7 +- .../xfont_font-schumacher-misc.mk | 7 +- .../xfont_font-screen-cyrillic.mk | 7 +- .../xfont_font-sony-misc.mk | 7 +- .../xfont_font-sun-misc.mk | 7 +- .../xfont_font-winitzki-cyrillic.mk | 7 +- ...ms-util.c-fix-build-without-st_mtime.patch | 40 ++ buildroot/package/zstd/zstd.hash | 8 +- buildroot/package/zstd/zstd.mk | 4 +- buildroot/support/download/git | 13 + buildroot/support/scripts/br2-external | 9 +- .../openjdk-hello-world.mk | 2 +- .../openjdk-jni-test/openjdk-jni-test.mk | 2 +- buildroot/toolchain/helpers.mk | 2 +- buildroot/toolchain/toolchain-wrapper.c | 10 + buildroot/toolchain/toolchain-wrapper.mk | 3 + 239 files changed, 3051 insertions(+), 938 deletions(-) delete mode 100644 buildroot-patches/0010-Bump-wireguard-linux-compat.patch rename buildroot-patches/{0011-package-rauc-bump-version-to-1.4.patch => 0010-package-rauc-bump-version-to-1.4.patch} (100%) create mode 100644 buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch create mode 100644 buildroot/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch create mode 100644 buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch create mode 100644 buildroot/package/dvb-apps/dvb-apps.hash create mode 100644 buildroot/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch create mode 100644 buildroot/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch create mode 100644 buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch create mode 100644 buildroot/package/libcurl/0001-bearssl-fix-build-with-disabled-proxy-support.patch create mode 100644 buildroot/package/libcurl/0002-nss-fix-build-with-disabled-proxy-support.patch create mode 100644 buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch delete mode 100644 buildroot/package/libvncserver/0001-CMakeLists.txt-fix-build-without-C.patch delete mode 100644 buildroot/package/libvncserver/0002-libvnc-client-server-.pc.cmakein-remove-zlib.patch delete mode 100644 buildroot/package/libvncserver/0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch delete mode 100644 buildroot/package/libvncserver/0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch delete mode 100644 buildroot/package/libvncserver/0005-CMakeLists.txt-don-t-build-tight.c-without-png-or-zl.patch delete mode 100644 buildroot/package/libvncserver/0006-libvncclient-cursor-limit-width-height-input-values.patch create mode 100644 buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch rename buildroot/package/oracle-mysql/{0008-gcc7.patch => 0009-gcc7.patch} (100%) create mode 100644 buildroot/package/oracle-mysql/0010-fix-build-without-zlib.patch delete mode 100644 buildroot/package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch delete mode 100644 buildroot/package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch create mode 100644 buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch create mode 100644 buildroot/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch create mode 100644 buildroot/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch delete mode 100644 buildroot/package/syslog-ng/syslog-ng@default create mode 100644 buildroot/package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch delete mode 100644 buildroot/package/tinydtls/0001-Update-Makefile.in-to-allow-cross-compilation.patch create mode 100644 buildroot/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch delete mode 100644 buildroot/package/tinydtls/0002-Fix-compilation-of-tests-directory.patch create mode 100644 buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch create mode 100644 buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch diff --git a/buildroot-patches/0010-Bump-wireguard-linux-compat.patch b/buildroot-patches/0010-Bump-wireguard-linux-compat.patch deleted file mode 100644 index b7d3bfd04..000000000 --- a/buildroot-patches/0010-Bump-wireguard-linux-compat.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e7becf35dd9d78fd7be773c765904cea1199ad14 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Sat, 6 Jun 2020 22:51:33 +0000 -Subject: [PATCH 1/1] Bump wireguard-linux-compat - -Signed-off-by: Pascal Vizeli ---- - package/wireguard-linux-compat/wireguard-linux-compat.hash | 2 +- - package/wireguard-linux-compat/wireguard-linux-compat.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash -index d308f47a13..6835f98d09 100644 ---- a/package/wireguard-linux-compat/wireguard-linux-compat.hash -+++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash -@@ -1,4 +1,4 @@ - # https://lists.zx2c4.com/pipermail/wireguard/2020-April/005296.html --sha256 cf166348fbb67419528e73049ce001d29131aea367fa6aef9d3e223f7251e116 wireguard-linux-compat-1.0.20200413.tar.xz -+sha256 16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3 wireguard-linux-compat-1.0.20200520.tar.xz - # Locally calculated - sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk -index 6d90245bd2..c6d79f59f9 100644 ---- a/package/wireguard-linux-compat/wireguard-linux-compat.mk -+++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200413 -+WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200520 - WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot - WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz - WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 --- -2.17.1 - diff --git a/buildroot-patches/0011-package-rauc-bump-version-to-1.4.patch b/buildroot-patches/0010-package-rauc-bump-version-to-1.4.patch similarity index 100% rename from buildroot-patches/0011-package-rauc-bump-version-to-1.4.patch rename to buildroot-patches/0010-package-rauc-bump-version-to-1.4.patch diff --git a/buildroot/CHANGES b/buildroot/CHANGES index cd7c130cd..86ecec8f7 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,62 @@ +2020.02.4, released July 26th, 2020 + + Important / security related fixes. + + Toolchain: + - Make external toolchain version check also work for + toolchains configured with --with-gcc-major-version-only + + - Do not handle SOURCE_DATE_EPOCH in toolchain wrapper if the + compiler supports it, fixing an issue with precompiled + headers + + - Ensure debug libs from external toolchains are not installed + into target if debugging is disabled + + Download: + - Correct reproducibility issue in handling of git submodules + for older git versions. + + - Fix file locking over NFS + + fs: Ensure cpio archive element order is reproducible + + Br2-external: Fix error reporting for invalid br2-external trees + + Per-package: + - Fix an issue with python3 sysconfig data not getting + correctly expanded + + - Fix per-package building for packages using the qmake + infrastructure + + Updated/fixed packages: a10disp, asterisk, bind, cdrkit, + checkpolicy, clamav, dbus, docker-cli, docker-engine, + dvb-apps, e2fsprogs, exim, exiv2, freerdp, gnutls, go, grub2, + gssdp, gst1-plugins-good, gst1-plugins-ugly, gupnp, + intel-microcode, iproute2, irrlicht, iwd, jq, kodi, libcamera, + libconfuse, libcurl, libglib2, libhttpserver, libmicrohttpd, + libopenssl, libvncserver, libxml2, libxmlrpc, lxc, mbedtls, + mesa3d, meson, mtools, mutt, nghttp2, ngircd, nodejs, ntp, + open-plc-utils, open2300, openjdk-bin, openssh, oracle-mysql, + paho-mqtt-c, pcre, php, poco, prosody, putty, python-twisted, + python-urllib3, python-validators, python3, qt5xmlpatterns, + redis, rpi-firmware, rtl8821au, samba4, sdl2, sqlite, squid, + syslog-ng, systemd, tcpreplay, tinydtls, upmpdcli, upx, vlc, + webkitgtk, wireguard-linux-compat, wireshark, wpebackend-fdo, + wpewebkit, zstd + + Issues resolved (http://bugs.uclibc.org): + + #12941: Python GObject fails to build when using BR2_PER_PACKAGE_.. + #12946: Grub: Decompressor is too big. + #12986: Mtools: Error converting to codepage 850 + #13001: openjdk-bin replaces libfreetype.so from host-freetype + #13011: Incorrect selection of gcc version + #13026: rpi-firmware: must not rename start files + #13031: nodejs: RangeError at new ArrayBuffer() + #13046: Optimize for fast -Ofast is not compliant + 2020.02.3, released June 3rd, 2020 Important / security related fixes. diff --git a/buildroot/Config.in b/buildroot/Config.in index 48fd36ff9..e2c1d2614 100644 --- a/buildroot/Config.in +++ b/buildroot/Config.in @@ -516,13 +516,14 @@ config BR2_OPTIMIZE_S This is the default. config BR2_OPTIMIZE_FAST - bool "optimize for fast" + bool "optimize for fast (may break packages!)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 help Optimize for fast. Disregard strict standards compliance. -Ofast enables all -O3 optimizations. It also enables optimizations that are not valid for all - standard-compliant programs. It turns on -ffast-math and the + standard-compliant programs, so be careful, as it may break + some packages. It turns on -ffast-math and the Fortran-specific -fstack-arrays, unless -fmax-stack-var-size is specified, and -fno-protect-parens. diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index efe4b0781..66ef194dd 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -1771,7 +1771,7 @@ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ -N: Mylène Josserand +N: Mylène Josserand F: package/rtl8723bu/ N: Nathaniel Roach diff --git a/buildroot/Makefile b/buildroot/Makefile index 2ed455165..b2dfce197 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2020.02.3 +export BR2_VERSION := 2020.02.4 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1591196000 +BR2_VERSION_EPOCH = 1595750000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -457,12 +457,12 @@ endif ifneq ($(HOST_DIR),$(BASE_DIR)/host) HOST_DIR_SYMLINK = $(BASE_DIR)/host -$(HOST_DIR_SYMLINK): $(BASE_DIR) +$(HOST_DIR_SYMLINK): | $(BASE_DIR) ln -snf $(HOST_DIR) $(HOST_DIR_SYMLINK) endif STAGING_DIR_SYMLINK = $(BASE_DIR)/staging -$(STAGING_DIR_SYMLINK): $(BASE_DIR) +$(STAGING_DIR_SYMLINK): | $(BASE_DIR) ln -snf $(STAGING_DIR) $(STAGING_DIR_SYMLINK) # Quotes are needed for spaces and all in the original PATH content. @@ -756,6 +756,7 @@ ifneq ($(BR2_PACKAGE_GDB),y) endif ifneq ($(BR2_PACKAGE_BASH),y) rm -rf $(TARGET_DIR)/usr/share/bash-completion + rm -rf $(TARGET_DIR)/etc/bash_completion.d endif ifneq ($(BR2_PACKAGE_ZSH),y) rm -rf $(TARGET_DIR)/usr/share/zsh @@ -765,6 +766,9 @@ endif rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true +ifneq ($(BR2_ENABLE_DEBUG):$(BR2_STRIP_strip),y:) + rm -rf $(TARGET_DIR)/lib/debug $(TARGET_DIR)/usr/lib/debug +endif $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true $(STRIP_FIND_SPECIAL_LIBS_CMD) | xargs -0 -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) 2>/dev/null || true diff --git a/buildroot/arch/Config.in.x86 b/buildroot/arch/Config.in.x86 index eb655adbc..7aae3cafb 100644 --- a/buildroot/arch/Config.in.x86 +++ b/buildroot/arch/Config.in.x86 @@ -1,6 +1,8 @@ # i386/x86_64 cpu features config BR2_X86_CPU_HAS_MMX bool +config BR2_X86_CPU_HAS_3DNOW + bool config BR2_X86_CPU_HAS_SSE bool config BR2_X86_CPU_HAS_SSE2 @@ -155,15 +157,18 @@ config BR2_x86_k6_2 bool "k6-2" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon bool "athlon" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon_4 bool "athlon-4" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_opteron bool "opteron" select BR2_X86_CPU_HAS_MMX @@ -209,6 +214,7 @@ config BR2_x86_c3 bool "Via/Cyrix C3 (Samuel/Ezra cores)" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_c32 bool "Via C3-2 (Nehemiah cores)" depends on !BR2_x86_64 diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg index 3c480e98f..854e0c7e3 100644 --- a/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg +++ b/buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-4-b.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", "rpi-firmware/overlays", "Image" } diff --git a/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg b/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg index 4e4742f3e..60e1f23bc 100644 --- a/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg +++ b/buildroot/board/raspberrypi/genimage-raspberrypi4.cfg @@ -4,8 +4,8 @@ image boot.vfat { "bcm2711-rpi-4-b.dtb", "rpi-firmware/cmdline.txt", "rpi-firmware/config.txt", - "rpi-firmware/fixup4.dat", - "rpi-firmware/start4.elf", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", "rpi-firmware/overlays", "zImage" } diff --git a/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch b/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch new file mode 100644 index 000000000..357c825f3 --- /dev/null +++ b/buildroot/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch @@ -0,0 +1,313 @@ +From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001 +From: Simon Hardy +Date: Tue, 24 Mar 2020 13:29:12 +0000 +Subject: build: Fix GRUB i386-pc build with Ubuntu gcc + +With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is +output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to +fail with: "error: Decompressor is too big." + +This seems to be caused by a section .note.gnu.property that is placed at an +offset such that objcopy needs to pad the img file with zeros. + +This issue is present on: +Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0 +Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008 + +This issue is not present on: +Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0 +RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4) + +The issue can be fixed by removing the section using objcopy as shown in +this patch. + +Signed-off-by: Simon Hardy +Reviewed-by: Daniel Kiper +[Retrieved (and updated to directly patch Makefile.in instead of +gentpl.py to avoid adding a dependency on python) from: +http://git.savannah.gnu.org/cgit/grub.git/commit/?id=6643507ce30f775008e093580f0c9499dfb2c485] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: + - keep the part patching gentpl.py + - restore it as a git-formatted patch + - introduce the hunk about the generated .am file +] +Signed-off-by: Yann E. MORIN +--- + gentpl.py | 2 1 1 0 +- + grub-core/Makefile.in | 38 19 19 0 +++++++++++++++++++------------------- + 2 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/gentpl.py b/gentpl.py +index 387588c05..c86550d4f 100644 +--- a/gentpl.py ++++ b/gentpl.py +@@ -766,7 +766,7 @@ def image(defn, platform): + if test x$(TARGET_APPLE_LINKER) = x1; then \ + $(MACHO2IMG) $< $@; \ + else \ +- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \ ++ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \ + fi + """) + +diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am +index 387588c05..c86550d4f 100644 +--- a/grub-core/Makefile.core.am ++++ 2/grub-core/Makefile.core.am +@@ -22897,7 +22897,7 @@ + CLEANFILES += boot.img + + boot.img: boot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -22918,7 +22918,7 @@ + CLEANFILES += boot.img + + boot.img: boot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -22939,7 +22939,7 @@ + CLEANFILES += boot.img + + boot.img: boot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -22960,7 +22960,7 @@ + CLEANFILES += boot_hybrid.img + + boot_hybrid.img: boot_hybrid.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -22981,7 +22981,7 @@ + CLEANFILES += cdboot.img + + cdboot.img: cdboot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23002,7 +23002,7 @@ + CLEANFILES += cdboot.img + + cdboot.img: cdboot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23023,7 +23023,7 @@ + CLEANFILES += pxeboot.img + + pxeboot.img: pxeboot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23044,7 +23044,7 @@ + CLEANFILES += diskboot.img + + diskboot.img: diskboot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23065,7 +23065,7 @@ + CLEANFILES += diskboot.img + + diskboot.img: diskboot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23086,7 +23086,7 @@ + CLEANFILES += lnxboot.img + + lnxboot.img: lnxboot.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23107,7 +23107,7 @@ + CLEANFILES += xz_decompress.img + + xz_decompress.img: xz_decompress.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23128,7 +23128,7 @@ + CLEANFILES += xz_decompress.img + + xz_decompress.img: xz_decompress.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23149,7 +23149,7 @@ + CLEANFILES += xz_decompress.img + + xz_decompress.img: xz_decompress.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23170,7 +23170,7 @@ + CLEANFILES += none_decompress.img + + none_decompress.img: none_decompress.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23191,7 +23191,7 @@ + CLEANFILES += none_decompress.img + + none_decompress.img: none_decompress.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23212,7 +23212,7 @@ + CLEANFILES += none_decompress.img + + none_decompress.img: none_decompress.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23233,7 +23233,7 @@ + CLEANFILES += lzma_decompress.img + + lzma_decompress.img: lzma_decompress.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23254,7 +23254,7 @@ + CLEANFILES += fwstart.img + + fwstart.img: fwstart.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +@@ -23275,7 +23275,7 @@ + CLEANFILES += fwstart_fuloong2f.img + + fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT) +- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + endif + +diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in +index 387588c05..c86550d4f 100644 +--- a/grub-core/Makefile.in ++++ b/grub-core/Makefile.in +@@ -46531,61 +46531,61 @@ + @COND_riscv64_efi_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(TARGET_STRIP) -S -x $(kernel_exec) -o $@.bin $<; $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd $@.bin $@; rm -f $@.bin; elif test ! -z '$(TARGET_OBJ2ELF)'; then $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@.bin $< && $(TARGET_OBJ2ELF) $@.bin $@ || (rm -f $@; rm -f $@.bin; exit 1); rm -f $@.bin; else $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@ $<; fi + + @COND_i386_pc_TRUE@boot.img: boot.image$(EXEEXT) +-@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_i386_qemu_TRUE@boot.img: boot.image$(EXEEXT) +-@COND_i386_qemu_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_qemu_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_sparc64_ieee1275_TRUE@boot.img: boot.image$(EXEEXT) +-@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_i386_pc_TRUE@boot_hybrid.img: boot_hybrid.image$(EXEEXT) +-@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_i386_pc_TRUE@cdboot.img: cdboot.image$(EXEEXT) +-@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_sparc64_ieee1275_TRUE@cdboot.img: cdboot.image$(EXEEXT) +-@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_i386_pc_TRUE@pxeboot.img: pxeboot.image$(EXEEXT) +-@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_i386_pc_TRUE@diskboot.img: diskboot.image$(EXEEXT) +-@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_sparc64_ieee1275_TRUE@diskboot.img: diskboot.image$(EXEEXT) +-@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_i386_pc_TRUE@lnxboot.img: lnxboot.image$(EXEEXT) +-@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_loongson_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) +-@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_arc_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) +-@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_qemu_mips_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) +-@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_loongson_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) +-@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_arc_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) +-@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_qemu_mips_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) +-@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_i386_pc_TRUE@lzma_decompress.img: lzma_decompress.image$(EXEEXT) +-@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_loongson_TRUE@fwstart.img: fwstart.image$(EXEEXT) +-@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_mips_loongson_TRUE@fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT) +-@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi ++@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi + + @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@grub-emu.1: grub-emu + @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@ chmod a+x grub-emu diff --git a/buildroot/boot/grub2/grub2.mk b/buildroot/boot/grub2/grub2.mk index a202525d7..f77dc0f9d 100644 --- a/buildroot/boot/grub2/grub2.mk +++ b/buildroot/boot/grub2/grub2.mk @@ -13,6 +13,14 @@ GRUB2_DEPENDENCIES = host-bison host-flex host-grub2 HOST_GRUB2_DEPENDENCIES = host-bison host-flex GRUB2_INSTALL_IMAGES = YES +# 0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch +define GRUB2_AVOID_AUTORECONF + $(Q)touch $(@D)/Makefile.util.am + $(Q)touch $(@D)/Makefile.in +endef +GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF +HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF + ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES else diff --git a/buildroot/docs/manual/adding-packages-generic.txt b/buildroot/docs/manual/adding-packages-generic.txt index ed1e6acf5..f2969e9a1 100644 --- a/buildroot/docs/manual/adding-packages-generic.txt +++ b/buildroot/docs/manual/adding-packages-generic.txt @@ -452,7 +452,7 @@ not and can not work as people would expect it should: of the manifest file for this package. * +LIBFOO_ACTUAL_SOURCE_TARBALL+ only applies to packages whose - +LIBFOO_SITE+ / +LIBTOO_SOURCE+ pair points to an archive that does + +LIBFOO_SITE+ / +LIBFOO_SOURCE+ pair points to an archive that does not actually contain source code, but binary code. This a very uncommon case, only known to apply to external toolchains which come already compiled, although theoretically it might apply to other diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 739135548..aca28363f 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Top-level parallel build
8.12. Integration with Eclipse
8.13. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
21.7. Using the run-tests framework
22. DEVELOPERS file and get-developers
23. Release Engineering
23.1. Releases
23.2. Development
IV. Appendix
24. Makedev syntax documentation
25. Makeusers syntax documentation
26. Migrating from older Buildroot versions
26.1. Migrating to 2016.11
26.2. Migrating to 2017.08

List of Examples

17.1. Config script: divine package
17.2. Config script: imagemagick package:

Buildroot 2020.02.3 manual generated on 2020-06-03 -14:56:37 UTC from git revision d42f3adaae

The Buildroot manual is written by the Buildroot developers. +The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Top-level parallel build
8.12. Integration with Eclipse
8.13. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
21.7. Using the run-tests framework
22. DEVELOPERS file and get-developers
23. Release Engineering
23.1. Releases
23.2. Development
IV. Appendix
24. Makedev syntax documentation
25. Makeusers syntax documentation
26. Migrating from older Buildroot versions
26.1. Migrating to 2016.11
26.2. Migrating to 2017.08

List of Examples

17.1. Config script: divine package
17.2. Config script: imagemagick package:

Buildroot 2020.02.4 manual generated on 2020-07-26 +08:11:28 UTC from git revision dee53013da

The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -COPYING +COPYING file in the Buildroot sources for the full text of this license.

Copyright © 2004-2020 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a @@ -3164,7 +3164,7 @@ If the package is dual licensed, then separate licenses with the of the manifest file for this package.

  • LIBFOO_ACTUAL_SOURCE_TARBALL only applies to packages whose - LIBFOO_SITE / LIBTOO_SOURCE pair points to an archive that does + LIBFOO_SITE / LIBFOO_SOURCE pair points to an archive that does not actually contain source code, but binary code. This a very uncommon case, only known to apply to external toolchains which come already compiled, although theoretically it might apply to other diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index eaa72ccc15370b8e4d967fe1e7a6d2fd426f9b03..d37de3d278bbb23dcbf23b49d7187ec06268896b 100644 GIT binary patch delta 13032 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 SS%?%!Y<$QxG*T+k$o~h69W2%W delta 13064 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 x+79 $@ + cd $(TARGET_DIR) && \ + find . \ + | LC_ALL=C sort \ + | cpio $(ROOTFS_CPIO_OPTS) --quiet -o -H newc \ + > $@ endef ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) diff --git a/buildroot/fs/ubi/Config.in b/buildroot/fs/ubi/Config.in index 85b1c56bb..3427ea051 100644 --- a/buildroot/fs/ubi/Config.in +++ b/buildroot/fs/ubi/Config.in @@ -38,6 +38,11 @@ config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG So the volume defined for the root filesystem can specify the image path as: image=BR2_ROOTFS_UBIFS_PATH + Buildroot also replaces the string "BINARIES_DIR" with the + value of $(BINARIES_DIR), so that it is possible to reference + other build artefacts (e.g. to include the kernel in a UBI + volume). + config BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE string "Configuration file path" depends on BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG diff --git a/buildroot/fs/ubi/ubi.mk b/buildroot/fs/ubi/ubi.mk index d848f8b23..54bb81ea0 100644 --- a/buildroot/fs/ubi/ubi.mk +++ b/buildroot/fs/ubi/ubi.mk @@ -23,7 +23,7 @@ endif # don't use sed -i as it misbehaves on systems with SELinux enabled when this is # executed through fakeroot (see #9386) define ROOTFS_UBI_CMD - sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \ + sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;;s;BINARIES_DIR;$(BINARIES_DIR);' \ $(UBI_UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg $(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg rm $(BUILD_DIR)/ubinize.cfg diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index 4d18038e9..c19ccb70a 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.4.43" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.4.45" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.118-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.115-cip24-rt9" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index 8c0a7a813..39a75711d 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,10 +1,10 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 2667b90a42d42557aca9e3d37bba1b4e71809b9523958e6870ada311c4790744 linux-5.4.43.tar.xz +sha256 103f039f34a9009c42ea643b4f473bda6bb9607d5ad7f63b56b3e2351615fe2e linux-5.4.45.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 49474956a6149c16cbcba862d1f4db54835a32d336063c75094f669f1c34c65e linux-4.4.225.tar.xz -sha256 e547748c548b0f55f665bc78cfec322e7b96f41527b5e4b5d79430fdaa57c3e8 linux-4.9.225.tar.xz -sha256 671d1f1d5ad0ae74fb21ee70a5544400e7d6270098d3f8b134484ded2c3e5b90 linux-4.14.182.tar.xz -sha256 9843f40efb37491770688810d153d0779daed8eb097773a0de5abf2cb0d1bd7e linux-4.19.125.tar.xz +sha256 418299385195f09b27e371a35f305f3aff148e7557a341b53460091303aa9bb7 linux-4.4.226.tar.xz +sha256 460a8c168fe5c60ce5b30015a4e4bf348d93a89f8b949de1f90779567ef345ca linux-4.9.226.tar.xz +sha256 4265afef56819b04656107a5abecde205c5bc5fb04b2e81447955e7e45db8085 linux-4.14.183.tar.xz +sha256 82af886bc588b5c8d7474beb2bac13810ee3ed07da356a2553c81ae8e52e586f linux-4.19.127.tar.xz # Locally computed sha256 ea53913813cb5a9069608532b327de7a7ed0fdc8fed8c6f10cd55d1ac6a58ffb linux-cip-4.19.118-cip25.tar.gz sha256 7f0a0db0e1cfb14053523f4432f1ad1468b5bd42305b44905c4b103466c8d655 linux-cip-4.19.115-cip24-rt9.tar.gz diff --git a/buildroot/package/a10disp/a10disp.hash b/buildroot/package/a10disp/a10disp.hash index f1bddec5d..acaafc353 100644 --- a/buildroot/package/a10disp/a10disp.hash +++ b/buildroot/package/a10disp/a10disp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5077405030e8f97a1edd4b86d469466abbc4d32b4a4609e58459347fcd1ba35b a10disp-0.6.1.tar.gz +sha256 5077405030e8f97a1edd4b86d469466abbc4d32b4a4609e58459347fcd1ba35b a10disp-0.6.1.tar.gz +sha256 ddf849966f57fee8f9675f5a3c7791353d1cba71695cd58016212fc236bbdbee a10disp.c diff --git a/buildroot/package/a10disp/a10disp.mk b/buildroot/package/a10disp/a10disp.mk index 4c2ee14e2..c91920232 100644 --- a/buildroot/package/a10disp/a10disp.mk +++ b/buildroot/package/a10disp/a10disp.mk @@ -7,6 +7,7 @@ A10DISP_VERSION = 0.6.1 A10DISP_SITE = $(call github,hglm,a10disp,v$(A10DISP_VERSION)) A10DISP_LICENSE = MIT +A10DISP_LICENSE_FILES = a10disp.c A10DISP_DEPENDENCIES = linux diff --git a/buildroot/package/asterisk/asterisk.hash b/buildroot/package/asterisk/asterisk.hash index 26aa4b89b..50457ba8f 100644 --- a/buildroot/package/asterisk/asterisk.hash +++ b/buildroot/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 474cbc6f9dddee94616f8af8e097bc4d340dc9698c4165dc45be6e0be80ff725 asterisk-16.6.2.tar.gz +sha256 f0ba5e3c4ef46f6657dd3a7167190f9b6cd6bbf4af09ecc291a9d5868b477609 asterisk-16.10.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/buildroot/package/asterisk/asterisk.mk b/buildroot/package/asterisk/asterisk.mk index cea287f0d..97e97c14c 100644 --- a/buildroot/package/asterisk/asterisk.mk +++ b/buildroot/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.6.2 +ASTERISK_VERSION = 16.10.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) diff --git a/buildroot/package/bind/bind.hash b/buildroot/package/bind/bind.hash index 4eb3aff3b..282b2aeba 100644 --- a/buildroot/package/bind/bind.hash +++ b/buildroot/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.19/bind-9.11.19.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.11.20/bind-9.11.20.tar.gz.asc # with key AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38 -sha256 0dee554a4caa368948b32da9a0c97b516c19103bc13ff5b3762c5d8552f52329 bind-9.11.19.tar.gz +sha256 306831a738a275693bbe1d6839a09b34a2c8b5c26f8a42ea57ef000a6a99c2b6 bind-9.11.20.tar.gz sha256 da2aec2b7f6f0feb16bcb080e2c587375fd3195145f047e4d92d112f5b9db501 COPYRIGHT diff --git a/buildroot/package/bind/bind.mk b/buildroot/package/bind/bind.mk index 362a26dce..80f8defca 100644 --- a/buildroot/package/bind/bind.mk +++ b/buildroot/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.19 +BIND_VERSION = 9.11.20 BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) diff --git a/buildroot/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch b/buildroot/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch new file mode 100644 index 000000000..30f4c8d01 --- /dev/null +++ b/buildroot/package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch @@ -0,0 +1,30 @@ +From eabcc8a6e39dc3c28faee3e04aa56cc65a38d65a Mon Sep 17 00:00:00 2001 +From: Urja Rannikko +Date: Sun, 19 Jul 2020 20:28:27 +0300 +Subject: [PATCH] Add extern to char* outfile declaration to fix build with gcc + 10 + +Without this linking fails with a rather long spew of +"multiple definition of `outfile'". + +Signed-off-by: Urja Rannikko +--- + genisoimage/genisoimage.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h +index bbedfb0..82c859b 100644 +--- a/genisoimage/genisoimage.h ++++ b/genisoimage/genisoimage.h +@@ -376,7 +376,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ +-- +2.27.0 + diff --git a/buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch b/buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch new file mode 100644 index 000000000..0c4ffcbf8 --- /dev/null +++ b/buildroot/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch @@ -0,0 +1,45 @@ +From 4d330d0d3155211f119b3082f728ae42dcc01e96 Mon Sep 17 00:00:00 2001 +From: Ondrej Mosnacek +Date: Thu, 23 Jan 2020 13:57:15 +0100 +Subject: [PATCH] checkpolicy: remove unused te_assertions + +This variable is declared in a header file, but never defined or used. +The te_assert structure definition is only used in this declaration, so +remove both. + +Upstream: https://github.com/SELinuxProject/selinux/commit/4d330d0d3155211f119b3082f728ae42dcc01e96#diff-daf264ea505347df0d59a3a97a07742e + +Signed-off-by: Ondrej Mosnacek +Signed-off-by: Matthew Weber +--- + checkpolicy.h | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/checkpolicy.h b/checkpolicy.h +index 3868f1fa..f127687e 100644 +--- a/checkpolicy.h ++++ b/checkpolicy.h +@@ -1,20 +1,6 @@ + #ifndef _CHECKPOLICY_H_ + #define _CHECKPOLICY_H_ + +-#include +- +-typedef struct te_assert { +- ebitmap_t stypes; +- ebitmap_t ttypes; +- ebitmap_t tclasses; +- int self; +- sepol_access_vector_t *avp; +- unsigned long line; +- struct te_assert *next; +-} te_assert_t; +- +-te_assert_t *te_assertions; +- + extern unsigned int policyvers; + + #endif +-- +2.17.1 + diff --git a/buildroot/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash index f98dc6b32..b15460cec 100644 --- a/buildroot/package/clamav/clamav.hash +++ b/buildroot/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ed3050c4569989ee7ab54c7b87246b41ed808259632849be0706467442dc0693 clamav-0.102.3.tar.gz +sha256 eebd426a68020ecad0d2084b8c763e6898ccfd5febcae833d719640bb3ff391b clamav-0.102.4.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/buildroot/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk index eec18fcc0..358228b86 100644 --- a/buildroot/package/clamav/clamav.mk +++ b/buildroot/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.102.3 +CLAMAV_VERSION = 0.102.4 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ diff --git a/buildroot/package/dbus/dbus.hash b/buildroot/package/dbus/dbus.hash index 9529d2e04..cfa06301f 100644 --- a/buildroot/package/dbus/dbus.hash +++ b/buildroot/package/dbus/dbus.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.18.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80 dbus-1.12.16.tar.gz +sha256 64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306 dbus-1.12.18.tar.gz # Locally calculated -sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING +sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/buildroot/package/dbus/dbus.mk b/buildroot/package/dbus/dbus.mk index a4043864d..5c2a5fb2c 100644 --- a/buildroot/package/dbus/dbus.mk +++ b/buildroot/package/dbus/dbus.mk @@ -4,14 +4,14 @@ # ################################################################################ -DBUS_VERSION = 1.12.16 +DBUS_VERSION = 1.12.18 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS - /usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - - + /usr/libexec/dbus-daemon-launch-helper f 4750 0 dbus - - - - - endef define DBUS_USERS diff --git a/buildroot/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash index ef98aed9a..8868a60e3 100644 --- a/buildroot/package/docker-cli/docker-cli.hash +++ b/buildroot/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 36dd85273c95f4755e08b37ea9660a1bf5c315570b679a0ce268750ca1ed3801 docker-cli-19.03.8.tar.gz +sha256 a5b1d6c5766f77896273e864a448a7f0ea4055bb52f50f884f14ad6ef0d5fdb4 docker-cli-19.03.11.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk index 37f2a0e1c..1466b0afb 100644 --- a/buildroot/package/docker-cli/docker-cli.mk +++ b/buildroot/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 19.03.8 +DOCKER_CLI_VERSION = 19.03.11 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_WORKSPACE = gopath diff --git a/buildroot/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash index c23eea90a..99159f937 100644 --- a/buildroot/package/docker-engine/docker-engine.hash +++ b/buildroot/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 13ec45ad45091111bd566aca9d81989b3f05e0625dab68d33c3ad81ff924172f docker-engine-19.03.8.tar.gz +sha256 5ff62d7b3638a275b2c459e53a4d1a7a8fb03dde8305defcd55e05e059e5618d docker-engine-19.03.11.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index 2e88ba8a5..fa30d9a22 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 19.03.8 +DOCKER_ENGINE_VERSION = 19.03.11 DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 diff --git a/buildroot/package/dvb-apps/dvb-apps.hash b/buildroot/package/dvb-apps/dvb-apps.hash new file mode 100644 index 000000000..d394ced13 --- /dev/null +++ b/buildroot/package/dvb-apps/dvb-apps.hash @@ -0,0 +1,6 @@ +# Locally computed: +sha256 926208b7e711b4bab1a909ff9bf4e6ae54acdd30a46f5d5bd700ecb088fe1f57 dvb-apps-3d43b280298c39a67d1d889e01e173f52c12da35.tar.gz + +# Hash for license files: +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 4fd46f32582c29007657e2daad8d0a6d954cf4e9d2e47bae8f8d8c32765fc987 COPYING.LGPL diff --git a/buildroot/package/e2fsprogs/e2fsprogs.mk b/buildroot/package/e2fsprogs/e2fsprogs.mk index 41986eec5..f6642d8de 100644 --- a/buildroot/package/e2fsprogs/e2fsprogs.mk +++ b/buildroot/package/e2fsprogs/e2fsprogs.mk @@ -29,7 +29,9 @@ HOST_E2FSPROGS_CONF_OPTS = \ --disable-testio-debug \ --enable-symlink-install \ --enable-elf-shlibs \ - --with-crond-dir=no + --with-crond-dir=no \ + --with-udev-rules-dir=no \ + --with-systemd-unit-dir=no # Set the binary directories to "/bin" and "/sbin", as busybox does, # so that we do not end up with two versions of e2fs tools. diff --git a/buildroot/package/exim/exim.mk b/buildroot/package/exim/exim.mk index dc445c6d9..90ec36416 100644 --- a/buildroot/package/exim/exim.mk +++ b/buildroot/package/exim/exim.mk @@ -123,8 +123,8 @@ endif define EXIM_BUILD_CMDS $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) makefile $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build-br macro_predef \ - CC=$(HOSTCC) \ - LNCC=$(HOSTCC) \ + CC="$(HOSTCC)" \ + LNCC="$(HOSTCC)" \ CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ diff --git a/buildroot/package/exiv2/exiv2.mk b/buildroot/package/exiv2/exiv2.mk index 5ca16c474..a2590ecdf 100644 --- a/buildroot/package/exiv2/exiv2.mk +++ b/buildroot/package/exiv2/exiv2.mk @@ -21,7 +21,7 @@ EXIV2_IGNORE_CVES += CVE-2019-17402 # 0002-fix_1011_jp2_readmetadata_loop.patch EXIV2_IGNORE_CVES += CVE-2019-20421 -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF +EXIV2_CONF_OPTS += -DEXIV2_BUILD_SAMPLES=OFF # The following CMake variable disables a TRY_RUN call in the -pthread # test which is not allowed when cross-compiling. @@ -41,10 +41,10 @@ EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=OFF endif ifeq ($(BR2_PACKAGE_EXIV2_XMP),y) -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON EXIV2_DEPENDENCIES += expat else -EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF endif EXIV2_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) diff --git a/buildroot/package/freerdp/freerdp.hash b/buildroot/package/freerdp/freerdp.hash index a6100271f..8217a2106 100644 --- a/buildroot/package/freerdp/freerdp.hash +++ b/buildroot/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.1.1.tar.gz.sha256 -sha256 6c6bf72fba1058ca6524c040d0825e4cdaa88682884a6c1c360e1cd5b8e21723 freerdp-2.1.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.2.0.tar.gz.sha256 +sha256 19b30759e324ce7a9767af880116a4c571761e9ad9c5d6c98c5b302ff8c24c6c freerdp-2.2.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/freerdp/freerdp.mk b/buildroot/package/freerdp/freerdp.mk index f3bc26ac5..4c804c136 100644 --- a/buildroot/package/freerdp/freerdp.mk +++ b/buildroot/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.1.1 +FREERDP_VERSION = 2.2.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 diff --git a/buildroot/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch b/buildroot/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch new file mode 100644 index 000000000..758e7cca7 --- /dev/null +++ b/buildroot/package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch @@ -0,0 +1,49 @@ +From 60fa934ffba3c230040328fdbbbf51f417f12871 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= +Date: Mon, 22 Jun 2020 14:11:05 +0200 +Subject: [PATCH] Fix gnulib stdio.h include on uclibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The __need_FILE define used by gnulib interferes with the uClibc stdio.h +header, so move the inclusion the stdio.h to after __need_FILE has been +undefined again. + +Signed-off-by: Stefan Sørensen +--- + gl/fopen.c | 2 +- + src/gl/fopen.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gl/fopen.c b/gl/fopen.c +index 8d6625a..248692c 100644 +--- a/gl/fopen.c ++++ b/gl/fopen.c +@@ -23,8 +23,8 @@ + #include + + /* Get the original definition of fopen. It might be defined as a macro. */ +-#include + #undef __need_FILE ++#include + + static FILE * + orig_fopen (const char *filename, const char *mode) +diff --git a/src/gl/fopen.c b/src/gl/fopen.c +index 47d7f19..1f22f4f 100644 +--- a/src/gl/fopen.c ++++ b/src/gl/fopen.c +@@ -23,8 +23,8 @@ + #include + + /* Get the original definition of fopen. It might be defined as a macro. */ +-#include + #undef __need_FILE ++#include + + static FILE * + orig_fopen (const char *filename, const char *mode) +-- +2.25.4 + diff --git a/buildroot/package/gnutls/gnutls.hash b/buildroot/package/gnutls/gnutls.hash index 99279bfb6..6a4203f3a 100644 --- a/buildroot/package/gnutls/gnutls.hash +++ b/buildroot/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.13.tar.xz.sig -sha256 32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38 gnutls-3.6.13.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.14.tar.xz.sig +sha256 5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63 gnutls-3.6.14.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/buildroot/package/gnutls/gnutls.mk b/buildroot/package/gnutls/gnutls.mk index a1dfce62a..34878e97b 100644 --- a/buildroot/package/gnutls/gnutls.mk +++ b/buildroot/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.6 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).13 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).14 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index dc966e85d..f58449d07 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34 go1.13.8.src.tar.gz +sha256 197333e97290e9ea8796f738d61019dcba1c377c2f3961fd6a114918ecc7ab06 go1.13.14.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index 376c3db7f..72604a250 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.13.8 +GO_VERSION = 1.13.14 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz diff --git a/buildroot/package/gssdp/gssdp.hash b/buildroot/package/gssdp/gssdp.hash index b389d0205..ad1483667 100644 --- a/buildroot/package/gssdp/gssdp.hash +++ b/buildroot/package/gssdp/gssdp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.3.sha256sum: -sha256 211387a62bc1d99821dd0333d873a781320287f5436f91e58b2ca145b378be41 gssdp-1.0.3.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.4.sha256sum: +sha256 ab29f6eaed476cd4bd1004034620cc25d45102c08656bdf2301a667c95bc0d46 gssdp-1.0.4.tar.xz # Hash for license file: sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gssdp/gssdp.mk b/buildroot/package/gssdp/gssdp.mk index 071ad0010..8b44320ba 100644 --- a/buildroot/package/gssdp/gssdp.mk +++ b/buildroot/package/gssdp/gssdp.mk @@ -5,7 +5,7 @@ ################################################################################ GSSDP_VERSION_MAJOR = 1.0 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).3 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).4 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/Config.in b/buildroot/package/gstreamer1/gst1-plugins-good/Config.in index c8bf58bb8..37aad31de 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-good/Config.in @@ -301,6 +301,7 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2 bool "v4l2" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # multi planar api + select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV help elements for Video 4 Linux diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6709f14cc..eed4bfe11 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -354,6 +354,13 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=enabled +# Enable use of gudev if available, for device probing and monitoring. +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +GST1_PLUGINS_GOOD_DEPENDENCIES += libgudev +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-gudev=enabled +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-gudev=disabled +endif else GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=disabled endif diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 284516f7d..9f8b1d335 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -64,10 +64,6 @@ GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) -# configure does not use pkg-config to detect libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -GST1_PLUGINS_UGLY_LDFLAGS += "-ldvdcss" -endif GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y diff --git a/buildroot/package/gupnp/gupnp.hash b/buildroot/package/gupnp/gupnp.hash index c530eb7ef..6997c8de5 100644 --- a/buildroot/package/gupnp/gupnp.hash +++ b/buildroot/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.4.sha256sum: -sha256 8b0992650c6ef8566d2d0c9198c8a669106dc2c73aa908fcc4a4d043a8c0b544 gupnp-1.0.4.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.5.sha256sum: +sha256 e9359fa8ed70c3c2b2b987869262ebb5c5ed1365726b7a9e8e59b3471e5c37f5 gupnp-1.0.5.tar.xz # Hash for license file: sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/buildroot/package/gupnp/gupnp.mk b/buildroot/package/gupnp/gupnp.mk index 29305f0b4..e47506ed8 100644 --- a/buildroot/package/gupnp/gupnp.mk +++ b/buildroot/package/gupnp/gupnp.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_VERSION_MAJOR = 1.0 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).4 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).5 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/intel-microcode/intel-microcode.hash b/buildroot/package/intel-microcode/intel-microcode.hash index f9fce28b2..e8005bcff 100644 --- a/buildroot/package/intel-microcode/intel-microcode.hash +++ b/buildroot/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0000f7cf96f2b07a1ba9d1fc0bcfcb49d0edb91f7d487a57a88c147e57c5873b intel-microcode-20191112.tar.gz -sha256 1f8bf63fc2b1b486c507b98ff7d283c7eb58c7945746b94188a310d6787cbee5 license +sha256 eb4f939421ac6cdea3c586c9d984ec518320f00c07eb2b3d6754309c83c93371 intel-microcode-20200616.tar.gz +sha256 d9e989e1a7747f3ce93cb749aceca67a430d36c9bebc6e3205e0b3af3ca6304b license diff --git a/buildroot/package/intel-microcode/intel-microcode.mk b/buildroot/package/intel-microcode/intel-microcode.mk index 0492ace69..d3c0ac44e 100644 --- a/buildroot/package/intel-microcode/intel-microcode.mk +++ b/buildroot/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20191112 +INTEL_MICROCODE_VERSION = 20200616 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license diff --git a/buildroot/package/iproute2/iproute2.mk b/buildroot/package/iproute2/iproute2.mk index a2e2d25d8..726849713 100644 --- a/buildroot/package/iproute2/iproute2.mk +++ b/buildroot/package/iproute2/iproute2.mk @@ -16,6 +16,14 @@ ifeq ($(BR2_PACKAGE_ELFUTILS),y) IPROUTE2_DEPENDENCIES += elfutils endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +IPROUTE2_DEPENDENCIES += libcap +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +IPROUTE2_DEPENDENCIES += libselinux +endif + ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx) IPROUTE2_DEPENDENCIES += iptables else diff --git a/buildroot/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch b/buildroot/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch new file mode 100644 index 000000000..51b98a4e8 --- /dev/null +++ b/buildroot/package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch @@ -0,0 +1,36 @@ +From 0ecb59c4dc575bb902c1955d8762f91ff79290a4 Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas +Date: Tue, 23 Jun 2020 19:36:27 +0200 +Subject: [PATCH] makefile: override LDFLAGS and remove obsolete X11R6 + lib/include directories + +Add "override" keyword to LDFLAGS variable in order to link libraries +using buildroot cross-compiler correctly and remove those non-supported +paths to lib/includes that are not used and not available in buildroot +and in addition point to the host system libraries in a result +cause the following warning: + +/home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: warning: library search path "/usr/X11R6/lib" is unsafe for cross-compilation + +Signed-off-by: Bartosz Bilas +--- + source/Irrlicht/Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 1a8277e..b323237 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -88,8 +88,7 @@ STATIC_LIB = libIrrlicht.a + LIB_PATH = ../../lib/$(SYSTEM) + INSTALL_DIR = /usr/local/lib + sharedlib install: SHARED_LIB = libIrrlicht.so +-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm +-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include ++sharedlib: override LDFLAGS += -lGL -lXxf86vm + + #OSX specific options + staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX +-- +2.27.0 + diff --git a/buildroot/package/iwd/Config.in b/buildroot/package/iwd/Config.in index c790f3dba..ed1ae8f56 100644 --- a/buildroot/package/iwd/Config.in +++ b/buildroot/package/iwd/Config.in @@ -1,14 +1,18 @@ config BR2_PACKAGE_IWD bool "iwd" + depends on BR2_USE_MMU # dbus + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell depends on !BR2_STATIC_LIBS # ell depends on BR2_USE_WCHAR # ell + select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_ELL help iNet Wireless daemon (iwd) https://iwd.wiki.kernel.org/ -comment "iwd needs a toolchain w/ dynamic library, wchar" +comment "iwd needs a toolchain w/ threads, dynamic library, wchar" + depends on BR2_USE_MMU # dbus depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/buildroot/package/jq/Config.in b/buildroot/package/jq/Config.in index 321cbe8b5..5edb5d098 100644 --- a/buildroot/package/jq/Config.in +++ b/buildroot/package/jq/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_JQ bool "jq" + depends on BR2_TOOLCHAIN_HAS_THREADS help jq is like sed for JSON data - you can use it to slice and filter and map and transform structured data with the same ease that sed, awk, grep and friends let you play with text. http://stedolan.github.io/jq/ + +comment "jq needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/jq/jq.hash b/buildroot/package/jq/jq.hash index 2cddda32c..125781385 100644 --- a/buildroot/package/jq/jq.hash +++ b/buildroot/package/jq/jq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3002cf80d871728562989b4a47d90a7301fe049a4e1d69836b99108f198dac06 jq-a97638713ad30653d424f136018098c4b0e5c71b.tar.gz -sha256 111136aebcbfa68b6b0084e582b30e981da76adcff84eab6f9be32a1f38c5bf1 COPYING +sha256 20249104d4df2247253df6df4a980b8be1f5232f03fef7cd41bacb7e6eab04fd jq-a17dd3248a666d01be75f6b16be37e80e20b0954.tar.gz +sha256 c8437d414ca5b394718784c3bf5bdff7f01fee417625fabf1fb722ca263037da COPYING diff --git a/buildroot/package/jq/jq.mk b/buildroot/package/jq/jq.mk index 3d2230653..f3a0493b8 100644 --- a/buildroot/package/jq/jq.mk +++ b/buildroot/package/jq/jq.mk @@ -4,9 +4,9 @@ # ################################################################################ -JQ_VERSION = a97638713ad30653d424f136018098c4b0e5c71b +JQ_VERSION = a17dd3248a666d01be75f6b16be37e80e20b0954 JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION)) -JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation) +JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING JQ_INSTALL_STAGING = YES diff --git a/buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch b/buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch new file mode 100644 index 000000000..04f57b41f --- /dev/null +++ b/buildroot/package/kodi/0003-webserver-Compatibility-with-libmicrohttpd-0.9.71.patch @@ -0,0 +1,469 @@ +From 206f55e78f3a5ad39fad17526d01558677f9477a Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Sat, 4 Jul 2020 11:01:37 +0200 +Subject: [PATCH] [webserver] Compatibility with libmicrohttpd 0.9.71 + +From the libmicrohttpd 0.9.71 release notes: + +The release introduces an 'enum MHD_Result' instead of +for certain API misuse bugs by providing better types (not everything is +an 'int'). While this does NOT change the binary API, this change +_will_ cause compiler warnings for all legacy code -- until 'int' is +replaced with 'enum MHD_Result'. + +Signed-off-by: Bernd Kuhls +[downloaded from upstream PR 18134] +--- + xbmc/network/WebServer.cpp | 42 +++++++++---------- + xbmc/network/WebServer.h | 30 ++++++------- + .../httprequesthandler/HTTPFileHandler.cpp | 2 +- + .../httprequesthandler/HTTPFileHandler.h | 2 +- + .../HTTPImageTransformationHandler.cpp | 2 +- + .../HTTPImageTransformationHandler.h | 2 +- + .../httprequesthandler/HTTPJsonRpcHandler.cpp | 2 +- + .../httprequesthandler/HTTPJsonRpcHandler.h | 2 +- + .../httprequesthandler/HTTPPythonHandler.cpp | 2 +- + .../httprequesthandler/HTTPPythonHandler.h | 2 +- + .../HTTPRequestHandlerUtils.cpp | 4 +- + .../HTTPRequestHandlerUtils.h | 4 +- + .../HTTPWebinterfaceAddonsHandler.cpp | 2 +- + .../HTTPWebinterfaceAddonsHandler.h | 2 +- + .../httprequesthandler/IHTTPRequestHandler.h | 10 ++++- + 15 files changed, 59 insertions(+), 51 deletions(-) + +diff --git a/xbmc/network/WebServer.cpp b/xbmc/network/WebServer.cpp +index 783404227785..be507131092b 100644 +--- a/xbmc/network/WebServer.cpp ++++ b/xbmc/network/WebServer.cpp +@@ -86,7 +86,7 @@ static MHD_Response* create_response(size_t size, const void* data, int free, in + return MHD_create_response_from_buffer(size, const_cast(data), mode); + } + +-int CWebServer::AskForAuthentication(const HTTPRequest& request) const ++MHD_RESULT CWebServer::AskForAuthentication(const HTTPRequest& request) const + { + struct MHD_Response *response = create_response(0, nullptr, MHD_NO, MHD_NO); + if (!response) +@@ -95,7 +95,7 @@ int CWebServer::AskForAuthentication(const HTTPRequest& request) const + return MHD_NO; + } + +- int ret = AddHeader(response, MHD_HTTP_HEADER_CONNECTION, "close"); ++ MHD_RESULT ret = AddHeader(response, MHD_HTTP_HEADER_CONNECTION, "close"); + if (!ret) + { + CLog::Log(LOGERROR, "CWebServer[%hu]: unable to prepare HTTP Unauthorized response", m_port); +@@ -105,7 +105,7 @@ int CWebServer::AskForAuthentication(const HTTPRequest& request) const + + LogResponse(request, MHD_HTTP_UNAUTHORIZED); + +- ret = MHD_queue_basic_auth_fail_response(request.connection, "XBMC", response); ++ ret = (MHD_RESULT) MHD_queue_basic_auth_fail_response(request.connection, "XBMC", response); + MHD_destroy_response(response); + + return ret; +@@ -135,7 +135,7 @@ bool CWebServer::IsAuthenticated(const HTTPRequest& request) const + return authenticated; + } + +-int CWebServer::AnswerToConnection(void *cls, struct MHD_Connection *connection, ++MHD_RESULT CWebServer::AnswerToConnection(void *cls, struct MHD_Connection *connection, + const char *url, const char *method, + const char *version, const char *upload_data, + size_t *upload_data_size, void **con_cls) +@@ -163,7 +163,7 @@ int CWebServer::AnswerToConnection(void *cls, struct MHD_Connection *connection, + return webServer->HandlePartialRequest(connection, connectionHandler, request, upload_data, upload_data_size, con_cls); + } + +-int CWebServer::HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, const char *upload_data, size_t *upload_data_size, void **con_cls) ++MHD_RESULT CWebServer::HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, const char *upload_data, size_t *upload_data_size, void **con_cls) + { + std::unique_ptr conHandler(connectionHandler); + +@@ -276,7 +276,7 @@ int CWebServer::HandlePartialRequest(struct MHD_Connection *connection, Connecti + return SendErrorResponse(request, MHD_HTTP_NOT_FOUND, request.method); + } + +-int CWebServer::HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, ++MHD_RESULT CWebServer::HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, + const char *filename, const char *content_type, + const char *transfer_encoding, const char *data, uint64_t off, + size_t size) +@@ -294,13 +294,13 @@ int CWebServer::HandlePostField(void *cls, enum MHD_ValueKind kind, const char * + return MHD_YES; + } + +-int CWebServer::HandleRequest(const std::shared_ptr& handler) ++MHD_RESULT CWebServer::HandleRequest(const std::shared_ptr& handler) + { + if (handler == nullptr) + return MHD_NO; + + HTTPRequest request = handler->GetRequest(); +- int ret = handler->HandleRequest(); ++ MHD_RESULT ret = handler->HandleRequest(); + if (ret == MHD_NO) + { + CLog::Log(LOGERROR, "CWebServer[%hu]: failed to handle HTTP request for %s", m_port, request.pathUrl.c_str()); +@@ -348,7 +348,7 @@ int CWebServer::HandleRequest(const std::shared_ptr& handle + return FinalizeRequest(handler, responseDetails.status, response); + } + +-int CWebServer::FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response) ++MHD_RESULT CWebServer::FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response) + { + if (handler == nullptr || response == nullptr) + return MHD_NO; +@@ -562,7 +562,7 @@ void CWebServer::FinalizePostDataProcessing(ConnectionHandler *connectionHandler + MHD_destroy_post_processor(connectionHandler->postprocessor); + } + +-int CWebServer::CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const ++MHD_RESULT CWebServer::CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const + { + if (handler == nullptr) + return MHD_NO; +@@ -620,7 +620,7 @@ int CWebServer::CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const ++MHD_RESULT CWebServer::CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const + { + if (handler == nullptr) + return MHD_NO; +@@ -700,7 +700,7 @@ int CWebServer::CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const ++MHD_RESULT CWebServer::CreateFileDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const + { + if (handler == nullptr) + return MHD_NO; +@@ -850,7 +850,7 @@ int CWebServer::CreateFileDownloadResponse(const std::shared_ptr(data), free ? MHD_YES : MHD_NO, copy ? MHD_YES : MHD_NO); + if (response == nullptr) +@@ -893,20 +893,20 @@ int CWebServer::CreateMemoryDownloadResponse(struct MHD_Connection *connection, + return MHD_YES; + } + +-int CWebServer::SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const ++MHD_RESULT CWebServer::SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const + { + LogResponse(request, responseStatus); + +- int ret = MHD_queue_response(request.connection, responseStatus, response); ++ MHD_RESULT ret = MHD_queue_response(request.connection, responseStatus, response); + MHD_destroy_response(response); + + return ret; + } + +-int CWebServer::SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const ++MHD_RESULT CWebServer::SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const + { + struct MHD_Response *response = nullptr; +- int ret = CreateErrorResponse(request.connection, errorType, method, response); ++ MHD_RESULT ret = CreateErrorResponse(request.connection, errorType, method, response); + if (ret == MHD_NO) + return MHD_NO; + +@@ -1296,10 +1296,10 @@ std::string CWebServer::CreateMimeTypeFromExtension(const char *ext) + return CMime::GetMimeType(ext); + } + +-int CWebServer::AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const ++MHD_RESULT CWebServer::AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const + { + if (response == nullptr || name.empty()) +- return 0; ++ return MHD_NO; + + CLog::Log(LOGDEBUG, LOGWEBSERVER, "CWebServer[%hu] [OUT] %s: %s", m_port, name.c_str(), value.c_str()); + +diff --git a/xbmc/network/WebServer.h b/xbmc/network/WebServer.h +index c7a909304a21..1274a2e0ed40 100644 +--- a/xbmc/network/WebServer.h ++++ b/xbmc/network/WebServer.h +@@ -56,17 +56,17 @@ class CWebServer + + virtual void LogRequest(const char* uri) const; + +- virtual int HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, ++ virtual MHD_RESULT HandlePartialRequest(struct MHD_Connection *connection, ConnectionHandler* connectionHandler, const HTTPRequest& request, + const char *upload_data, size_t *upload_data_size, void **con_cls); +- virtual int HandleRequest(const std::shared_ptr& handler); +- virtual int FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response); ++ virtual MHD_RESULT HandleRequest(const std::shared_ptr& handler); ++ virtual MHD_RESULT FinalizeRequest(const std::shared_ptr& handler, int responseStatus, struct MHD_Response *response); + + private: + struct MHD_Daemon* StartMHD(unsigned int flags, int port); + + std::shared_ptr FindRequestHandler(const HTTPRequest& request) const; + +- int AskForAuthentication(const HTTPRequest& request) const; ++ MHD_RESULT AskForAuthentication(const HTTPRequest& request) const; + bool IsAuthenticated(const HTTPRequest& request) const; + + bool IsRequestCacheable(const HTTPRequest& request) const; +@@ -76,18 +76,18 @@ class CWebServer + bool ProcessPostData(const HTTPRequest& request, ConnectionHandler *connectionHandler, const char *upload_data, size_t *upload_data_size, void **con_cls) const; + void FinalizePostDataProcessing(ConnectionHandler *connectionHandler) const; + +- int CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; +- int CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; ++ MHD_RESULT CreateMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; ++ MHD_RESULT CreateRangedMemoryDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; + +- int CreateRedirect(struct MHD_Connection *connection, const std::string &strURL, struct MHD_Response *&response) const; +- int CreateFileDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; +- int CreateErrorResponse(struct MHD_Connection *connection, int responseType, HTTPMethod method, struct MHD_Response *&response) const; +- int CreateMemoryDownloadResponse(struct MHD_Connection *connection, const void *data, size_t size, bool free, bool copy, struct MHD_Response *&response) const; ++ MHD_RESULT CreateRedirect(struct MHD_Connection *connection, const std::string &strURL, struct MHD_Response *&response) const; ++ MHD_RESULT CreateFileDownloadResponse(const std::shared_ptr& handler, struct MHD_Response *&response) const; ++ MHD_RESULT CreateErrorResponse(struct MHD_Connection *connection, int responseType, HTTPMethod method, struct MHD_Response *&response) const; ++ MHD_RESULT CreateMemoryDownloadResponse(struct MHD_Connection *connection, const void *data, size_t size, bool free, bool copy, struct MHD_Response *&response) const; + +- int SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const; +- int SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const; ++ MHD_RESULT SendResponse(const HTTPRequest& request, int responseStatus, MHD_Response *response) const; ++ MHD_RESULT SendErrorResponse(const HTTPRequest& request, int errorType, HTTPMethod method) const; + +- int AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const; ++ MHD_RESULT AddHeader(struct MHD_Response *response, const std::string &name, const std::string &value) const; + + void LogRequest(const HTTPRequest& request) const; + void LogResponse(const HTTPRequest& request, int responseStatus) const; +@@ -100,11 +100,11 @@ class CWebServer + static ssize_t ContentReaderCallback (void *cls, uint64_t pos, char *buf, size_t max); + static void ContentReaderFreeCallback(void *cls); + +- static int AnswerToConnection (void *cls, struct MHD_Connection *connection, ++ static MHD_RESULT AnswerToConnection (void *cls, struct MHD_Connection *connection, + const char *url, const char *method, + const char *version, const char *upload_data, + size_t *upload_data_size, void **con_cls); +- static int HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, ++ static MHD_RESULT HandlePostField(void *cls, enum MHD_ValueKind kind, const char *key, + const char *filename, const char *content_type, + const char *transfer_encoding, const char *data, uint64_t off, + size_t size); +diff --git a/xbmc/network/httprequesthandler/HTTPFileHandler.cpp b/xbmc/network/httprequesthandler/HTTPFileHandler.cpp +index 2101d49f0911..26e53901dbfa 100644 +--- a/xbmc/network/httprequesthandler/HTTPFileHandler.cpp ++++ b/xbmc/network/httprequesthandler/HTTPFileHandler.cpp +@@ -23,7 +23,7 @@ CHTTPFileHandler::CHTTPFileHandler(const HTTPRequest &request) + m_lastModified() + { } + +-int CHTTPFileHandler::HandleRequest() ++MHD_RESULT CHTTPFileHandler::HandleRequest() + { + return !m_url.empty() ? MHD_YES : MHD_NO; + } +diff --git a/xbmc/network/httprequesthandler/HTTPFileHandler.h b/xbmc/network/httprequesthandler/HTTPFileHandler.h +index 3c74b5275092..6121315c6f5f 100644 +--- a/xbmc/network/httprequesthandler/HTTPFileHandler.h ++++ b/xbmc/network/httprequesthandler/HTTPFileHandler.h +@@ -19,7 +19,7 @@ class CHTTPFileHandler : public IHTTPRequestHandler + public: + ~CHTTPFileHandler() override = default; + +- int HandleRequest() override; ++ MHD_RESULT HandleRequest() override; + + bool CanHandleRanges() const override { return m_canHandleRanges; } + bool CanBeCached() const override { return m_canBeCached; } +diff --git a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp +index de42e7fd3017..6902be012532 100644 +--- a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp ++++ b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp +@@ -104,7 +104,7 @@ bool CHTTPImageTransformationHandler::CanHandleRequest(const HTTPRequest &reques + options.find(TRANSFORMATION_OPTION_HEIGHT) != options.end()); + } + +-int CHTTPImageTransformationHandler::HandleRequest() ++MHD_RESULT CHTTPImageTransformationHandler::HandleRequest() + { + if (m_response.type == HTTPError) + return MHD_YES; +diff --git a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h +index c55015ec4eb0..0d17afc3250a 100644 +--- a/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h ++++ b/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h +@@ -23,7 +23,7 @@ class CHTTPImageTransformationHandler : public IHTTPRequestHandler + IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPImageTransformationHandler(request); } + bool CanHandleRequest(const HTTPRequest &request)const override; + +- int HandleRequest() override; ++ MHD_RESULT HandleRequest() override; + + bool CanHandleRanges() const override { return true; } + bool CanBeCached() const override { return true; } +diff --git a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp +index e8e2fa36924b..a4c3c198eba3 100644 +--- a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp ++++ b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp +@@ -25,7 +25,7 @@ bool CHTTPJsonRpcHandler::CanHandleRequest(const HTTPRequest &request) const + return (request.pathUrl.compare("/jsonrpc") == 0); + } + +-int CHTTPJsonRpcHandler::HandleRequest() ++MHD_RESULT CHTTPJsonRpcHandler::HandleRequest() + { + CHTTPClient client(m_request.method); + bool isRequest = false; +diff --git a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h +index 67c14b666ef6..2659fd549c25 100644 +--- a/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h ++++ b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h +@@ -24,7 +24,7 @@ class CHTTPJsonRpcHandler : public IHTTPRequestHandler + IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPJsonRpcHandler(request); } + bool CanHandleRequest(const HTTPRequest &request) const override; + +- int HandleRequest() override; ++ MHD_RESULT HandleRequest() override; + + HttpResponseRanges GetResponseData() const override; + +diff --git a/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp b/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp +index 5f9aeef10f2e..a07ef0d3ac31 100644 +--- a/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp ++++ b/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp +@@ -112,7 +112,7 @@ bool CHTTPPythonHandler::CanHandleRequest(const HTTPRequest &request) const + return true; + } + +-int CHTTPPythonHandler::HandleRequest() ++MHD_RESULT CHTTPPythonHandler::HandleRequest() + { + if (m_response.type == HTTPError || m_response.type == HTTPRedirect) + return MHD_YES; +diff --git a/xbmc/network/httprequesthandler/HTTPPythonHandler.h b/xbmc/network/httprequesthandler/HTTPPythonHandler.h +index 03c150693ff4..166430e68d51 100644 +--- a/xbmc/network/httprequesthandler/HTTPPythonHandler.h ++++ b/xbmc/network/httprequesthandler/HTTPPythonHandler.h +@@ -25,7 +25,7 @@ class CHTTPPythonHandler : public IHTTPRequestHandler + bool CanBeCached() const override { return false; } + bool GetLastModifiedDate(CDateTime &lastModified) const override; + +- int HandleRequest() override; ++ MHD_RESULT HandleRequest() override; + + HttpResponseRanges GetResponseData() const override { return m_responseRanges; } + +diff --git a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp +index 80d1d6733475..f2ea1f2e51ed 100644 +--- a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp ++++ b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp +@@ -61,7 +61,7 @@ bool HTTPRequestHandlerUtils::GetRequestedRanges(struct MHD_Connection *connecti + return ranges.Parse(GetRequestHeaderValue(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_RANGE), totalLength); + } + +-int HTTPRequestHandlerUtils::FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) ++MHD_RESULT HTTPRequestHandlerUtils::FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) + { + if (cls == nullptr || key == nullptr) + return MHD_NO; +@@ -72,7 +72,7 @@ int HTTPRequestHandlerUtils::FillArgumentMap(void *cls, enum MHD_ValueKind kind, + return MHD_YES; + } + +-int HTTPRequestHandlerUtils::FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) ++MHD_RESULT HTTPRequestHandlerUtils::FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) + { + if (cls == nullptr || key == nullptr) + return MHD_NO; +diff --git a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h +index 9a07801914e4..0ec5ed1bf706 100644 +--- a/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h ++++ b/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h +@@ -25,6 +25,6 @@ class HTTPRequestHandlerUtils + private: + HTTPRequestHandlerUtils() = delete; + +- static int FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); +- static int FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); ++ static MHD_RESULT FillArgumentMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); ++ static MHD_RESULT FillArgumentMultiMap(void *cls, enum MHD_ValueKind kind, const char *key, const char *value); + }; +diff --git a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp +index 01a6b503bdf6..0716a5df96ca 100644 +--- a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp ++++ b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp +@@ -18,7 +18,7 @@ bool CHTTPWebinterfaceAddonsHandler::CanHandleRequest(const HTTPRequest &request + return (request.pathUrl.compare("/addons") == 0 || request.pathUrl.compare("/addons/") == 0); + } + +-int CHTTPWebinterfaceAddonsHandler::HandleRequest() ++MHD_RESULT CHTTPWebinterfaceAddonsHandler::HandleRequest() + { + m_responseData = ADDON_HEADER; + ADDON::VECADDONS addons; +diff --git a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h +index e9b1c6d29a41..23cea36d1436 100644 +--- a/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h ++++ b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h +@@ -21,7 +21,7 @@ class CHTTPWebinterfaceAddonsHandler : public IHTTPRequestHandler + IHTTPRequestHandler* Create(const HTTPRequest &request) const override { return new CHTTPWebinterfaceAddonsHandler(request); } + bool CanHandleRequest(const HTTPRequest &request) const override; + +- int HandleRequest() override; ++ MHD_RESULT HandleRequest() override; + + HttpResponseRanges GetResponseData() const override; + +diff --git a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h b/xbmc/network/httprequesthandler/IHTTPRequestHandler.h +index 4b1e40a587a7..b3e19f34d3dd 100644 +--- a/xbmc/network/httprequesthandler/IHTTPRequestHandler.h ++++ b/xbmc/network/httprequesthandler/IHTTPRequestHandler.h +@@ -22,6 +22,14 @@ + + #include "utils/HttpRangeUtils.h" + ++#include ++ ++#if MHD_VERSION >= 0x00097002 ++#define MHD_RESULT enum MHD_Result ++#else ++#define MHD_RESULT int ++#endif ++ + class CDateTime; + class CWebServer; + +@@ -114,7 +122,7 @@ class IHTTPRequestHandler + * + * \return MHD_NO if a severe error has occurred otherwise MHD_YES. + */ +- virtual int HandleRequest() = 0; ++ virtual MHD_RESULT HandleRequest() = 0; + + /*! + * \brief Whether the HTTP response could also be provided in ranges. diff --git a/buildroot/package/libcamera/libcamera.mk b/buildroot/package/libcamera/libcamera.mk index d209a38df..2be344899 100644 --- a/buildroot/package/libcamera/libcamera.mk +++ b/buildroot/package/libcamera/libcamera.mk @@ -9,7 +9,7 @@ LIBCAMERA_VERSION = 448393f77ec9e37cb807e8e8d35c1a4877d253d4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = udev LIBCAMERA_CONF_OPTS = -Dtest=false -Ddocumentation=false -LIBCAMERA_INSTALL_STAGING = yes +LIBCAMERA_INSTALL_STAGING = YES LIBCAMERA_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (utils) LIBCAMERA_LICENSE_FILES = \ licenses/gnu-gpl-2.0.txt \ diff --git a/buildroot/package/libconfuse/libconfuse.hash b/buildroot/package/libconfuse/libconfuse.hash index adc93f99a..bb968f7a5 100644 --- a/buildroot/package/libconfuse/libconfuse.hash +++ b/buildroot/package/libconfuse/libconfuse.hash @@ -1,5 +1,5 @@ -# From https://github.com/martinh/libconfuse/releases/download/v3.2.2/confuse-3.2.2.tar.xz.md5 -md5 978996e421e5005e6a9f6f84948fac44 confuse-3.2.2.tar.xz +# From https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz.md5 +md5 a183cef2cecdd3783436ff8de500d274 confuse-3.3.tar.xz # Locally computed -sha256 a9240b653d02e8cfc52db48e8c4224426e528e1faa09b65e8ca08a197fad210b confuse-3.2.2.tar.xz +sha256 1dd50a0320e135a55025b23fcdbb3f0a81913b6d0b0a9df8cc2fdf3b3dc67010 confuse-3.3.tar.xz sha256 dc3ff4b62f851dd2e94a151061ffeb7d28ddfc880a442068dc5283dbaa927306 LICENSE diff --git a/buildroot/package/libconfuse/libconfuse.mk b/buildroot/package/libconfuse/libconfuse.mk index b16bc9b7a..516c0056d 100644 --- a/buildroot/package/libconfuse/libconfuse.mk +++ b/buildroot/package/libconfuse/libconfuse.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCONFUSE_VERSION = 3.2.2 +LIBCONFUSE_VERSION = 3.3 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.xz LIBCONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION) LIBCONFUSE_INSTALL_STAGING = YES diff --git a/buildroot/package/libcurl/0001-bearssl-fix-build-with-disabled-proxy-support.patch b/buildroot/package/libcurl/0001-bearssl-fix-build-with-disabled-proxy-support.patch new file mode 100644 index 000000000..b6d89859b --- /dev/null +++ b/buildroot/package/libcurl/0001-bearssl-fix-build-with-disabled-proxy-support.patch @@ -0,0 +1,50 @@ +From 3a46be47cad5a3498b5f6d6007b7d1fe5b8dff78 Mon Sep 17 00:00:00 2001 +Message-Id: <3a46be47cad5a3498b5f6d6007b7d1fe5b8dff78.1594274321.git.baruch@tkos.co.il> +From: Baruch Siach +Date: Thu, 9 Jul 2020 08:14:49 +0300 +Subject: [PATCH] bearssl: fix build with disabled proxy support + +Avoid reference to fields that do not exist when CURL_DISABLE_PROXY is +defined. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/curl/curl/pull/5666 + + lib/vtls/bearssl.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c +index 628e16a124a9..44e7406e8e39 100644 +--- a/lib/vtls/bearssl.c ++++ b/lib/vtls/bearssl.c +@@ -300,8 +300,12 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; + struct ssl_backend_data *backend = connssl->backend; + const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile); ++#ifndef CURL_DISABLE_PROXY + const char *hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : + conn->host.name; ++#else ++ const char *hostname = conn->host.name; ++#endif + const bool verifypeer = SSL_CONN_CONFIG(verifypeer); + const bool verifyhost = SSL_CONN_CONFIG(verifyhost); + CURLcode ret; +@@ -386,8 +390,11 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) + */ + + #ifdef USE_NGHTTP2 +- if(data->set.httpversion >= CURL_HTTP_VERSION_2 && +- (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) { ++ if(data->set.httpversion >= CURL_HTTP_VERSION_2 ++#ifndef CURL_DISABLE_PROXY ++ && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy) ++#endif ++ ) { + backend->protocols[cur++] = NGHTTP2_PROTO_VERSION_ID; + infof(data, "ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID); + } +-- +2.27.0 + diff --git a/buildroot/package/libcurl/0002-nss-fix-build-with-disabled-proxy-support.patch b/buildroot/package/libcurl/0002-nss-fix-build-with-disabled-proxy-support.patch new file mode 100644 index 000000000..0d1286338 --- /dev/null +++ b/buildroot/package/libcurl/0002-nss-fix-build-with-disabled-proxy-support.patch @@ -0,0 +1,159 @@ +From d040da28f57d0b3fcd6f63809a8c85a600f87a62 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Baruch Siach +Date: Thu, 9 Jul 2020 08:14:49 +0300 +Subject: [PATCH] nss: fix build with disabled proxy support + +Avoid reference to fields that do not exist when CURL_DISABLE_PROXY is +defined. + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/curl/curl/pull/5667 + + lib/vtls/nss.c | 44 +++++++++++++++++++++++++++++++++++--------- + 1 file changed, 35 insertions(+), 9 deletions(-) + +diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c +index fca292613815..0f0d1ee6c80f 100644 +--- a/lib/vtls/nss.c ++++ b/lib/vtls/nss.c +@@ -1027,9 +1027,11 @@ static SECStatus BadCertHandler(void *arg, PRFileDesc *sock) + CERTCertificate *cert; + + /* remember the cert verification result */ ++#ifndef CURL_DISABLE_PROXY + if(SSL_IS_PROXY()) + data->set.proxy_ssl.certverifyresult = err; + else ++#endif + data->set.ssl.certverifyresult = err; + + if(err == SSL_ERROR_BAD_CERT_DOMAIN && !SSL_CONN_CONFIG(verifyhost)) +@@ -1553,24 +1555,32 @@ static void nss_close(struct ssl_connect_data *connssl) + static void Curl_nss_close(struct connectdata *conn, int sockindex) + { + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; ++#ifndef CURL_DISABLE_PROXY + struct ssl_connect_data *connssl_proxy = &conn->proxy_ssl[sockindex]; ++#endif + struct ssl_backend_data *backend = connssl->backend; + +- if(backend->handle || connssl_proxy->backend->handle) { ++ if(backend->handle ++#ifndef CURL_DISABLE_PROXY ++ || connssl_proxy->backend->handle ++#endif ++ ) { + /* NSS closes the socket we previously handed to it, so we must mark it + as closed to avoid double close */ + fake_sclose(conn->sock[sockindex]); + conn->sock[sockindex] = CURL_SOCKET_BAD; + } + ++#ifndef CURL_DISABLE_PROXY + if(backend->handle) + /* nss_close(connssl) will transitively close also + connssl_proxy->backend->handle if both are used. Clear it to avoid + a double close leading to crash. */ + connssl_proxy->backend->handle = NULL; + +- nss_close(connssl); + nss_close(connssl_proxy); ++#endif ++ nss_close(connssl); + } + + /* return true if NSS can provide error code (and possibly msg) for the +@@ -1828,6 +1838,12 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) + CURLcode result; + bool second_layer = FALSE; + SSLVersionRange sslver_supported; ++#ifndef CURL_DISABLE_PROXY ++ const char *hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : ++ conn->host.name; ++#else ++ const char *hostname = conn->host.name; ++#endif + + SSLVersionRange sslver = { + SSL_LIBRARY_VERSION_TLS_1_0, /* min */ +@@ -1932,9 +1948,11 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) + goto error; + + /* not checked yet */ ++#ifndef CURL_DISABLE_PROXY + if(SSL_IS_PROXY()) + data->set.proxy_ssl.certverifyresult = 0; + else ++#endif + data->set.ssl.certverifyresult = 0; + + if(SSL_BadCertHook(model, BadCertHandler, conn) != SECSuccess) +@@ -1991,12 +2009,14 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) + goto error; + } + ++#ifndef CURL_DISABLE_PROXY + if(conn->proxy_ssl[sockindex].use) { + DEBUGASSERT(ssl_connection_complete == conn->proxy_ssl[sockindex].state); + DEBUGASSERT(conn->proxy_ssl[sockindex].backend->handle != NULL); + nspr_io = conn->proxy_ssl[sockindex].backend->handle; + second_layer = TRUE; + } ++#endif + else { + /* wrap OS file descriptor by NSPR's file descriptor abstraction */ + nspr_io = PR_ImportTCPSocket(sockfd); +@@ -2077,8 +2097,11 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) + unsigned char protocols[128]; + + #ifdef USE_NGHTTP2 +- if(data->set.httpversion >= CURL_HTTP_VERSION_2 && +- (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) { ++ if(data->set.httpversion >= CURL_HTTP_VERSION_2 ++#ifndef CURL_DISABLE_PROXY ++ && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy) ++#endif ++ ) { + protocols[cur++] = NGHTTP2_PROTO_VERSION_ID_LEN; + memcpy(&protocols[cur], NGHTTP2_PROTO_VERSION_ID, + NGHTTP2_PROTO_VERSION_ID_LEN); +@@ -2101,14 +2124,11 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) + goto error; + + /* propagate hostname to the TLS layer */ +- if(SSL_SetURL(backend->handle, SSL_IS_PROXY() ? conn->http_proxy.host.name : +- conn->host.name) != SECSuccess) ++ if(SSL_SetURL(backend->handle, hostname) != SECSuccess) + goto error; + + /* prevent NSS from re-using the session for a different hostname */ +- if(SSL_SetSockPeerID(backend->handle, SSL_IS_PROXY() ? +- conn->http_proxy.host.name : conn->host.name) +- != SECSuccess) ++ if(SSL_SetSockPeerID(backend->handle, hostname) != SECSuccess) + goto error; + + return CURLE_OK; +@@ -2127,11 +2147,17 @@ static CURLcode nss_do_connect(struct connectdata *conn, int sockindex) + struct Curl_easy *data = conn->data; + CURLcode result = CURLE_SSL_CONNECT_ERROR; + PRUint32 timeout; ++#ifndef CURL_DISABLE_PROXY + long * const certverifyresult = SSL_IS_PROXY() ? + &data->set.proxy_ssl.certverifyresult : &data->set.ssl.certverifyresult; + const char * const pinnedpubkey = SSL_IS_PROXY() ? + data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY] : + data->set.str[STRING_SSL_PINNEDPUBLICKEY_ORIG]; ++#else ++ long * const certverifyresult = &data->set.ssl.certverifyresult; ++ const char * const pinnedpubkey = ++ data->set.str[STRING_SSL_PINNEDPUBLICKEY_ORIG]; ++#endif + + + /* check timeout situation */ +-- +2.27.0 + diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index e60194254..46f72c1ea 100644 --- a/buildroot/package/libcurl/libcurl.hash +++ b/buildroot/package/libcurl/libcurl.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a curl-7.68.0.tar.xz -sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING +# Locally calculated after checking pgp signature +# https://curl.haxx.se/download/curl-7.71.1.tar.xz.asc +# signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 +sha256 40f83eda27cdbeb25cd4da48cefb639af1b9395d6026d2da1825bf059239658c curl-7.71.1.tar.xz +sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index 16b11ca94..2581207b0 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.68.0 +LIBCURL_VERSION = 7.71.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -22,7 +22,7 @@ LIBCURL_INSTALL_STAGING = YES # generate C code) isn't very useful LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \ - --without-polarssl --disable-libcurl-option + --disable-libcurl-option ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver @@ -177,7 +177,6 @@ HOST_LIBCURL_CONF_OPTS = \ --with-ssl \ --without-gnutls \ --without-mbedtls \ - --without-polarssl \ --without-nss HOST_LIBCURL_POST_PATCH_HOOKS += LIBCURL_FIX_DOT_PC diff --git a/buildroot/package/libglib2/0003-remove-cpp-requirement.patch b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch index d28f8ab81..77589e690 100644 --- a/buildroot/package/libglib2/0003-remove-cpp-requirement.patch +++ b/buildroot/package/libglib2/0003-remove-cpp-requirement.patch @@ -35,7 +35,7 @@ index 4bbf4c2..ac59f4e 100644 @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.62.4', + version : '2.62.5', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', diff --git a/buildroot/package/libglib2/libglib2.hash b/buildroot/package/libglib2/libglib2.hash index e3478f06b..0a60b75f8 100644 --- a/buildroot/package/libglib2/libglib2.hash +++ b/buildroot/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.62/glib-2.62.4.sha256sum -sha256 4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc glib-2.62.4.tar.xz +# https://download.gnome.org/sources/glib/2.62/glib-2.62.5.sha256sum +sha256 b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e glib-2.62.5.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/libglib2/libglib2.mk b/buildroot/package/libglib2/libglib2.mk index a206639f7..42b608fd7 100644 --- a/buildroot/package/libglib2/libglib2.mk +++ b/buildroot/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.62 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).5 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch b/buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch new file mode 100644 index 000000000..118b3df39 --- /dev/null +++ b/buildroot/package/libhttpserver/0002-Compatibility-with-libmicrohttpd-0.9.71-199.patch @@ -0,0 +1,254 @@ +From 056df008ecb8ab354191b7515199267eb6b84124 Mon Sep 17 00:00:00 2001 +From: bkuhls +Date: Mon, 6 Jul 2020 04:23:21 +0200 +Subject: [PATCH] Compatibility with libmicrohttpd 0.9.71 (#199) + +From the libmicrohttpd 0.9.71 release notes: + +The release introduces an 'enum MHD_Result' instead of +for certain API misuse bugs by providing better types (not everything is +an 'int'). While this does NOT change the binary API, this change +_will_ cause compiler warnings for all legacy code -- until 'int' is +replaced with 'enum MHD_Result'. + +(cherry picked from commit 51b343c6b05dd13cbde0db04984fbf392e9f6df6) +[Peter: backported to 0.17.5] +Signed-off-by: Peter Korsgaard +--- + src/http_request.cpp | 6 +++--- + src/httpserver/http_request.hpp | 6 +++--- + src/httpserver/http_utils.hpp | 4 ++++ + src/httpserver/webserver.hpp | 16 ++++++++-------- + src/webserver.cpp | 24 ++++++++++++++---------- + 5 files changed, 32 insertions(+), 24 deletions(-) + +diff --git a/src/http_request.cpp b/src/http_request.cpp +index 973ab33..37035b2 100644 +--- a/src/http_request.cpp ++++ b/src/http_request.cpp +@@ -86,7 +86,7 @@ const std::string http_request::get_connection_value(const std::string& key, enu + return header_c; + } + +-int http_request::build_request_header( ++MHD_Result http_request::build_request_header( + void *cls, + enum MHD_ValueKind kind, + const char *key, +@@ -187,7 +187,7 @@ const std::string http_request::get_querystring() const + return querystring; + } + +-int http_request::build_request_args( ++MHD_Result http_request::build_request_args( + void *cls, + enum MHD_ValueKind kind, + const char *key, +@@ -202,7 +202,7 @@ int http_request::build_request_args( + return MHD_YES; + } + +-int http_request::build_request_querystring( ++MHD_Result http_request::build_request_querystring( + void *cls, + enum MHD_ValueKind kind, + const char *key, +diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp +index 21f2176..6bd371c 100644 +--- a/src/httpserver/http_request.hpp ++++ b/src/httpserver/http_request.hpp +@@ -304,15 +304,15 @@ class http_request + + unescaper_ptr unescaper; + +- static int build_request_header(void *cls, enum MHD_ValueKind kind, ++ static MHD_Result build_request_header(void *cls, enum MHD_ValueKind kind, + const char *key, const char *value + ); + +- static int build_request_args(void *cls, enum MHD_ValueKind kind, ++ static MHD_Result build_request_args(void *cls, enum MHD_ValueKind kind, + const char *key, const char *value + ); + +- static int build_request_querystring(void *cls, enum MHD_ValueKind kind, ++ static MHD_Result build_request_querystring(void *cls, enum MHD_ValueKind kind, + const char *key, const char *value + ); + +diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp +index bd3df17..cf18360 100644 +--- a/src/httpserver/http_utils.hpp ++++ b/src/httpserver/http_utils.hpp +@@ -39,6 +39,10 @@ + + #define DEFAULT_MASK_VALUE 0xFFFF + ++#if MHD_VERSION < 0x00097002 ++typedef int MHD_Result; ++#endif ++ + namespace httpserver { + + typedef void(*unescaper_ptr)(std::string&); +diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp +index 2660c70..3c915a1 100644 +--- a/src/httpserver/webserver.hpp ++++ b/src/httpserver/webserver.hpp +@@ -201,14 +201,14 @@ class webserver + enum MHD_RequestTerminationCode toe + ); + +- static int answer_to_connection ++ static MHD_Result answer_to_connection + ( + void* cls, MHD_Connection* connection, + const char* url, const char* method, + const char* version, const char* upload_data, + size_t* upload_data_size, void** con_cls + ); +- static int post_iterator ++ static MHD_Result post_iterator + ( + void *cls, + enum MHD_ValueKind kind, +@@ -225,30 +225,30 @@ class webserver + void **con_cls, int upgrade_socket + ); + +- int bodyless_requests_answer(MHD_Connection* connection, ++ MHD_Result bodyless_requests_answer(MHD_Connection* connection, + const char* method, const char* version, + struct details::modded_request* mr + ); + +- int bodyfull_requests_answer_first_step(MHD_Connection* connection, ++ MHD_Result bodyfull_requests_answer_first_step(MHD_Connection* connection, + struct details::modded_request* mr + ); + +- int bodyfull_requests_answer_second_step(MHD_Connection* connection, ++ MHD_Result bodyfull_requests_answer_second_step(MHD_Connection* connection, + const char* method, const char* version, const char* upload_data, + size_t* upload_data_size, struct details::modded_request* mr + ); + +- int finalize_answer(MHD_Connection* connection, ++ MHD_Result finalize_answer(MHD_Connection* connection, + struct details::modded_request* mr, const char* method + ); + +- int complete_request(MHD_Connection* connection, ++ MHD_Result complete_request(MHD_Connection* connection, + struct details::modded_request* mr, + const char* version, const char* method + ); + +- friend int policy_callback (void *cls, ++ friend MHD_Result policy_callback (void *cls, + const struct sockaddr* addr, socklen_t addrlen + ); + friend void error_log(void* cls, const char* fmt, va_list ap); +diff --git a/src/webserver.cpp b/src/webserver.cpp +index e71c364..ab6b530 100644 +--- a/src/webserver.cpp ++++ b/src/webserver.cpp +@@ -61,6 +61,10 @@ + #define SOCK_CLOEXEC 02000000 + #endif + ++#if MHD_VERSION < 0x00097002 ++typedef int MHD_Result; ++#endif ++ + using namespace std; + + namespace httpserver +@@ -68,7 +72,7 @@ namespace httpserver + + using namespace http; + +-int policy_callback (void *, const struct sockaddr*, socklen_t); ++MHD_Result policy_callback (void *, const struct sockaddr*, socklen_t); + void error_log(void*, const char*, va_list); + void* uri_log(void*, const char*); + void access_log(webserver*, string); +@@ -408,7 +412,7 @@ void webserver::disallow_ip(const string& ip) + this->allowances.erase(ip); + } + +-int policy_callback (void *cls, const struct sockaddr* addr, socklen_t addrlen) ++MHD_Result policy_callback (void *cls, const struct sockaddr* addr, socklen_t addrlen) + { + if(!(static_cast(cls))->ban_system_enabled) return MHD_YES; + +@@ -455,7 +459,7 @@ size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s) + return std::string(s).size(); + } + +-int webserver::post_iterator (void *cls, enum MHD_ValueKind kind, ++MHD_Result webserver::post_iterator (void *cls, enum MHD_ValueKind kind, + const char *key, + const char *filename, + const char *content_type, +@@ -509,7 +513,7 @@ const std::shared_ptr webserver::internal_error_page(details::mod + } + } + +-int webserver::bodyless_requests_answer( ++MHD_Result webserver::bodyless_requests_answer( + MHD_Connection* connection, const char* method, + const char* version, struct details::modded_request* mr + ) +@@ -519,7 +523,7 @@ int webserver::bodyless_requests_answer( + return complete_request(connection, mr, version, method); + } + +-int webserver::bodyfull_requests_answer_first_step( ++MHD_Result webserver::bodyfull_requests_answer_first_step( + MHD_Connection* connection, + struct details::modded_request* mr + ) +@@ -565,7 +569,7 @@ int webserver::bodyfull_requests_answer_first_step( + return MHD_YES; + } + +-int webserver::bodyfull_requests_answer_second_step( ++MHD_Result webserver::bodyfull_requests_answer_second_step( + MHD_Connection* connection, const char* method, + const char* version, const char* upload_data, + size_t* upload_data_size, struct details::modded_request* mr +@@ -583,7 +587,7 @@ int webserver::bodyfull_requests_answer_second_step( + return MHD_YES; + } + +-int webserver::finalize_answer( ++MHD_Result webserver::finalize_answer( + MHD_Connection* connection, + struct details::modded_request* mr, + const char* method +@@ -717,10 +721,10 @@ int webserver::finalize_answer( + mr->dhrs->decorate_response(raw_response); + to_ret = mr->dhrs->enqueue_response(connection, raw_response); + MHD_destroy_response(raw_response); +- return to_ret; ++ return (MHD_Result) to_ret; + } + +-int webserver::complete_request( ++MHD_Result webserver::complete_request( + MHD_Connection* connection, + struct details::modded_request* mr, + const char* version, +@@ -736,7 +740,7 @@ int webserver::complete_request( + return finalize_answer(connection, mr, method); + } + +-int webserver::answer_to_connection(void* cls, MHD_Connection* connection, ++MHD_Result webserver::answer_to_connection(void* cls, MHD_Connection* connection, + const char* url, const char* method, + const char* version, const char* upload_data, + size_t* upload_data_size, void** con_cls +-- +2.20.1 + diff --git a/buildroot/package/libhttpserver/libhttpserver.mk b/buildroot/package/libhttpserver/libhttpserver.mk index 1fd76519f..2c536cf01 100644 --- a/buildroot/package/libhttpserver/libhttpserver.mk +++ b/buildroot/package/libhttpserver/libhttpserver.mk @@ -9,7 +9,9 @@ LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) LIBHTTPSERVER_LICENSE = LGPL-2.1+ LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER LIBHTTPSERVER_INSTALL_STAGING = YES -LIBHTTPSERVER_CONF_OPTS = --enable-same-directory-build +LIBHTTPSERVER_CONF_OPTS = \ + --disable-examples \ + --enable-same-directory-build LIBHTTPSERVER_AUTORECONF = YES LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.hash b/buildroot/package/libmicrohttpd/libmicrohttpd.hash index 0fc451fcd..d853f67a7 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.hash +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307 libmicrohttpd-0.9.70.tar.gz -sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING +sha256 e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182 libmicrohttpd-0.9.71.tar.gz +sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk index f47d7ec21..4d4b1ae1a 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.mk +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.70 +LIBMICROHTTPD_VERSION = 0.9.71 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES diff --git a/buildroot/package/libopenssl/Config.in b/buildroot/package/libopenssl/Config.in index 881518d1c..8909e36b9 100644 --- a/buildroot/package/libopenssl/Config.in +++ b/buildroot/package/libopenssl/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH # no-asm is needed with generic architectures such as # linux-generic{32,64}, see # https://github.com/openssl/openssl/issues/9839 - default "linux-generic64 no-asm" if BR2_ARCH_IS_64 + default "linux-generic64 no-asm" if BR2_ARCH_IS_64 && !BR2_MIPS_NABI32 default "linux-generic32 no-asm" config BR2_PACKAGE_LIBOPENSSL_BIN diff --git a/buildroot/package/libvncserver/0001-CMakeLists.txt-fix-build-without-C.patch b/buildroot/package/libvncserver/0001-CMakeLists.txt-fix-build-without-C.patch deleted file mode 100644 index 591c97fd6..000000000 --- a/buildroot/package/libvncserver/0001-CMakeLists.txt-fix-build-without-C.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 868f0a9fa60bb45ee6cf762f323c5b3964b2ee69 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 23 Jun 2019 10:18:59 +0200 -Subject: [PATCH] CMakeLists.txt: fix build without C++ - -Specify that libvncserver is a C project file otherwise build will fail -if no C++ compiler is found by cmake - -Fixes: - - http://autobuild.buildroot.org/results/16aaa4e86a2dbf1acf95f10d5131b0f7b8a3d61a - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LibVNC/libvncserver/pull/317] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d3b4dc..ad609ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 3.4) - cmake_policy(SET CMP0037 NEW) - --project(LibVNCServer) -+project(LibVNCServer C) - include(CheckFunctionExists) - include(CheckSymbolExists) - include(CheckIncludeFile) --- -2.20.1 - diff --git a/buildroot/package/libvncserver/0002-libvnc-client-server-.pc.cmakein-remove-zlib.patch b/buildroot/package/libvncserver/0002-libvnc-client-server-.pc.cmakein-remove-zlib.patch deleted file mode 100644 index 7941a9888..000000000 --- a/buildroot/package/libvncserver/0002-libvnc-client-server-.pc.cmakein-remove-zlib.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5abd95b65fe5ec24749164338a9718ecce19e240 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 28 Feb 2020 10:29:58 +0100 -Subject: [PATCH] libvnc{client,server}.pc.cmakein: remove zlib - -Remove zlib from Requires.private as libvnc can be built without zlib -thanks to WITH_LIB, zlib will be added to Libs.private thanks to -PRIVATE_LIBS - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LibVNC/libvncserver/pull/377] ---- - libvncclient.pc.cmakein | 2 +- - libvncserver.pc.cmakein | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein -index 336e73f..ceeda39 100644 ---- a/libvncclient.pc.cmakein -+++ b/libvncclient.pc.cmakein -@@ -7,7 +7,7 @@ Name: LibVNCClient - Description: A library for easy implementation of a VNC client. - Version: @LibVNCServer_VERSION@ - Requires: --Requires.private: zlib -+Requires.private: - Libs: -L${libdir} -lvncclient - Libs.private: @PRIVATE_LIBS@ - Cflags: -I${includedir} -diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein -index dfcec9d..33ec668 100644 ---- a/libvncserver.pc.cmakein -+++ b/libvncserver.pc.cmakein -@@ -7,7 +7,7 @@ Name: LibVNCServer - Description: A library for easy implementation of a VNC server. - Version: @LibVNCServer_VERSION@ - Requires: --Requires.private: zlib -+Requires.private: - Libs: -L${libdir} -lvncserver - Libs.private: @PRIVATE_LIBS@ - Cflags: -I${includedir} --- -2.25.0 - diff --git a/buildroot/package/libvncserver/0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch b/buildroot/package/libvncserver/0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch deleted file mode 100644 index 7461f11f8..000000000 --- a/buildroot/package/libvncserver/0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 09e8fc02f59f16e2583b34fe1a270c238bd9ffec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 7 Jan 2019 10:40:01 +0100 -Subject: [PATCH] Limit lenght to INT_MAX bytes in - rfbProcessFileTransferReadBuffer() - -This ammends 15bb719c03cc70f14c36a843dcb16ed69b405707 fix for a heap -out-of-bound write access in rfbProcessFileTransferReadBuffer() when -reading a transfered file content in a server. The former fix did not -work on platforms with a 32-bit int type (expected by rfbReadExact()). - -CVE-2018-15127 - - -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec] -Signed-off-by: Fabrice Fontaine ---- - libvncserver/rfbserver.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 7af84906..f2edbeea 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -88,6 +88,8 @@ - #include - /* strftime() */ - #include -+/* INT_MAX */ -+#include - - #ifdef LIBVNCSERVER_WITH_WEBSOCKETS - #include "rfbssl.h" -@@ -1472,8 +1474,11 @@ char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length) - 0XFFFFFFFF, i.e. SIZE_MAX for 32-bit systems. On 64-bit systems, a length of 0XFFFFFFFF - will safely be allocated since this check will never trigger and malloc() can digest length+1 - without problems as length is a uint32_t. -+ We also later pass length to rfbReadExact() that expects a signed int type and -+ that might wrap on platforms with a 32-bit int type if length is bigger -+ than 0X7FFFFFFF. - */ -- if(length == SIZE_MAX) { -+ if(length == SIZE_MAX || length > INT_MAX) { - rfbErr("rfbProcessFileTransferReadBuffer: too big file transfer length requested: %u", (unsigned int)length); - rfbCloseClient(cl); - return NULL; diff --git a/buildroot/package/libvncserver/0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch b/buildroot/package/libvncserver/0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch deleted file mode 100644 index 056b940cd..000000000 --- a/buildroot/package/libvncserver/0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a Mon Sep 17 00:00:00 2001 -From: Christian Beier -Date: Mon, 19 Aug 2019 22:32:25 +0200 -Subject: [PATCH] rfbserver: don't leak stack memory to the remote - -Thanks go to Pavel Cheremushkin of Kaspersky for reporting. -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a] -Signed-off-by: Fabrice Fontaine ---- - libvncserver/rfbserver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c -index 3bacc891..310e5487 100644 ---- a/libvncserver/rfbserver.c -+++ b/libvncserver/rfbserver.c -@@ -3724,6 +3724,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - rfbServerCutTextMsg sct; - rfbClientIteratorPtr iterator; - -+ memset((char *)&sct, 0, sizeof(sct)); -+ - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { - sct.type = rfbServerCutText; diff --git a/buildroot/package/libvncserver/0005-CMakeLists.txt-don-t-build-tight.c-without-png-or-zl.patch b/buildroot/package/libvncserver/0005-CMakeLists.txt-don-t-build-tight.c-without-png-or-zl.patch deleted file mode 100644 index c357f8b3d..000000000 --- a/buildroot/package/libvncserver/0005-CMakeLists.txt-don-t-build-tight.c-without-png-or-zl.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8f58a9d9f35e6b893b54b399be357bc789f6e630 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 8 Mar 2020 10:36:57 +0100 -Subject: [PATCH] CMakeLists.txt: don't build tight.c without png or zlib - -If the user enables JPEG and disable PNG and ZLIB, build will fail on: - -[ 42%] Building C object CMakeFiles/vncserver.dir/libvncserver/ws_decode.c.o -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c: In function 'rfbSendRectEncodingTight': -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:276:7: error: 'struct _rfbClientRec' has no member named 'tightEncoding' - cl->tightEncoding = rfbEncodingTight; - ^~ -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c: In function 'rfbSendRectEncodingTightPng': -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:287:7: error: 'struct _rfbClientRec' has no member named 'tightEncoding' - cl->tightEncoding = rfbEncodingTightPng; - ^~ -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c: In function 'SendRectEncodingTight': -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:307:23: error: 'struct _rfbClientRec' has no member named 'tightCompressLevel' - compressLevel = cl->tightCompressLevel; - ^~ -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:308:22: error: 'struct _rfbClientRec' has no member named 'turboQualityLevel' - qualityLevel = cl->turboQualityLevel; - ^~ -/nvmedata/autobuild/instance-3/output-1/build/libvncserver-0.9.12/libvncserver/tight.c:309:22: error: 'struct _rfbClientRec' has no member named 'turboSubsampLevel' - subsampLevel = cl->turboSubsampLevel; - ^~ - -Fixes: - - http://autobuild.buildroot.org/results/bcc701055dd5876005fa6f78f38500399394cd75 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LibVNC/libvncserver/pull/380] ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a2cb15..b8bc9e2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -425,7 +425,9 @@ endif() - if(JPEG_FOUND) - add_definitions(-DLIBVNCSERVER_HAVE_LIBJPEG) - include_directories(${JPEG_INCLUDE_DIR}) -- set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c) -+ if(PNG_FOUND OR ZLIB_FOUND) -+ set(TIGHT_C ${LIBVNCSERVER_DIR}/tight.c ${COMMON_DIR}/turbojpeg.c) -+ endif(PNG_FOUND OR ZLIB_FOUND) - endif(JPEG_FOUND) - - if(PNG_FOUND) --- -2.25.0 - diff --git a/buildroot/package/libvncserver/0006-libvncclient-cursor-limit-width-height-input-values.patch b/buildroot/package/libvncserver/0006-libvncclient-cursor-limit-width-height-input-values.patch deleted file mode 100644 index c389f2ecf..000000000 --- a/buildroot/package/libvncserver/0006-libvncclient-cursor-limit-width-height-input-values.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 54220248886b5001fbbb9fa73c4e1a2cb9413fed Mon Sep 17 00:00:00 2001 -From: Christian Beier -Date: Sun, 17 Nov 2019 17:18:35 +0100 -Subject: [PATCH] libvncclient/cursor: limit width/height input values - -Avoids a possible heap overflow reported by Pavel Cheremushkin -. - -re #275 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/54220248886b5001fbbb9fa73c4e1a2cb9413fed] ---- - libvncclient/cursor.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libvncclient/cursor.c b/libvncclient/cursor.c -index 67f45726..40ffb3b0 100644 ---- a/libvncclient/cursor.c -+++ b/libvncclient/cursor.c -@@ -28,6 +28,8 @@ - #define OPER_SAVE 0 - #define OPER_RESTORE 1 - -+#define MAX_CURSOR_SIZE 1024 -+ - #define RGB24_TO_PIXEL(bpp,r,g,b) \ - ((((uint##bpp##_t)(r) & 0xFF) * client->format.redMax + 127) / 255 \ - << client->format.redShift | \ -@@ -54,6 +56,9 @@ rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int h - if (width * height == 0) - return TRUE; - -+ if (width >= MAX_CURSOR_SIZE || height >= MAX_CURSOR_SIZE) -+ return FALSE; -+ - /* Allocate memory for pixel data and temporary mask data. */ - if(client->rcSource) - free(client->rcSource); diff --git a/buildroot/package/libvncserver/libvncserver.hash b/buildroot/package/libvncserver/libvncserver.hash index d98d78d76..8e61a3d0e 100644 --- a/buildroot/package/libvncserver/libvncserver.hash +++ b/buildroot/package/libvncserver/libvncserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 33cbbb4e15bb390f723c311b323cef4a43bcf781984f92d92adda3243a116136 LibVNCServer-0.9.12.tar.gz +sha256 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a LibVNCServer-0.9.13.tar.gz sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING diff --git a/buildroot/package/libvncserver/libvncserver.mk b/buildroot/package/libvncserver/libvncserver.mk index 890672d04..23ab40b7e 100644 --- a/buildroot/package/libvncserver/libvncserver.mk +++ b/buildroot/package/libvncserver/libvncserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVNCSERVER_VERSION = 0.9.12 +LIBVNCSERVER_VERSION = 0.9.13 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ @@ -13,18 +13,10 @@ LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON -# 0003-Limit-lenght-to-INT_MAX-bytes-in-rfbProcessFileTransferReadBuffer.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2018-20750 - -# 0004-rfbserver-don-t-leak-stack-memory-to-the-remote.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2019-15681 - -# 0006-libvncclient-cursor-limit-width-height-input-values.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2019-20788 - # only used for examples LIBVNCSERVER_CONF_OPTS += \ -DWITH_FFMPEG=OFF \ + -DWITH_GTK=OFF \ -DWITH_SDL=OFF ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/buildroot/package/libxml2/libxml2.mk b/buildroot/package/libxml2/libxml2.mk index ea6a8c1f6..acbdfb772 100644 --- a/buildroot/package/libxml2/libxml2.mk +++ b/buildroot/package/libxml2/libxml2.mk @@ -49,6 +49,11 @@ else LIBXML2_CONF_OPTS += --without-iconv endif +define LIBXML2_CLEANUP_XML2CONF + rm -f $(TARGET_DIR)/usr/lib/xml2Conf.sh +endef +LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_CLEANUP_XML2CONF + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/libxmlrpc/libxmlrpc.mk b/buildroot/package/libxmlrpc/libxmlrpc.mk index 54db9f1f8..4b30ecd38 100644 --- a/buildroot/package/libxmlrpc/libxmlrpc.mk +++ b/buildroot/package/libxmlrpc/libxmlrpc.mk @@ -39,6 +39,13 @@ ifeq ($(BR2_STATIC_LIBS),y) LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBXMLRPC_DEPENDENCIES += host-pkgconf openssl +LIBXMLRPC_CONF_OPTS += --enable-abyss-openssl +else +LIBXMLRPC_CONF_OPTS += --disable-abyss-openssl +endif + LIBXMLRPC_MAKE_OPTS += $(LIBXMLRPC_STATIC_OPTS) LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \ DESTDIR=$(STAGING_DIR) install diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 6c37937f5..1b2e2e5bf 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -322,11 +322,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.225" if BR2_KERNEL_HEADERS_4_4 - default "4.9.225" if BR2_KERNEL_HEADERS_4_9 - default "4.14.182" if BR2_KERNEL_HEADERS_4_14 - default "4.19.125" if BR2_KERNEL_HEADERS_4_19 - default "5.4.43" if BR2_KERNEL_HEADERS_5_4 + default "4.4.226" if BR2_KERNEL_HEADERS_4_4 + default "4.9.226" if BR2_KERNEL_HEADERS_4_9 + default "4.14.183" if BR2_KERNEL_HEADERS_4_14 + default "4.19.127" if BR2_KERNEL_HEADERS_4_19 + default "5.4.45" if BR2_KERNEL_HEADERS_5_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/buildroot/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk index 53e3c85c6..7994dffcf 100644 --- a/buildroot/package/lxc/lxc.mk +++ b/buildroot/package/lxc/lxc.mk @@ -13,7 +13,10 @@ LXC_INSTALL_STAGING = YES # We're patching configure.ac LXC_AUTORECONF = YES -LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ +LXC_CONF_OPTS = \ + --disable-apparmor \ + --disable-examples \ + --with-distro=buildroot \ --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) diff --git a/buildroot/package/mbedtls/mbedtls.hash b/buildroot/package/mbedtls/mbedtls.hash index 17ac18bb2..b75a8fa80 100644 --- a/buildroot/package/mbedtls/mbedtls.hash +++ b/buildroot/package/mbedtls/mbedtls.hash @@ -1,5 +1,3 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.6-and-2.7.15-released -sha1 3cb5b681597a5bd798d31038c129c0dc911d8a2c mbedtls-2.16.6-apache.tgz -sha256 66455e23a6190a30142cdc1113f7418158839331a9d8e6b0778631d077281770 mbedtls-2.16.6-apache.tgz # Locally calculated +sha256 4786b7d1676f5e4d248f3a7f2d28446876d64962634f060ff21b92c690cfbe86 mbedtls-2.16.7.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/buildroot/package/mbedtls/mbedtls.mk b/buildroot/package/mbedtls/mbedtls.mk index 50121fa6c..4ae8291c1 100644 --- a/buildroot/package/mbedtls/mbedtls.mk +++ b/buildroot/package/mbedtls/mbedtls.mk @@ -4,9 +4,8 @@ # ################################################################################ -MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.16.6 -MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz +MBEDTLS_VERSION = 2.16.7 +MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,mbedtls-$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ -DENABLE_TESTING=OFF diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index 000ec1c1e..330c7b461 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -28,6 +28,12 @@ MESA3D_CONF_OPTS = \ -Dpower8=false \ -Dvalgrind=false +# Codesourcery ARM 2014.05 fail to link libmesa_dri_drivers.so with --as-needed linker +# flag due to a linker bug between binutils 2.24 and 2.25 (2.24.51.20140217). +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) +MESA3D_CONF_OPTS += -Db_asneeded=false +endif + ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' diff --git a/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 7bb00f3fb..4196545a9 100644 --- a/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 3a4962ede0d12bac66b38e0843f6e2ea75b03d50 Mon Sep 17 00:00:00 2001 +From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -16,23 +16,26 @@ Fixes: - http://autobuild.buildroot.org/results/0d36952def63cb69628697fa6408aeb6ce10cb5b Signed-off-by: Fabrice Fontaine +[Romain: Fix if condition, pkg_config_static is a string not a boolean] +Signed-off-by: Romain Naour --- - mesonbuild/dependencies/base.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + mesonbuild/dependencies/base.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index a83e3d6c..913bff6b 100644 +index 5636602e..de4e87bc 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -840,7 +840,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs'] - if self.static: -+ if self.static or self.env.properties[self.for_machine].get('pkg_config_static', False): ++ if self.static or \ ++ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): libcmd.append('--static') # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.24.1 +2.25.4 diff --git a/buildroot/package/mongodb/mongodb.hash b/buildroot/package/mongodb/mongodb.hash index f08ffffe3..ba2181a1f 100644 --- a/buildroot/package/mongodb/mongodb.hash +++ b/buildroot/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 b39c5b7bb77a547804ab6f43f9b5f09add47574356b31512fd1cc641a08b4ea5 mongodb-r4.0.12.tar.gz +sha256 fadfb81400a1b5d86d01943690064404856aaf1b050f4b56eb74811cadffdcef mongodb-r4.0.19.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/buildroot/package/mongodb/mongodb.mk b/buildroot/package/mongodb/mongodb.mk index 22ca920e1..31ea972b8 100644 --- a/buildroot/package/mongodb/mongodb.mk +++ b/buildroot/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION_BASE = 4.0.12 +MONGODB_VERSION_BASE = 4.0.19 MONGODB_VERSION = r$(MONGODB_VERSION_BASE) MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION)) diff --git a/buildroot/package/mtools/Config.in b/buildroot/package/mtools/Config.in index 99a073ca8..43e14e2c0 100644 --- a/buildroot/package/mtools/Config.in +++ b/buildroot/package/mtools/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_MTOOLS bool "mtools" depends on BR2_USE_WCHAR depends on BR2_USE_MMU # fork() + # runtime UTF conversion support + select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC help Mtools is a collection of utilities to access MS-DOS disks from Unix without mounting them. It supports Win'95 style diff --git a/buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch b/buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch new file mode 100644 index 000000000..913b6087b --- /dev/null +++ b/buildroot/package/mutt/0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch @@ -0,0 +1,60 @@ +From 3e88866dc60b5fa6aaba6fd7c1710c12c1c3cd01 Mon Sep 17 00:00:00 2001 +From: Kevin McCarthy +Date: Sun, 14 Jun 2020 11:30:00 -0700 +Subject: [PATCH] Prevent possible IMAP MITM via PREAUTH response. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is similar to CVE-2014-2567 and CVE-2020-12398. STARTTLS is not +allowed in the Authenticated state, so previously Mutt would +implicitly mark the connection as authenticated and skip any +encryption checking/enabling. + +No credentials are exposed, but it does allow messages to be sent to +an attacker, via postpone or fcc'ing for instance. + +Reuse the $ssl_starttls quadoption "in reverse" to prompt to abort the +connection if it is unencrypted. + +Thanks very much to Damian Poddebniak and Fabian Ising from the +Münster University of Applied Sciences for reporting this issue, and +their help in testing the fix. + +[Retrieved from: +https://gitlab.com/muttmua/mutt/commit/3e88866dc60b5fa6aaba6fd7c1710c12c1c3cd01] +Signed-off-by: Fabrice Fontaine +--- + imap/imap.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/imap/imap.c b/imap/imap.c +index 63362176..3ca10df4 100644 +--- a/imap/imap.c ++++ b/imap/imap.c +@@ -530,6 +530,22 @@ int imap_open_connection (IMAP_DATA* idata) + } + else if (ascii_strncasecmp ("* PREAUTH", idata->buf, 9) == 0) + { ++#if defined(USE_SSL) ++ /* An unencrypted PREAUTH response is most likely a MITM attack. ++ * Require a confirmation. */ ++ if (!idata->conn->ssf) ++ { ++ if (option(OPTSSLFORCETLS) || ++ (query_quadoption (OPT_SSLSTARTTLS, ++ _("Abort unencrypted PREAUTH connection?")) != MUTT_NO)) ++ { ++ mutt_error _("Encrypted connection unavailable"); ++ mutt_sleep (1); ++ goto err_close_conn; ++ } ++ } ++#endif ++ + idata->state = IMAP_AUTHENTICATED; + if (imap_check_capabilities (idata) != 0) + goto bail; +-- +GitLab + diff --git a/buildroot/package/mutt/mutt.hash b/buildroot/package/mutt/mutt.hash index f0b015322..f822cfee6 100644 --- a/buildroot/package/mutt/mutt.hash +++ b/buildroot/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 78423016b5f2fcb31bfd156999ff6638177be4459230d2ee61a81e5641d07378 mutt-1.13.3.tar.gz +sha256 6cd71b5b3e6b255afef6bed3b5e1e8ee9819b3d7c9839fd95e798045882aa653 mutt-1.13.5.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/buildroot/package/mutt/mutt.mk b/buildroot/package/mutt/mutt.mk index 9cf8304bf..5d400f8b8 100644 --- a/buildroot/package/mutt/mutt.mk +++ b/buildroot/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 1.13.3 +MUTT_VERSION = 1.13.5 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -13,6 +13,9 @@ MUTT_CONF_OPTS = --disable-doc --disable-smtp # We're patching configure.ac MUTT_AUTORECONF = YES +# 0003-Prevent-possible-IMAP-MITM-via-PREAUTH-response.patch +MUTT_IGNORE_CVES += CVE-2020-14093 + ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv MUTT_CONF_OPTS += --enable-iconv diff --git a/buildroot/package/nghttp2/nghttp2.hash b/buildroot/package/nghttp2/nghttp2.hash index e0512e891..3702a91b5 100644 --- a/buildroot/package/nghttp2/nghttp2.hash +++ b/buildroot/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fc820a305e2f410fade1a3260f09229f15c0494fc089b0100312cd64a33a38c0 nghttp2-1.39.2.tar.gz -sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING +sha256 eacc6f0f8543583ecd659faf0a3f906ed03826f1d4157b536b4b385fe47c5bb8 nghttp2-1.41.0.tar.gz +sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/buildroot/package/nghttp2/nghttp2.mk b/buildroot/package/nghttp2/nghttp2.mk index 6a5ec7284..7b611c88f 100644 --- a/buildroot/package/nghttp2/nghttp2.mk +++ b/buildroot/package/nghttp2/nghttp2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGHTTP2_VERSION = 1.39.2 +NGHTTP2_VERSION = 1.41.0 NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT NGHTTP2_LICENSE_FILES = COPYING diff --git a/buildroot/package/ngircd/ngircd.hash b/buildroot/package/ngircd/ngircd.hash index 3772bd6c1..72874c8d4 100644 --- a/buildroot/package/ngircd/ngircd.hash +++ b/buildroot/package/ngircd/ngircd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 c4997cae3e3dd6ff6a605ca274268f2b8c9ba0b1a96792c7402e5594222eee4e ngircd-25.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 56dcc6483058699fcdd8e54f5010eecee09824b93bad7ed5f18818e550d855c6 ngircd-26.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/ngircd/ngircd.mk b/buildroot/package/ngircd/ngircd.mk index 5fa86afdd..4859a29c2 100644 --- a/buildroot/package/ngircd/ngircd.mk +++ b/buildroot/package/ngircd/ngircd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGIRCD_VERSION = 25 +NGIRCD_VERSION = 26 NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz NGIRCD_SITE = https://arthur.barton.de/pub/ngircd NGIRCD_LICENSE = GPL-2.0+ @@ -18,8 +18,8 @@ NGIRCD_CONF_OPTS += --without-pam endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -NGIRCD_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr -NGIRCD_DEPENDENCIES += openssl +NGIRCD_CONF_OPTS += --with-openssl +NGIRCD_DEPENDENCIES += host-pkgconf openssl else NGIRCD_CONF_OPTS += --without-openssl ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/buildroot/package/nodejs/nodejs.hash b/buildroot/package/nodejs/nodejs.hash index 992040d39..60d69a863 100644 --- a/buildroot/package/nodejs/nodejs.hash +++ b/buildroot/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.16.1/SHASUMS256.txt -sha256 0a95845ba02c46102b5671d0c5732460073f2d397488337e18d1fc30146d412d node-v12.16.1.tar.xz +# From https://nodejs.org/dist/v12.18.0/SHASUMS256.txt +sha256 d4688636a378367f5157f02bd5c13902f5c193356f8f7a35c99dfa383b03b13f node-v12.18.0.tar.xz # Hash for license file -sha256 3f5749f7a58edaadd77843057a90063a18067f472d8b26c0a76905cafa1063e3 LICENSE +sha256 cd2e5817a25d7d28efba927b01056cae04a616b673014159f9eafeb008a0e747 LICENSE diff --git a/buildroot/package/nodejs/nodejs.mk b/buildroot/package/nodejs/nodejs.mk index 7f875058b..3f35ac7c3 100644 --- a/buildroot/package/nodejs/nodejs.mk +++ b/buildroot/package/nodejs/nodejs.mk @@ -4,13 +4,14 @@ # ################################################################################ -NODEJS_VERSION = 12.16.1 +NODEJS_VERSION = 12.18.0 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -215,6 +216,17 @@ define NODEJS_INSTALL_MODULES endef endif +define NODEJS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ + $(MAKE) -C $(@D) install \ + DESTDIR=$(STAGING_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + NO_LOAD=cctest.target.mk \ + PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ + LD="$(TARGET_CXX)" +endef + define NODEJS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ diff --git a/buildroot/package/ntp/ntp.hash b/buildroot/package/ntp/ntp.hash index fdb5bacad..3c2f6a95a 100644 --- a/buildroot/package/ntp/ntp.hash +++ b/buildroot/package/ntp/ntp.hash @@ -1,5 +1,5 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p14.tar.gz.md5 -md5 783edaf1d68ddf651bde64eda54a579d ntp-4.2.8p14.tar.gz +# From http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz.md5 +md5 e1e6b23d2fc75cced41801dbcd6c2561 ntp-4.2.8p15.tar.gz # Calculated based on the hash above -sha256 1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7 ntp-4.2.8p14.tar.gz +sha256 f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19 ntp-4.2.8p15.tar.gz sha256 957e6a13445cc61ab1ca3dc80d8c269cf9b0a6d9eaec20f9f39639b0b3e66ee8 COPYRIGHT diff --git a/buildroot/package/ntp/ntp.mk b/buildroot/package/ntp/ntp.mk index 3af3e01a5..f82eeae9b 100644 --- a/buildroot/package/ntp/ntp.mk +++ b/buildroot/package/ntp/ntp.mk @@ -5,7 +5,7 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p14 +NTP_VERSION = $(NTP_VERSION_MAJOR).8p15 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent NTP_LICENSE = NTP diff --git a/buildroot/package/open-plc-utils/open-plc-utils.mk b/buildroot/package/open-plc-utils/open-plc-utils.mk index e1e66bf7e..3030301f7 100644 --- a/buildroot/package/open-plc-utils/open-plc-utils.mk +++ b/buildroot/package/open-plc-utils/open-plc-utils.mk @@ -26,7 +26,8 @@ define OPEN_PLC_UTILS_BUILD_CMDS endef define OPEN_PLC_UTILS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) ROOTFS=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) ROOTFS=$(TARGET_DIR) \ + BIN="$(TARGET_DIR)/usr/bin" -C $(@D) install endef $(eval $(generic-package)) diff --git a/buildroot/package/open2300/open2300.mk b/buildroot/package/open2300/open2300.mk index 589d344b9..0ffb8b504 100644 --- a/buildroot/package/open2300/open2300.mk +++ b/buildroot/package/open2300/open2300.mk @@ -19,12 +19,8 @@ OPEN2300_LDFLAGS = $(TARGET_LDFLAGS) ifeq ($(BR2_PACKAGE_MYSQL),y) OPEN2300_DEPENDENCIES += mysql OPEN2300_BINS += mysql2300 mysqlhistlog2300 -OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql -OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -ifeq ($(BR2_STATIC_LIBS),y) -# mysql needs -lz, so we need to specify it for static builds -OPEN2300_LDFLAGS += -lz -endif +OPEN2300_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --cflags) +OPEN2300_LDFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --libs) endif define OPEN2300_BUILD_CMDS diff --git a/buildroot/package/openjdk-bin/openjdk-bin.mk b/buildroot/package/openjdk-bin/openjdk-bin.mk index e780a797e..90256f593 100644 --- a/buildroot/package/openjdk-bin/openjdk-bin.mk +++ b/buildroot/package/openjdk-bin/openjdk-bin.mk @@ -12,17 +12,20 @@ HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk13-binaries/relea HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION +HOST_OPENJDK_BIN_ROOT_DIR = $(HOST_DIR)/usr/lib/jvm + # unpack200 has an invalid RPATH and relies on libzlib. When # host-libzlib is installed on the system, the error "ERROR: package # host-libzlib installs executables without proper RPATH: will occur. # Because unpack200 is a deprecated tool, removing it to fix this # issue is safe. define HOST_OPENJDK_BIN_INSTALL_CMDS - mkdir -p $(HOST_DIR)/bin - cp -dpfr $(@D)/bin/* $(HOST_DIR)/bin/ - mkdir -p $(HOST_DIR)/lib - cp -dpfr $(@D)/lib/* $(HOST_DIR)/lib/ - $(RM) -f $(HOST_DIR)/bin/unpack200 + mkdir -p $(HOST_OPENJDK_BIN_ROOT_DIR) + cp -dpfr $(@D)/* $(HOST_OPENJDK_BIN_ROOT_DIR) + $(RM) -f $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/unpack200 endef $(eval $(host-generic-package)) + +# variables used by other packages +JAVAC = $(HOST_OPENJDK_BIN_ROOT_DIR)/bin/javac diff --git a/buildroot/package/openjdk/openjdk.mk b/buildroot/package/openjdk/openjdk.mk index 1f906517f..8a01060ff 100644 --- a/buildroot/package/openjdk/openjdk.mk +++ b/buildroot/package/openjdk/openjdk.mk @@ -76,7 +76,7 @@ OPENJDK_CONF_OPTS = \ --enable-openjdk-only \ --enable-unlimited-crypto \ --openjdk-target=$(GNU_TARGET_NAME) \ - --with-boot-jdk=$(HOST_DIR) \ + --with-boot-jdk=$(HOST_OPENJDK_BIN_ROOT_DIR) \ --with-stdc++lib=dynamic \ --with-debug-level=release \ --with-devkit=$(HOST_DIR) \ diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk index 0411133bd..9720fcdb0 100644 --- a/buildroot/package/openssh/openssh.mk +++ b/buildroot/package/openssh/openssh.mk @@ -39,6 +39,13 @@ else OPENSSH_CONF_OPTS += --without-ssl-engine endif +ifeq ($(BR2_PACKAGE_AUDIT),y) +OPENSSH_DEPENDENCIES += audit +OPENSSH_CONF_OPTS += --with-audit=linux +else +OPENSSH_CONF_OPTS += --without-audit +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define OPENSSH_INSTALL_PAM_CONF $(INSTALL) -D -m 644 $(@D)/contrib/sshd.pam.generic $(TARGET_DIR)/etc/pam.d/sshd diff --git a/buildroot/package/oracle-mysql/0008-gcc7.patch b/buildroot/package/oracle-mysql/0009-gcc7.patch similarity index 100% rename from buildroot/package/oracle-mysql/0008-gcc7.patch rename to buildroot/package/oracle-mysql/0009-gcc7.patch diff --git a/buildroot/package/oracle-mysql/0010-fix-build-without-zlib.patch b/buildroot/package/oracle-mysql/0010-fix-build-without-zlib.patch new file mode 100644 index 000000000..b6e64e6bd --- /dev/null +++ b/buildroot/package/oracle-mysql/0010-fix-build-without-zlib.patch @@ -0,0 +1,52 @@ +Fix build without zlib + +Don't include unconditionally zlib.h, and compile out code that +requires zlib support. + +Signed-off-by: Fabrice Fontaine + +diff -durN mysql-5.1.73.orig/mysys/checksum.c mysql-5.1.73/mysys/checksum.c +--- mysql-5.1.73.orig/mysys/checksum.c 2020-07-14 17:34:38.212304432 +0200 ++++ mysql-5.1.73/mysys/checksum.c 2020-07-14 18:06:45.076342493 +0200 +@@ -16,7 +16,9 @@ + + #include + #include ++#ifdef HAVE_COMPRESS + #include ++#endif + + /* + Calculate a long checksum for a memoryblock. +diff -durN mysql-5.1.73.orig/sql/item_strfunc.cc mysql-5.1.73/sql/item_strfunc.cc +--- mysql-5.1.73.orig/sql/item_strfunc.cc 2020-07-14 17:34:38.160304431 +0200 ++++ mysql-5.1.73/sql/item_strfunc.cc 2020-07-14 18:04:36.956339962 +0200 +@@ -35,7 +35,9 @@ + #include "my_md5.h" + #include "sha1.h" + #include "my_aes.h" ++#ifdef HAVE_COMPRESS + #include ++#endif + C_MODE_START + #include "../mysys/my_static.h" // For soundex_map + C_MODE_END +diff -durN mysql-5.1.73.orig/sql/sql_table.cc mysql-5.1.73/sql/sql_table.cc +--- mysql-5.1.73.orig/sql/sql_table.cc 2020-07-14 17:34:38.156304431 +0200 ++++ mysql-5.1.73/sql/sql_table.cc 2020-07-14 18:14:48.628352044 +0200 +@@ -1681,6 +1681,7 @@ + goto end; + } + } ++#ifdef HAVE_COMPRESS + if (flags & WFRM_PACK_FRM) + { + /* +@@ -1702,6 +1703,7 @@ + } + error= my_delete(shadow_frm_name, MYF(MY_WME)); + } ++#endif + if (flags & WFRM_INSTALL_SHADOW) + { + #ifdef WITH_PARTITION_STORAGE_ENGINE diff --git a/buildroot/package/oracle-mysql/oracle-mysql.mk b/buildroot/package/oracle-mysql/oracle-mysql.mk index 8a8613a3d..1449c58e4 100644 --- a/buildroot/package/oracle-mysql/oracle-mysql.mk +++ b/buildroot/package/oracle-mysql/oracle-mysql.mk @@ -68,6 +68,9 @@ endif ifeq ($(BR2_PACKAGE_ZLIB),y) ORACLE_MYSQL_DEPENDENCIES += zlib +ORACLE_MYSQL_CONF_OPTS += --with-zlib-dir=$(STAGING_DIR)/usr +else +ORACLE_MYSQL_CONF_OPTS += --without-zlib-dir endif ifeq ($(BR2_PACKAGE_ORACLE_MYSQL_SERVER),y) diff --git a/buildroot/package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch b/buildroot/package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch deleted file mode 100644 index 7989f045b..000000000 --- a/buildroot/package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 517e8659ab566b15cc409490a432e8935b164de8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 24 Apr 2020 11:55:41 +0200 -Subject: [PATCH] src/CMakeLists.txt: fix build on uclibc or musl - -Build of version 1.3.2 with uclibc or musl fails on: - -[ 58%] Linking C shared library libpaho-mqtt3c.so -/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/5.5.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lanl -collect2: error: ld returned 1 exit status - -This is due to commit 21ffebcb749fc8bd8578df85550f03f74e571620 which -added a link to anl which is not available on uclibc or musl. - -Fix this by checking if anl is found on the system before using it - -Fixes: - - http://autobuild.buildroot.org/results/4beb96d43180813906578b42875a1c3d4a905ed7 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/eclipse/paho.mqtt.c/commit/517e8659ab566b15cc409490a432e8935b164de8] ---- - src/CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fb367b37..95fd43e7 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -60,7 +60,13 @@ IF (WIN32) - SET(LIBS_SYSTEM ws2_32 crypt32 RpcRT4) - ELSEIF (UNIX) - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") -- SET(LIBS_SYSTEM c dl pthread anl rt) -+ SET(LIBS_SYSTEM c dl pthread rt) -+ # anl is only available with glibc so check if it is found before using -+ # it or build will fail on uclibc or musl -+ FIND_LIBRARY(LIB_ANL anl) -+ IF(LIB_ANL) -+ SET(LIBS_SYSTEM "${LIBS_SYSTEM} ${LIB_ANL}") -+ ENDIF() - ADD_DEFINITIONS(-D_GNU_SOURCE -fvisibility=hidden) - ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Android") - SET(LIBS_SYSTEM c dl) diff --git a/buildroot/package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch b/buildroot/package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch deleted file mode 100644 index ee4c2307e..000000000 --- a/buildroot/package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 342b3824d261f552a7be5dac7a242c263d9b9fd4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 1 May 2020 12:41:59 +0200 -Subject: [PATCH] Revert "Enable CXX language to support using - GenerateExportHeader" - -This reverts commit 23d68e8c798d29309a277fb3c869c23f9cac2bbf. Indeed, -GenerateExportHeader has been removed with commit -db5a2c216b122c57dc281aea2f3b7afa210dc0fc and ENABLE_LANGUAGE(CXX) will -raise the following build failure if no C++ compiler is found: - -CMake Error at CMakeLists.txt:34 (ENABLE_LANGUAGE): - The CMAKE_CXX_COMPILER: - - /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -Fixes: - - http://autobuild.buildroot.org/results/831ecc34b51ee2be82a3c25f5ec94f0dd2103655 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/eclipse/paho.mqtt.c/pull/872] ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c52a42e..a290730 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,7 +31,6 @@ file(READ version.minor PAHO_VERSION_MINOR) - file(READ version.patch PAHO_VERSION_PATCH) - SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH}) - --ENABLE_LANGUAGE(CXX) - INCLUDE(GNUInstallDirs) - - STRING(TIMESTAMP BUILD_TIMESTAMP UTC) --- -2.26.2 - diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash index 8f6ca6148..bbfa2da38 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 c426334c2ffc9f7a230e3de5162bdbc1762f8f60ffe27460e553edb74c7e0681 paho-mqtt-c-1.3.2.tar.gz +sha256 1ae9b657b693254ed0710350df3dcf5232d1f479409a52861b5e5bb5cc3da046 paho-mqtt-c-1.3.4.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 99d3a5c5cc2812f0593a85ec7c1b6dd83e8477b5090c01d9de0d49d49f367a4a LICENSE diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk index c7ecf412c..aa2a0b026 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.2 +PAHO_MQTT_C_VERSION = 1.3.4 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE diff --git a/buildroot/package/pcre/0001-Kill-compatibility-bits.patch b/buildroot/package/pcre/0001-Kill-compatibility-bits.patch index 3563e4b71..d2cf76bf8 100644 --- a/buildroot/package/pcre/0001-Kill-compatibility-bits.patch +++ b/buildroot/package/pcre/0001-Kill-compatibility-bits.patch @@ -7,6 +7,8 @@ Kill ABI compatibility bits, we don't need them. Fixes build failures on non-ELF targets. Signed-off-by: Gustavo Zacarias +[Fabrice: update for 8.44] +Signed-off-by: Fabrice Fontaine --- pcrecpp.cc | 16 ---------------- 1 file changed, 16 deletions(-) @@ -15,7 +17,7 @@ diff --git a/pcrecpp.cc b/pcrecpp.cc index d09c9ab..6910db0 100644 --- a/pcrecpp.cc +++ b/pcrecpp.cc -@@ -58,22 +58,6 @@ static const int kVecSize = (1 + kMaxArgs) * 3; // results + PCRE workspace +@@ -58,23 +58,6 @@ static const int kVecSize = (1 + kMaxArgs) * 3; // results + PCRE workspace // Special object that stands-in for no argument Arg RE::no_arg((void*)NULL); @@ -27,7 +29,8 @@ index d09c9ab..6910db0 100644 -// inclusive test if we ever needed it. (Note that not only the -// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are -// gnu-specific.) --#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) && !defined(__INTEL_COMPILER) +-#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) \ +- && !defined(__INTEL_COMPILER) && !defined(__LCC__) -# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x) -# define ULP_AS_STRING_INTERNAL(x) #x -# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__) diff --git a/buildroot/package/pcre/pcre.hash b/buildroot/package/pcre/pcre.hash index 7513d5f19..628d61735 100644 --- a/buildroot/package/pcre/pcre.hash +++ b/buildroot/package/pcre/pcre.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b pcre-8.43.tar.bz2 +sha256 19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d pcre-8.44.tar.bz2 # License files, locally calculated -sha256 a5fce68baf797e0918463a4437ef75984c41118f43850ddeabda1b5a90154309 LICENCE +sha256 0dd9c13864dbb9ee4d77a1557e96be29b2d719fb6584192ee36611aae264c4a3 LICENCE diff --git a/buildroot/package/pcre/pcre.mk b/buildroot/package/pcre/pcre.mk index 595cda8a5..3c280e593 100644 --- a/buildroot/package/pcre/pcre.mk +++ b/buildroot/package/pcre/pcre.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE_VERSION = 8.43 +PCRE_VERSION = 8.44 PCRE_SITE = https://ftp.pcre.org/pub/pcre PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_LICENSE = BSD-3-Clause diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index 0267375f6..47879eecc 100644 --- a/buildroot/package/php/php.hash +++ b/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 d740322f84f63019622b9f369d64ea5ab676547d2bdcf12be77a5a4cffd06832 php-7.4.6.tar.xz +sha256 642843890b732e8af01cb661e823ae01472af1402f211c83009c9b3abd073245 php-7.4.8.tar.xz # License file sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index 73be57a8a..48af0f6fd 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.6 +PHP_VERSION = 7.4.8 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES diff --git a/buildroot/package/pkg-download.mk b/buildroot/package/pkg-download.mk index de619ba90..951d2fb55 100644 --- a/buildroot/package/pkg-download.mk +++ b/buildroot/package/pkg-download.mk @@ -99,7 +99,7 @@ endif define DOWNLOAD $(Q)mkdir -p $($(2)_DL_DIR) - $(Q)$(EXTRA_ENV) flock $($(2)_DL_DIR)/ $(DL_WRAPPER) \ + $(Q)$(EXTRA_ENV) flock $($(2)_DL_DIR)/.lock $(DL_WRAPPER) \ -c '$($(2)_DL_VERSION)' \ -d '$($(2)_DL_DIR)' \ -D '$(DL_DIR)' \ diff --git a/buildroot/package/pkg-python.mk b/buildroot/package/pkg-python.mk index 4bf762e66..59a48e5a8 100644 --- a/buildroot/package/pkg-python.mk +++ b/buildroot/package/pkg-python.mk @@ -20,9 +20,11 @@ # ################################################################################ -define PKG_PYTHON_SYSCONFIGDATA_NAME -$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py))) -endef +# basename does not evaluate if a file exists, so we must check to ensure +# the _sysconfigdata__linux_*.py file exists. The "|| true" is added to return +# an empty string if the file does not exist. +PKG_PYTHON_SYSCONFIGDATA_PATH = $(PYTHON3_PATH)/_sysconfigdata__linux_*.py +PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true` # Target distutils-based packages PKG_PYTHON_DISTUTILS_ENV = \ diff --git a/buildroot/package/poco/Config.in b/buildroot/package/poco/Config.in index f8f921de0..05e56eb6b 100644 --- a/buildroot/package/poco/Config.in +++ b/buildroot/package/poco/Config.in @@ -1,3 +1,13 @@ +config BR2_PACKAGE_POCO_ARCH_SUPPORTS + bool + default y + depends on !BR2_arc + depends on !BR2_microblaze + depends on !BR2_mipsel + depends on !BR2_or1k + depends on !BR2_riscv + depends on !BR2_xtensa + config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP @@ -5,8 +15,7 @@ config BR2_PACKAGE_POCO # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_riscv || BR2_xtensa) + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_PCRE help @@ -85,5 +94,4 @@ endif # BR2_PACKAGE_POCO comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_xtensa) + depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS diff --git a/buildroot/package/prosody/Config.in b/buildroot/package/prosody/Config.in index 0b0154710..c32ca20e2 100644 --- a/buildroot/package/prosody/Config.in +++ b/buildroot/package/prosody/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime + select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime diff --git a/buildroot/package/putty/putty.hash b/buildroot/package/putty/putty.hash index 8600281ef..3885cef9b 100644 --- a/buildroot/package/putty/putty.hash +++ b/buildroot/package/putty/putty.hash @@ -1,7 +1,8 @@ -# Hashes from: http://the.earth.li/~sgtatham/putty/0.73/{sha1,sha256,sha512}sums -sha1 17daebb82e476adfd578f6934c28f4d2c209b7d8 putty-0.73.tar.gz -sha256 3db0b5403fb41aecd3aa506611366650d927650b6eb3d839ad4dcc782519df1c putty-0.73.tar.gz -sha512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5 putty-0.73.tar.gz +# Hashes from: http://the.earth.li/~sgtatham/putty/0.74/{md5,sha1,sha256,sha512}sums +md5 dbfa58f22a91b22b7489173e9dd09e30 putty-0.74.tar.gz +sha1 17b160e9720f67f9af9399d7d185b913b81f18fe putty-0.74.tar.gz +sha256 ddd5d388e51dd9e6e294005b30037f6ae802239a44c9dc9808c779e6d11b847d putty-0.74.tar.gz +sha512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b putty-0.74.tar.gz # Locally calculated -sha256 b517b4a9504ba0f651d5e590245197b88d9a81d073905cc798cc9464c5ca7ba8 LICENCE +sha256 92028b6d56212bd3e4ce6a36bd2e2454851dca7e8ffe4c6ab51385ca214ca322 LICENCE diff --git a/buildroot/package/putty/putty.mk b/buildroot/package/putty/putty.mk index 5313a4f8b..8f9564bc3 100644 --- a/buildroot/package/putty/putty.mk +++ b/buildroot/package/putty/putty.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUTTY_VERSION = 0.73 +PUTTY_VERSION = 0.74 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE diff --git a/buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch b/buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch new file mode 100644 index 000000000..9fe15ad7b --- /dev/null +++ b/buildroot/package/python-twisted/0001-fix-several-request-smuggling-attacks.patch @@ -0,0 +1,271 @@ +From 4a7d22e490bb8ff836892cc99a1f54b85ccb0281 Mon Sep 17 00:00:00 2001 +From: Mark Williams +Date: Sun, 16 Feb 2020 19:00:10 -0800 +Subject: [PATCH] Fix several request smuggling attacks. + +1. Requests with multiple Content-Length headers were allowed (thanks +to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400; + +2. Requests with a Content-Length header and a Transfer-Encoding +header honored the first header (thanks to Jake Miller from Bishop +Fox) and now fail with a 400; + +3. Requests whose Transfer-Encoding header had a value other than +"chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail +with a 400. + +Fixes CVE-2020-10108 & CVE-2020-10109 - HTTP request splitting +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10108 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10109 + +Upstream: +https://github.com/twisted/twisted/commit/4a7d22e490bb8ff836892cc99a1f54b85ccb0281 + +Signed-off-by: Matthew Weber + + +--- + src/twisted/web/http.py | 64 +++++++--- + src/twisted/web/newsfragments/9770.bugfix | 1 + + src/twisted/web/test/test_http.py | 137 ++++++++++++++++++++++ + 3 files changed, 187 insertions(+), 15 deletions(-) + create mode 100644 src/twisted/web/newsfragments/9770.bugfix + +diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py +index f0fb05b4d69..06d830fe30f 100644 +--- a/src/twisted/web/http.py ++++ b/src/twisted/web/http.py +@@ -2171,6 +2171,51 @@ def _finishRequestBody(self, data): + self.allContentReceived() + self._dataBuffer.append(data) + ++ def _maybeChooseTransferDecoder(self, header, data): ++ """ ++ If the provided header is C{content-length} or ++ C{transfer-encoding}, choose the appropriate decoder if any. ++ ++ Returns L{True} if the request can proceed and L{False} if not. ++ """ ++ ++ def fail(): ++ self._respondToBadRequestAndDisconnect() ++ self.length = None ++ ++ # Can this header determine the length? ++ if header == b'content-length': ++ try: ++ length = int(data) ++ except ValueError: ++ fail() ++ return False ++ newTransferDecoder = _IdentityTransferDecoder( ++ length, self.requests[-1].handleContentChunk, self._finishRequestBody) ++ elif header == b'transfer-encoding': ++ # XXX Rather poorly tested code block, apparently only exercised by ++ # test_chunkedEncoding ++ if data.lower() == b'chunked': ++ length = None ++ newTransferDecoder = _ChunkedTransferDecoder( ++ self.requests[-1].handleContentChunk, self._finishRequestBody) ++ elif data.lower() == b'identity': ++ return True ++ else: ++ fail() ++ return False ++ else: ++ # It's not a length related header, so exit ++ return True ++ ++ if self._transferDecoder is not None: ++ fail() ++ return False ++ else: ++ self.length = length ++ self._transferDecoder = newTransferDecoder ++ return True ++ + + def headerReceived(self, line): + """ +@@ -2196,21 +2241,10 @@ def headerReceived(self, line): + + header = header.lower() + data = data.strip() +- if header == b'content-length': +- try: +- self.length = int(data) +- except ValueError: +- self._respondToBadRequestAndDisconnect() +- self.length = None +- return False +- self._transferDecoder = _IdentityTransferDecoder( +- self.length, self.requests[-1].handleContentChunk, self._finishRequestBody) +- elif header == b'transfer-encoding' and data.lower() == b'chunked': +- # XXX Rather poorly tested code block, apparently only exercised by +- # test_chunkedEncoding +- self.length = None +- self._transferDecoder = _ChunkedTransferDecoder( +- self.requests[-1].handleContentChunk, self._finishRequestBody) ++ ++ if not self._maybeChooseTransferDecoder(header, data): ++ return False ++ + reqHeaders = self.requests[-1].requestHeaders + values = reqHeaders.getRawHeaders(header) + if values is not None: +diff --git a/src/twisted/web/newsfragments/9770.bugfix b/src/twisted/web/newsfragments/9770.bugfix +new file mode 100644 +index 00000000000..4f1be97de8a +--- /dev/null ++++ b/src/twisted/web/newsfragments/9770.bugfix +@@ -0,0 +1 @@ ++Fix several request smuggling attacks: requests with multiple Content-Length headers were allowed (thanks to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400; requests with a Content-Length header and a Transfer-Encoding header honored the first header (thanks to Jake Miller from Bishop Fox) and now fail with a 400; requests whose Transfer-Encoding header had a value other than "chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail a 400. +\ No newline at end of file +diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py +index 0a0db09b750..578cb500cda 100644 +--- a/src/twisted/web/test/test_http.py ++++ b/src/twisted/web/test/test_http.py +@@ -2252,6 +2252,143 @@ def process(self): + self.flushLoggedErrors(AttributeError) + + ++ def assertDisconnectingBadRequest(self, request): ++ """ ++ Assert that the given request bytes fail with a 400 bad ++ request without calling L{Request.process}. ++ ++ @param request: A raw HTTP request ++ @type request: L{bytes} ++ """ ++ class FailedRequest(http.Request): ++ processed = False ++ def process(self): ++ FailedRequest.processed = True ++ ++ channel = self.runRequest(request, FailedRequest, success=False) ++ self.assertFalse(FailedRequest.processed, "Request.process called") ++ self.assertEqual( ++ channel.transport.value(), ++ b"HTTP/1.1 400 Bad Request\r\n\r\n") ++ self.assertTrue(channel.transport.disconnecting) ++ ++ ++ def test_duplicateContentLengths(self): ++ """ ++ A request which includes multiple C{content-length} headers ++ fails with a 400 response without calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Content-Length: 56', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_duplicateContentLengthsWithPipelinedRequests(self): ++ """ ++ Two pipelined requests, the first of which includes multiple ++ C{content-length} headers, trigger a 400 response without ++ calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Content-Length: 56', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ b'GET /a HTTP/1.1', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_contentLengthAndTransferEncoding(self): ++ """ ++ A request that includes both C{content-length} and ++ C{transfer-encoding} headers fails with a 400 response without ++ calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Transfer-Encoding: chunked', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_contentLengthAndTransferEncodingWithPipelinedRequests(self): ++ """ ++ Two pipelined requests, the first of which includes both ++ C{content-length} and C{transfer-encoding} headers, triggers a ++ 400 response without calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Transfer-Encoding: chunked', ++ b'Content-Length: 0', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ b'GET /a HTTP/1.1', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_unknownTransferEncoding(self): ++ """ ++ A request whose C{transfer-encoding} header includes a value ++ other than C{chunked} or C{identity} fails with a 400 response ++ without calling L{Request.process}. ++ """ ++ self.assertRequestRejected([ ++ b'GET /a HTTP/1.1', ++ b'Transfer-Encoding: unknown', ++ b'Host: host.invalid', ++ b'', ++ b'', ++ ]) ++ ++ ++ def test_transferEncodingIdentity(self): ++ """ ++ A request with a valid C{content-length} and a ++ C{transfer-encoding} whose value is C{identity} succeeds. ++ """ ++ body = [] ++ ++ class SuccessfulRequest(http.Request): ++ processed = False ++ def process(self): ++ body.append(self.content.read()) ++ self.setHeader(b'content-length', b'0') ++ self.finish() ++ ++ request = b'''\ ++GET / HTTP/1.1 ++Host: host.invalid ++Content-Length: 2 ++Transfer-Encoding: identity ++ ++ok ++''' ++ channel = self.runRequest(request, SuccessfulRequest, False) ++ self.assertEqual(body, [b'ok']) ++ self.assertEqual( ++ channel.transport.value(), ++ b'HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n', ++ ) ++ ++ + + class QueryArgumentsTests(unittest.TestCase): + def testParseqs(self): diff --git a/buildroot/package/python-urllib3/python-urllib3.hash b/buildroot/package/python-urllib3/python-urllib3.hash index 91b9e4462..b1602350b 100644 --- a/buildroot/package/python-urllib3/python-urllib3.hash +++ b/buildroot/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz -sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz +# sha256 from https://pypi.org/pypi/urllib3/json +sha256 3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527 urllib3-1.25.9.tar.gz # Locally computed sha256 checksums sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt diff --git a/buildroot/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk index 8383cbe8e..b17a4c0cb 100644 --- a/buildroot/package/python-urllib3/python-urllib3.mk +++ b/buildroot/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.25.6 +PYTHON_URLLIB3_VERSION = 1.25.9 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/05/8c/40cd6949373e23081b3ea20d5594ae523e681b6f472e600fbc95ed046a36 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_SETUP_TYPE = setuptools diff --git a/buildroot/package/python-validators/python-validators.mk b/buildroot/package/python-validators/python-validators.mk index e24ce35fd..594c1d26e 100644 --- a/buildroot/package/python-validators/python-validators.mk +++ b/buildroot/package/python-validators/python-validators.mk @@ -8,7 +8,7 @@ PYTHON_VALIDATORS_VERSION = 0.14.2 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/4d/56/9b48c918ef118ea12b90f227c4498ed4703b418bdd8fb49479dfcbeae4ef PYTHON_VALIDATORS_SETUP_TYPE = setuptools -PYTHON_VALIDATORS_LICENSE = BSD +PYTHON_VALIDATORS_LICENSE = MIT PYTHON_VALIDATORS_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 00a688477..1010d08d5 100644 --- a/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -38,7 +38,7 @@ diff --git a/configure.ac b/configure.ac index a189d42c2c..4690cdba9f 100644 --- a/configure.ac +++ b/configure.ac -@@ -1085,6 +1085,12 @@ fi +@@ -1091,6 +1091,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) diff --git a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 95db44a4d..e9e5b32ca 100644 --- a/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -13,7 +13,7 @@ diff --git a/configure.ac b/configure.ac index 4690cdba9f..ffeec102b7 100644 --- a/configure.ac +++ b/configure.ac -@@ -4059,7 +4059,7 @@ fi +@@ -4080,7 +4080,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) diff --git a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 9bdd9b489..c4620949b 100644 --- a/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -78,7 +78,7 @@ diff --git a/configure.ac b/configure.ac index ffeec102b7..7872b4dfee 100644 --- a/configure.ac +++ b/configure.ac -@@ -2952,6 +2952,8 @@ LIBS="$withval $LIBS" +@@ -2958,6 +2958,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG diff --git a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch index d34a2883a..675c2c1ab 100644 --- a/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ b/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch @@ -95,7 +95,7 @@ diff --git a/configure.ac b/configure.ac index 7872b4dfee..b820d18c7c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3213,6 +3213,11 @@ if test "$posix_threads" = "yes"; then +@@ -3234,6 +3234,11 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi diff --git a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch index cdcabc0c1..a3436e31b 100644 --- a/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch @@ -54,7 +54,7 @@ diff --git a/configure.ac b/configure.ac index b820d18c7c..f53cc86d89 100644 --- a/configure.ac +++ b/configure.ac -@@ -3213,6 +3213,12 @@ if test "$posix_threads" = "yes"; then +@@ -3234,6 +3234,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi diff --git a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch index 03064612a..1bd1ae511 100644 --- a/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch @@ -80,7 +80,7 @@ diff --git a/configure.ac b/configure.ac index f53cc86d89..caa8eaf88a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3225,6 +3225,12 @@ AC_ARG_ENABLE(test-modules, +@@ -3246,6 +3246,12 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) diff --git a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch index 4f5e0dbd8..364d1b1ec 100644 --- a/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch @@ -48,7 +48,7 @@ diff --git a/configure.ac b/configure.ac index caa8eaf88a..79a8255f44 100644 --- a/configure.ac +++ b/configure.ac -@@ -3213,6 +3213,15 @@ if test "$posix_threads" = "yes"; then +@@ -3234,6 +3234,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi diff --git a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch index b248ecd40..eb0ad26da 100644 --- a/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch @@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac index 79a8255f44..b5922451cc 100644 --- a/configure.ac +++ b/configure.ac -@@ -3222,6 +3222,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3243,6 +3243,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi diff --git a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch index d442f7b80..0628669b9 100644 --- a/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch @@ -41,7 +41,7 @@ diff --git a/configure.ac b/configure.ac index b5922451cc..ea422a86a9 100644 --- a/configure.ac +++ b/configure.ac -@@ -3231,6 +3231,15 @@ if test "$TK" = "no"; then +@@ -3252,6 +3252,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi diff --git a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch index 3015d1e10..e31f3e105 100644 --- a/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch @@ -47,7 +47,7 @@ diff --git a/configure.ac b/configure.ac index ea422a86a9..3c1e2c088d 100644 --- a/configure.ac +++ b/configure.ac -@@ -2955,13 +2955,21 @@ PKG_PROG_PKG_CONFIG +@@ -2961,13 +2961,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library diff --git a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch index dfe8614a5..1b18c5459 100644 --- a/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index 3c1e2c088d..30a92f9c2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3230,6 +3230,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3251,6 +3251,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi diff --git a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch index 35bfe5aed..71645be9f 100644 --- a/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 30a92f9c2e..20f326db46 100644 --- a/configure.ac +++ b/configure.ac -@@ -3236,6 +3236,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3257,6 +3257,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) diff --git a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch index a8ec0e499..3805e1aad 100644 --- a/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index 20f326db46..99bbc37b07 100644 --- a/configure.ac +++ b/configure.ac -@@ -3242,6 +3242,12 @@ AC_ARG_ENABLE(nis, +@@ -3263,6 +3263,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) diff --git a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch index bb23879e3..3a138f966 100644 --- a/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch @@ -52,7 +52,7 @@ diff --git a/configure.ac b/configure.ac index 99bbc37b07..8c9706582e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3284,6 +3284,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -3305,6 +3305,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) diff --git a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch index 7d96f5c41..5906f9d38 100644 --- a/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac index 8c9706582e..e6255babb6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3006,13 +3006,20 @@ fi +@@ -3012,13 +3012,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -44,8 +44,8 @@ index 8c9706582e..e6255babb6 100644 +fi +AC_SUBST(MPDEC) - # Check for support for loadable sqlite extensions - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) + # Check whether _decimal should use a coroutine-local or thread-local context + AC_MSG_CHECKING(for --with-decimal-contextvar) diff --git a/setup.py b/setup.py index 9f09b3d985..a7f2e23d87 100644 --- a/setup.py diff --git a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch index 56f56adfc..55ba22a0e 100644 --- a/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -12,9 +12,9 @@ diff --git a/configure.ac b/configure.ac index e6255babb6..5809233aac 100644 --- a/configure.ac +++ b/configure.ac -@@ -3021,6 +3021,12 @@ else - fi - AC_SUBST(MPDEC) +@@ -3042,6 +3042,12 @@ fi + + AC_MSG_RESULT($with_decimal_contextvar) +AC_ARG_ENABLE(ossaudiodev, + AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), diff --git a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch index ced3fa93e..814ffdb56 100644 --- a/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index 5809233aac..6b09bafda4 100644 --- a/configure.ac +++ b/configure.ac -@@ -3261,6 +3261,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3282,6 +3282,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) diff --git a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch index e70c9984e..30651244f 100644 --- a/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index 6b09bafda4..b64518eed5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3267,6 +3267,12 @@ AC_ARG_ENABLE(openssl, +@@ -3288,6 +3288,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) diff --git a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index 004b3d1c8..330b549c0 100644 --- a/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index b64518eed5..d07e371c57 100644 --- a/configure.ac +++ b/configure.ac -@@ -3273,6 +3273,24 @@ AC_ARG_ENABLE(readline, +@@ -3294,6 +3294,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) diff --git a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch index a777475c9..6ea5f6859 100644 --- a/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/buildroot/package/python3/0031-Add-an-option-to-disable-uuid-module.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index d07e371c57..55ab6c3c26 100644 --- a/configure.ac +++ b/configure.ac -@@ -3309,6 +3309,15 @@ if test "$CURSES" = "no"; then +@@ -3330,6 +3330,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi diff --git a/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 5a5a104dc..2f5f7a8bf 100644 --- a/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/buildroot/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -32,7 +32,7 @@ diff --git a/configure.ac b/configure.ac index 55ab6c3c26..4a6d0662ac 100644 --- a/configure.ac +++ b/configure.ac -@@ -700,7 +700,9 @@ then +@@ -706,7 +706,9 @@ then fi diff --git a/buildroot/package/python3/python3.hash b/buildroot/package/python3/python3.hash index cb7c6b2f2..0a08d04b3 100644 --- a/buildroot/package/python3/python3.hash +++ b/buildroot/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-382/ -md5 e9d6ebc92183a177b8e8a58cad5b8d67 Python-3.8.2.tar.xz +# From https://www.python.org/downloads/release/python-385/ +md5 35b5a3d0254c1c59be9736373d429db7 Python-3.8.5.tar.xz # Locally computed -sha256 2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df Python-3.8.2.tar.xz +sha256 e3003ed57db17e617acb382b0cade29a248c6026b1bd8aad1f976e9af66a83b0 Python-3.8.5.tar.xz sha256 de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23 LICENSE diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk index 2656037ef..31e7ca3d3 100644 --- a/buildroot/package/python3/python3.mk +++ b/buildroot/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.8 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).5 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others diff --git a/buildroot/package/qt5/qt5declarative/Config.in b/buildroot/package/qt5/qt5declarative/Config.in index 3a353a832..d85f4c713 100644 --- a/buildroot/package/qt5/qt5declarative/Config.in +++ b/buildroot/package/qt5/qt5declarative/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5XMLPATTERNS select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI help diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.mk b/buildroot/package/qt5/qt5declarative/qt5declarative.mk index 621061196..200a5578f 100644 --- a/buildroot/package/qt5/qt5declarative/qt5declarative.mk +++ b/buildroot/package/qt5/qt5declarative/qt5declarative.mk @@ -7,7 +7,7 @@ QT5DECLARATIVE_VERSION = $(QT5_VERSION) QT5DECLARATIVE_SITE = $(QT5_SITE) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz -QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns +QT5DECLARATIVE_DEPENDENCIES = qt5base QT5DECLARATIVE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 6ed247fd5..5ce4064cb 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -21,6 +21,10 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples) endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5XMLPATTERNS_DEPENDENCIES += qt5declarative +endif + define QT5XMLPATTERNS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) endef @@ -39,6 +43,12 @@ define QT5XMLPATTERNS_INSTALL_TARGET_LIBS endef endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +define QT5XMLPATTERNS_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/XmlListModel $(TARGET_DIR)/usr/qml/QtQuick +endef +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/ @@ -47,6 +57,7 @@ endif define QT5XMLPATTERNS_INSTALL_TARGET_CMDS $(QT5XMLPATTERNS_INSTALL_TARGET_LIBS) + $(QT5XMLPATTERNS_INSTALL_TARGET_QMLS) $(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES) endef diff --git a/buildroot/package/readline/Config.in b/buildroot/package/readline/Config.in index 1cb0672cf..702147262 100644 --- a/buildroot/package/readline/Config.in +++ b/buildroot/package/readline/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_READLINE by applications that allow users to edit command lines as they are typed in. - https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html + https://tiswww.case.edu/php/chet/readline/rltop.html diff --git a/buildroot/package/redis/redis.hash b/buildroot/package/redis/redis.hash index ee15b75e0..7fd6f1b0d 100644 --- a/buildroot/package/redis/redis.hash +++ b/buildroot/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha256 f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7 redis-5.0.8.tar.gz +sha256 53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85 redis-5.0.9.tar.gz # Locally calculated sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING diff --git a/buildroot/package/redis/redis.mk b/buildroot/package/redis/redis.mk index d3954d87c..baef2e235 100644 --- a/buildroot/package/redis/redis.mk +++ b/buildroot/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 5.0.8 +REDIS_VERSION = 5.0.9 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING diff --git a/buildroot/package/rpi-firmware/Config.in b/buildroot/package/rpi-firmware/Config.in index cced53f01..f5a25c568 100644 --- a/buildroot/package/rpi-firmware/Config.in +++ b/buildroot/package/rpi-firmware/Config.in @@ -62,11 +62,12 @@ endchoice config BR2_PACKAGE_RPI_FIRMWARE_BOOT string - default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT + default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI + default "4" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - default "x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + default "4x" if BR2_PACKAGE_RPI_FIRMWARE_X && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI - default "cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 + default "4cd" if BR2_PACKAGE_RPI_FIRMWARE_CD && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS bool "Install Device Tree Blobs (DTBs)" diff --git a/buildroot/package/rpi-firmware/config.txt b/buildroot/package/rpi-firmware/config.txt index 58cc966a8..4a92a4dd9 100644 --- a/buildroot/package/rpi-firmware/config.txt +++ b/buildroot/package/rpi-firmware/config.txt @@ -4,6 +4,11 @@ # See http://buildroot.org/manual.html#rootfs-custom # and http://elinux.org/RPiconfig for a description of config.txt syntax +# We always use the same names, the real used variant is selected by +# BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice +start_file=start.elf +fixup_file=fixup.dat + kernel=zImage # To use an external initramfs file diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk index e6abfdf26..8d73aa698 100644 --- a/buildroot/package/rpi-firmware/rpi-firmware.mk +++ b/buildroot/package/rpi-firmware/rpi-firmware.mk @@ -41,24 +41,19 @@ define RPI_FIRMWARE_INSTALL_TARGET_CMDS endef endif # INSTALL_VCDBG -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4),y) +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI),y) # bootcode.bin is not used on rpi4, because it has been replaced by boot code in the onboard EEPROM -define RPI_FIRMWARE_INSTALL_BOOT - $(INSTALL) -D -m 0644 $(@D)/boot/start4$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start4.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup4$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup4.dat -endef -else -define RPI_FIRMWARE_INSTALL_BOOT +define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin - $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat endef endif define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt - $(RPI_FIRMWARE_INSTALL_BOOT) + $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf + $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat + $(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) endef diff --git a/buildroot/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch b/buildroot/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch new file mode 100644 index 000000000..d323e8f93 --- /dev/null +++ b/buildroot/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch @@ -0,0 +1,28 @@ +From f41695e4069404639690d98c7aadfe72117965a6 Mon Sep 17 00:00:00 2001 +From: Jesper Skov +Date: Fri, 25 Oct 2019 10:05:41 +0200 +Subject: [PATCH] Fix implicit fallthrough comments for kernel 5.3 + +[Upstram: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/e8a30a4c5a80efbbd5b1dbfe11b22916df4492f9.patch] +Signed-off-by: Peter Seiderer +--- + core/rtw_mlme_ext.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c +index 24565ea..380f507 100644 +--- a/core/rtw_mlme_ext.c ++++ b/core/rtw_mlme_ext.c +@@ -758,7 +758,9 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) + else + ptable->func = &OnAuthClient; + //pass through ++ //fallthrough + case WIFI_ASSOCREQ: ++ //fallthrough + case WIFI_REASSOCREQ: + _mgt_dispatcher(padapter, ptable, precv_frame); + #ifdef CONFIG_HOSTAPD_MLME +-- +2.26.0 + diff --git a/buildroot/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch b/buildroot/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch new file mode 100644 index 000000000..6b1b70270 --- /dev/null +++ b/buildroot/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch @@ -0,0 +1,168 @@ +From b7f8f8572d5abca6e1f0163a583628c0207d0be4 Mon Sep 17 00:00:00 2001 +From: Jesper Skov +Date: Fri, 25 Oct 2019 10:10:29 +0200 +Subject: [PATCH] Fix kernel 5.3 driver crashes, from aircrack-ng/rtl8812au#421 + +[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/822b485d36d6f72304a219c3be228f40968b542b.patch] +Signed-off-by: Peter Seiderer +--- + os_dep/linux/rtw_cfgvendor.c | 45 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/linux/rtw_cfgvendor.c +index e7ba90a..81fc8af 100644 +--- a/os_dep/linux/rtw_cfgvendor.c ++++ b/os_dep/linux/rtw_cfgvendor.c +@@ -1173,6 +1173,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = BRCM_VENDOR_SCMD_PRIV_STR + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_priv_string_handler + }, + #if defined(GSCAN_SUPPORT) && 0 +@@ -1182,6 +1185,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_gscan_get_capabilities + }, + { +@@ -1190,6 +1196,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_SET_CONFIG + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_set_scan_cfg + }, + { +@@ -1198,6 +1207,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_set_batch_scan_cfg + }, + { +@@ -1206,6 +1218,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_initiate_gscan + }, + { +@@ -1214,6 +1229,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_enable_full_scan_result + }, + { +@@ -1222,6 +1240,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_SET_HOTLIST + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_hotlist_cfg + }, + { +@@ -1230,6 +1251,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_significant_change_cfg + }, + { +@@ -1238,6 +1262,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_gscan_get_batch_results + }, + { +@@ -1246,6 +1273,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_gscan_get_channel_list + }, + #endif /* GSCAN_SUPPORT */ +@@ -1256,6 +1286,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = RTT_SUBCMD_SET_CONFIG + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_rtt_set_config + }, + { +@@ -1264,6 +1297,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = RTT_SUBCMD_CANCEL_CONFIG + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_rtt_cancel_config + }, + { +@@ -1272,6 +1308,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = RTT_SUBCMD_GETCAPABILITY + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = wl_cfgvendor_rtt_get_capability + }, + #endif /* RTT_SUPPORT */ +@@ -1281,6 +1320,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = rtw_cfgvendor_get_feature_set + }, + { +@@ -1289,6 +1331,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { + .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + .doit = rtw_cfgvendor_get_feature_set_matrix + } + }; +-- +2.26.0 + diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash index f2ae8b5b5..34ae6f84b 100644 --- a/buildroot/package/samba4/samba4.hash +++ b/buildroot/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.11.8.tar.asc -sha256 bb140caa37d2bbbb1f15f849aa86b1d5f787729443099139936f0ea06a5100ca samba-4.11.8.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.11.10.tar.asc +sha256 4346ed80c90132a4117fe2dd3e846954f44f006f4d057de3a3544116364e012f samba-4.11.10.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk index 9ec4c1eab..b6fe1a827 100644 --- a/buildroot/package/samba4/samba4.mk +++ b/buildroot/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.11.8 +SAMBA4_VERSION = 4.11.10 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES diff --git a/buildroot/package/sdl2/sdl2.mk b/buildroot/package/sdl2/sdl2.mk index e39c51d4d..9ef721d28 100644 --- a/buildroot/package/sdl2/sdl2.mk +++ b/buildroot/package/sdl2/sdl2.mk @@ -20,6 +20,16 @@ SDL2_CONF_OPTS += \ --disable-pulseaudio \ --disable-video-wayland +# We are using autotools build system for sdl2, so the sdl2-config.cmake +# include path are not resolved like for sdl2-config script. +# Remove sdl2-config.cmake file and avoid unsafe include path if this +# file is used by a cmake based package. +# https://bugzilla.libsdl.org/show_bug.cgi?id=4597 +define SDL2_REMOVE_SDL2_CONFIG_CMAKE + rm -rf $(STAGING_DIR)/usr/lib/cmake/SDL2 +endef +SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_REMOVE_SDL2_CONFIG_CMAKE + # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static @@ -30,6 +40,18 @@ else SDL2_CONF_OPTS += --disable-libudev endif +ifeq ($(BR2_X86_CPU_HAS_SSE),y) +SDL2_CONF_OPTS += --enable-sse +else +SDL2_CONF_OPTS += --disable-sse +endif + +ifeq ($(BR2_X86_CPU_HAS_3DNOW),y) +SDL2_CONF_OPTS += --enable-3dnow +else +SDL2_CONF_OPTS += --disable-3dnow +endif + ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb diff --git a/buildroot/package/sqlite/sqlite.hash b/buildroot/package/sqlite/sqlite.hash index 1d4bd03ed..162b52d60 100644 --- a/buildroot/package/sqlite/sqlite.hash +++ b/buildroot/package/sqlite/sqlite.hash @@ -1,6 +1,8 @@ # From https://www.sqlite.org/download.html -sha1 8383f29d53fa1d4383e4c8eb3e087f2ed940a9e0 sqlite-autoconf-3300100.tar.gz +sha1 ea14ef2dc4cc7fcbc5ebbb018d3a03faa3a41cb4 sqlite-autoconf-3320300.tar.gz + # Calculated based on the hash above -sha256 8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60 sqlite-autoconf-3300100.tar.gz +sha256 a31507123c1c2e3a210afec19525fd7b5bb1e19a6a34ae5b998fbd7302568b66 sqlite-autoconf-3320300.tar.gz + # Locally calculated -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/buildroot/package/sqlite/sqlite.mk b/buildroot/package/sqlite/sqlite.mk index c5cf9607a..c8b9ba315 100644 --- a/buildroot/package/sqlite/sqlite.mk +++ b/buildroot/package/sqlite/sqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQLITE_VERSION = 3300100 +SQLITE_VERSION = 3320300 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2019 +SQLITE_SITE = https://www.sqlite.org/2020 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms SQLITE_INSTALL_STAGING = YES diff --git a/buildroot/package/squid/squid.hash b/buildroot/package/squid/squid.hash index 3c8ab64d3..a3ef65518 100644 --- a/buildroot/package/squid/squid.hash +++ b/buildroot/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.11.tar.xz.asc -md5 10f34e852153a9996aa4614670e2bda1 squid-4.11.tar.xz -sha1 053277bf5497163ffc9261b9807abda5959bb6fc squid-4.11.tar.xz +# From http://www.squid-cache.org/Versions/v4/squid-4.12.tar.xz.asc +md5 ad7a4a8a0031cae3435717a759173829 squid-4.12.tar.xz +sha1 316b8a343aa542b5e7469d33b9d726bee00679c6 squid-4.12.tar.xz # Locally calculated -sha256 4ed947612410263f57ad0e39bfd087e60fb714f028d7d3b0e469943efd34287d squid-4.11.tar.xz +sha256 f42a03c8b3dc020722c88bf1a87da8cb0c087b2f66b41d8256c77ee1b527e317 squid-4.12.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk index d281eee3e..6bce74b7d 100644 --- a/buildroot/package/squid/squid.mk +++ b/buildroot/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 4.11 +SQUID_VERSION = 4.12 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ @@ -62,6 +62,13 @@ else SQUID_CONF_OPTS += --without-gnutls endif +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SQUID_CONF_OPTS += --with-systemd +SQUID_DEPENDENCIES += systemd +else +SQUID_CONF_OPTS += --without-systemd +endif + define SQUID_CLEANUP_TARGET rm -f $(addprefix $(TARGET_DIR)/usr/bin/, \ RunCache RunAccel) diff --git a/buildroot/package/sysdig/Config.in b/buildroot/package/sysdig/Config.in index 0a1b3f893..ee53b4fa2 100644 --- a/buildroot/package/sysdig/Config.in +++ b/buildroot/package/sysdig/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_SYSDIG depends on BR2_INSTALL_LIBSTDCPP # libjson depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS # jq depends on !BR2_STATIC_LIBS # luajit, elfutils depends on BR2_USE_WCHAR # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils @@ -25,8 +26,9 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc or uclibc toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built" +comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library and a Linux kernel to be built" depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS diff --git a/buildroot/package/syslog-ng/syslog-ng@default b/buildroot/package/syslog-ng/syslog-ng@default deleted file mode 100644 index 0fad00eba..000000000 --- a/buildroot/package/syslog-ng/syslog-ng@default +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/default/syslog-ng@default -# -CONFIG_FILE=/etc/syslog-ng.conf -PERSIST_FILE=/var/run/syslog-ng.persist -CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid -OTHER_OPTIONS="--enable-core" diff --git a/buildroot/package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch b/buildroot/package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch new file mode 100644 index 000000000..7c1cfe939 --- /dev/null +++ b/buildroot/package/systemd/0001-Fix-build-with-libmicrohttpd-0.9.71.patch @@ -0,0 +1,71 @@ +From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 30 Jun 2020 09:56:10 +0200 +Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The return type of callbacks was changed from int to an enum. + +Signed-off-by: Bernd Kuhls +[downloaded from upstream commit + https://github.com/systemd/systemd/commit/d17eabb1052e7c8c432331a7a782845e36164f01] +--- + src/journal-remote/journal-gatewayd.c | 4 ++-- + src/journal-remote/journal-remote-main.c | 2 +- + src/journal-remote/microhttpd-util.h | 6 ++++++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c +index 5177e0d1577..3ab7c98b0b5 100644 +--- a/src/journal-remote/journal-gatewayd.c ++++ b/src/journal-remote/journal-gatewayd.c +@@ -349,7 +349,7 @@ static int request_parse_range( + return 0; + } + +-static int request_parse_arguments_iterator( ++static mhd_result request_parse_arguments_iterator( + void *cls, + enum MHD_ValueKind kind, + const char *key, +@@ -796,7 +796,7 @@ static int request_handler_machine( + return MHD_queue_response(connection, MHD_HTTP_OK, response); + } + +-static int request_handler( ++static mhd_result request_handler( + void *cls, + struct MHD_Connection *connection, + const char *url, +diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c +index 69a111afead..f82d188a8c6 100644 +--- a/src/journal-remote/journal-remote-main.c ++++ b/src/journal-remote/journal-remote-main.c +@@ -253,7 +253,7 @@ static int process_http_upload( + return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK."); + }; + +-static int request_handler( ++static mhd_result request_handler( + void *cls, + struct MHD_Connection *connection, + const char *url, +diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h +index d90c6bbd4f1..4ca9a5c4f16 100644 +--- a/src/journal-remote/microhttpd-util.h ++++ b/src/journal-remote/microhttpd-util.h +@@ -47,6 +47,12 @@ + # define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset + #endif + ++#if MHD_VERSION >= 0x00097002 ++# define mhd_result enum MHD_Result ++#else ++# define mhd_result int ++#endif ++ + void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0); + + /* respond_oom() must be usable with return, hence this form. */ diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index 16ef131ba..d9ebd5db7 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -568,6 +568,8 @@ HOST_SYSTEMD_DEPENDENCIES = \ host-libcap \ host-gperf +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) + # Fix RPATH After installation # * systemd provides a install_rpath instruction to meson because the binaries # need to link with libsystemd which is not in a standard path @@ -576,20 +578,14 @@ HOST_SYSTEMD_DEPENDENCIES = \ # * the original path had been tweaked by buildroot via LDFLAGS to add # $(HOST_DIR)/lib # * thus re-tweak rpath after the installation for all binaries that need it -HOST_SYSTEMD_HOST_TOOLS = \ - systemd-analyze \ - systemd-machine-id-setup \ - systemd-mount \ - systemd-nspawn \ - systemctl \ - udevadm - -HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) +HOST_SYSTEMD_HOST_TOOLS = busctl journalctl systemctl systemd-* udevadm define HOST_SYSTEMD_FIX_RPATH - $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ - $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) - ) + for f in $(addprefix $(HOST_DIR)/bin/,$(HOST_SYSTEMD_HOST_TOOLS)); do \ + [ -e $$f ] || continue; \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $${f} \ + || exit 1; \ + done endef HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH diff --git a/buildroot/package/tcpreplay/tcpreplay.hash b/buildroot/package/tcpreplay/tcpreplay.hash index cc00bc09b..e83efd78b 100644 --- a/buildroot/package/tcpreplay/tcpreplay.hash +++ b/buildroot/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.3.2/tcpreplay-4.3.2.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.3.3/tcpreplay-4.3.3.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 955aed6a40f49a5b8c1234fd0a928edc5c665d94b7755ab5769c30938e33f380 tcpreplay-4.3.2.tar.xz -sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE +sha256 5e960e2a4432f583adbd11fa0855d17b73d9e0f2d6453b749f27aacaee53bab5 tcpreplay-4.3.3.tar.xz +sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE diff --git a/buildroot/package/tcpreplay/tcpreplay.mk b/buildroot/package/tcpreplay/tcpreplay.mk index 39d0f4434..8b395b496 100644 --- a/buildroot/package/tcpreplay/tcpreplay.mk +++ b/buildroot/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.3.2 +TCPREPLAY_VERSION = 4.3.3 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 diff --git a/buildroot/package/tinydtls/0001-Update-Makefile.in-to-allow-cross-compilation.patch b/buildroot/package/tinydtls/0001-Update-Makefile.in-to-allow-cross-compilation.patch deleted file mode 100644 index 5e91f2ee5..000000000 --- a/buildroot/package/tinydtls/0001-Update-Makefile.in-to-allow-cross-compilation.patch +++ /dev/null @@ -1,170 +0,0 @@ -From a6f312dfb4497d5e72664c4772a8b122e25b81d8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 26 Jul 2016 09:09:53 +0200 -Subject: [PATCH] Update Makefile.in to allow cross-compilation - -Use CC, CPP and DESTDIR environment variables passed to configure in Makefile.in files -Fix definition of LIBS and LDFLAGS (LDFLAGS was set to @LIBS@) - -Signed-off-by: Fabrice Fontaine ---- - Makefile.in | 13 ++++++++----- - aes/Makefile.in | 7 +++++-- - doc/Makefile.in | 4 ++-- - ecc/Makefile.in | 7 +++++-- - sha2/Makefile.in | 7 +++++-- - tests/Makefile.in | 4 +++- - 6 files changed, 28 insertions(+), 14 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 38cc665..7dcd424 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -40,7 +40,9 @@ OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) $(SUB_OBJECTS) - HEADERS:=dtls.h hmac.h dtls_debug.h dtls_config.h uthash.h numeric.h crypto.h global.h ccm.h \ - netq.h alert.h utlist.h prng.h peer.h state.h dtls_time.h session.h \ - tinydtls.h -+CC:=@CC@ - CFLAGS:=-Wall -pedantic -std=c99 @CFLAGS@ -+CPP:=@CPP@ - CPPFLAGS:=@CPPFLAGS@ -DDTLS_CHECK_CONTENTTYPE - SUBDIRS:=tests doc platform-specific sha2 aes ecc - DISTSUBDIRS:=$(SUBDIRS) -@@ -48,7 +50,8 @@ DISTDIR=$(top_builddir)/$(package) - FILES:=Makefile.in configure configure.in dtls_config.h.in tinydtls.h.in \ - Makefile.tinydtls $(SOURCES) $(HEADERS) - LIB:=libtinydtls.a --LDFLAGS:=@LIBS@ -+LDFLAGS:=@LDFLAGS@ -+LIBS:=@LIBS@ - ARFLAGS:=cru - doc:=doc - -@@ -100,10 +103,10 @@ dist: $(FILES) $(DISTSUBDIRS) - tar czf $(package).tar.gz $(DISTDIR) - - install: $(LIB) $(HEADERS) $(SUBDIRS) -- test -d $(libdir) || mkdir -p $(libdir) -- test -d $(includedir) || mkdir -p $(includedir) -- $(install) $(LIB) $(libdir)/ -- $(install) $(HEADERS) $(includedir)/ -+ test -d $(DESTDIR)$(libdir) || mkdir -p $(DESTDIR)$(libdir) -+ test -d $(DESTDIR)$(includedir) || mkdir -p $(DESTDIR)$(includedir) -+ $(install) $(LIB) $(DESTDIR)$(libdir)/ -+ $(install) $(HEADERS) $(DESTDIR)$(includedir)/ - for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir install="$(install)" includedir=$(includedir) install; \ - done -diff --git a/aes/Makefile.in b/aes/Makefile.in -index 7c9f6ef..9ff7799 100644 ---- a/aes/Makefile.in -+++ b/aes/Makefile.in -@@ -28,8 +28,11 @@ top_srcdir:= @top_srcdir@ - SOURCES:= rijndael.c - HEADERS:= rijndael.h - OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) -+CPP=@CPP@ - CPPFLAGS=@CPPFLAGS@ -+CC=@CC@ - CFLAGS=-Wall -std=c99 -pedantic @CFLAGS@ -+LDFLAGS=@LDFLAGS@ - LDLIBS=@LIBS@ - FILES:=Makefile.in $(SOURCES) $(HEADERS) - DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ -@@ -60,8 +63,8 @@ dist: $(FILES) - cp -p $(FILES) $(DISTDIR)/aes - - install: $(HEADERS) -- test -d $(includedir)/aes || mkdir -p $(includedir)/aes -- $(install) $(HEADERS) $(includedir)/aes -+ test -d $(DESTDIR)$(includedir)/aes || mkdir -p $(DESTDIR)$(includedir)/aes -+ $(install) $(HEADERS) $(DESTDIR)$(includedir)/aes - - .gitignore: - echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@ -diff --git a/doc/Makefile.in b/doc/Makefile.in -index a07101e..5ab0a35 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -32,5 +32,5 @@ dist: doc - cp -r $(FILES) $(DISTDIR)/doc - - install: $(doc) html -- test -d $(htmldir) || mkdir -p $(htmldir) -- cp -r html/* $(htmldir) -+ test -d $(DESTDIR)$(htmldir) || mkdir -p $(DESTDIR)$(htmldir) -+ cp -r html/* $(DESTDIR)$(htmldir) -diff --git a/ecc/Makefile.in b/ecc/Makefile.in -index 2ba17a1..2086d4f 100644 ---- a/ecc/Makefile.in -+++ b/ecc/Makefile.in -@@ -36,8 +36,11 @@ include Makefile.contiki - else - ECC_OBJECTS:= $(patsubst %.c, %.o, $(ECC_SOURCES)) ecc_test.o - PROGRAMS:= testecc testfield -+CPP=@CPP@ - CPPFLAGS=@CPPFLAGS@ -+CC=@CC@ - CFLAGS=-Wall -std=c99 -pedantic @CFLAGS@ -DTEST_INCLUDE -+LDFLAGS=@LDFLAGS@ - LDLIBS=@LIBS@ - - .PHONY: all dirs clean install distclean .gitignore doc -@@ -74,8 +77,8 @@ dist: $(FILES) - cp -p $(FILES) $(DISTDIR)/ecc - - install: $(HEADERS) -- test -d $(includedir)/ecc || mkdir -p $(includedir)/ecc -- $(install) $(HEADERS) $(includedir)/ecc -+ test -d $(DESTDIR)$(includedir)/ecc || mkdir -p $(DESTDIR)$(includedir)/ecc -+ $(install) $(ECC_HEADERS) $(DESTDIR)$(includedir)/ecc - - .gitignore: - echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@ -diff --git a/sha2/Makefile.in b/sha2/Makefile.in -index 9f19314..69f8793 100644 ---- a/sha2/Makefile.in -+++ b/sha2/Makefile.in -@@ -28,8 +28,11 @@ top_srcdir:= @top_srcdir@ - SOURCES:= sha2.c - HEADERS:=sha2.h - OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) -+CPP=@CPP@ - CPPFLAGS=@CPPFLAGS@ -I$(top_srcdir) -+CC=@CC@ - CFLAGS=-Wall -std=c99 -pedantic @CFLAGS@ -+LDFLAGS=@LDFLAGS@ - LDLIBS=@LIBS@ - FILES:=Makefile.in $(SOURCES) $(HEADERS) README sha2prog.c sha2speed.c sha2test.pl - DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ -@@ -62,8 +65,8 @@ dist: $(FILES) - cp -pr testvectors $(DISTDIR)/sha2/testvectors - - install: $(HEADERS) -- test -d $(includedir)/sha2 || mkdir -p $(includedir)/sha2 -- $(install) $(HEADERS) $(includedir)/sha2 -+ test -d $(DESTDIR)$(includedir)/sha2 || mkdir -p $(DESTDIR)$(includedir)/sha2 -+ $(install) $(HEADERS) $(DESTDIR)$(includedir)/sha2 - - .gitignore: - echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@ -diff --git a/tests/Makefile.in b/tests/Makefile.in -index a8a2ed0..b45f440 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -32,9 +32,11 @@ SOURCES:= dtls-server.c ccm-test.c prf-test.c \ - OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) - PROGRAMS:= $(patsubst %.c, %, $(SOURCES)) - HEADERS:= -+CC:=@CC@ - CFLAGS:=-Wall @CFLAGS@ -+CPP:=@CPP@ - CPPFLAGS:=-I$(top_srcdir) @CPPFLAGS@ --LDFLAGS:=-L$(top_builddir) -+LDFLAGS:=-L$(top_builddir) @LDFLAGS@ - LDLIBS:=-ltinydtls @LIBS@ - DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ - FILES:=Makefile.in $(SOURCES) ccm-testdata.c #cbc_aes128-testdata.c --- -2.7.4 - diff --git a/buildroot/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch b/buildroot/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch new file mode 100644 index 000000000..09d74d8ac --- /dev/null +++ b/buildroot/package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch @@ -0,0 +1,119 @@ +From 608738ccad9ac3743ccd535bde1e84f401e6176f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 20 Jun 2020 12:50:40 +0200 +Subject: [PATCH] sha2/sha2.c: fix build on big endian + +Build is broken since 865ec9ba1d44e629c1107c299aebd20e901a19ff because +tmp is undefined in put32be and put64be: + +sha2.c: In function 'put32be': +sha2.c:177:34: error: 'tmp' undeclared (first use in this function) + MEMCPY_BCOPY(data, &val, sizeof(tmp)); + ^~~ + +Fix this error by replacing tmp by val + +Moreover, move MEMCPY_BCOPY before its usage or linking step will fail + +Fixes: + - http://autobuild.buildroot.org/results/e8704e02fdede7b63e22da552292977b23380b32 + +Signed-off-by: Fabrice Fontaine +[Upstream: https://github.com/eclipse/tinydtls/commit/78a2d32f47165eda10cbf8f5cf79f86fa1c4872b] +--- + sha2/sha2.c | 58 ++++++++++++++++++++++++++--------------------------- + 1 file changed, 29 insertions(+), 29 deletions(-) + +diff --git a/sha2/sha2.c b/sha2/sha2.c +index cb6d90f..5c794c6 100644 +--- a/sha2/sha2.c ++++ b/sha2/sha2.c +@@ -114,6 +114,33 @@ + #error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN + #endif + ++/* ++ * Macros for copying blocks of memory and for zeroing out ranges ++ * of memory. Using these macros makes it easy to switch from ++ * using memset()/memcpy() and using bzero()/bcopy(). ++ * ++ * Please define either SHA2_USE_MEMSET_MEMCPY or define ++ * SHA2_USE_BZERO_BCOPY depending on which function set you ++ * choose to use: ++ */ ++#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY) ++/* Default to memset()/memcpy() if no option is specified */ ++#define SHA2_USE_MEMSET_MEMCPY 1 ++#endif ++#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY) ++/* Abort with an error if BOTH options are defined */ ++#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both! ++#endif ++ ++#ifdef SHA2_USE_MEMSET_MEMCPY ++#define MEMSET_BZERO(p,l) memset((p), 0, (l)) ++#define MEMCPY_BCOPY(d,s,l) memcpy((d), (s), (l)) ++#endif ++#ifdef SHA2_USE_BZERO_BCOPY ++#define MEMSET_BZERO(p,l) bzero((p), (l)) ++#define MEMCPY_BCOPY(d,s,l) bcopy((s), (d), (l)) ++#endif ++ + /* + * Define the followingsha2_* types to types of the correct length on + * the native archtecture. Most BSD systems and Linux define u_intXX_t +@@ -174,7 +201,7 @@ static inline void put32be(sha2_byte* data, sha2_word32 val) + data[1] = val; val >>= 8; + data[0] = val; + #else /* BYTE_ORDER != LITTLE_ENDIAN */ +- MEMCPY_BCOPY(data, &val, sizeof(tmp)); ++ MEMCPY_BCOPY(data, &val, sizeof(val)); + #endif /* BYTE_ORDER != LITTLE_ENDIAN */ + } + +@@ -209,7 +236,7 @@ static inline void put64be(sha2_byte* data, sha2_word64 val) + data[1] = val; val >>= 8; + data[0] = val; + #else /* BYTE_ORDER != LITTLE_ENDIAN */ +- MEMCPY_BCOPY(data, &val, sizeof(tmp)); ++ MEMCPY_BCOPY(data, &val, sizeof(val)); + #endif /* BYTE_ORDER != LITTLE_ENDIAN */ + } + +@@ -225,33 +252,6 @@ static inline void put64be(sha2_byte* data, sha2_word64 val) + } \ + } + +-/* +- * Macros for copying blocks of memory and for zeroing out ranges +- * of memory. Using these macros makes it easy to switch from +- * using memset()/memcpy() and using bzero()/bcopy(). +- * +- * Please define either SHA2_USE_MEMSET_MEMCPY or define +- * SHA2_USE_BZERO_BCOPY depending on which function set you +- * choose to use: +- */ +-#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY) +-/* Default to memset()/memcpy() if no option is specified */ +-#define SHA2_USE_MEMSET_MEMCPY 1 +-#endif +-#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY) +-/* Abort with an error if BOTH options are defined */ +-#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both! +-#endif +- +-#ifdef SHA2_USE_MEMSET_MEMCPY +-#define MEMSET_BZERO(p,l) memset((p), 0, (l)) +-#define MEMCPY_BCOPY(d,s,l) memcpy((d), (s), (l)) +-#endif +-#ifdef SHA2_USE_BZERO_BCOPY +-#define MEMSET_BZERO(p,l) bzero((p), (l)) +-#define MEMCPY_BCOPY(d,s,l) bcopy((s), (d), (l)) +-#endif +- + + /*** THE SIX LOGICAL FUNCTIONS ****************************************/ + /* +-- +2.26.2 + diff --git a/buildroot/package/tinydtls/0002-Fix-compilation-of-tests-directory.patch b/buildroot/package/tinydtls/0002-Fix-compilation-of-tests-directory.patch deleted file mode 100644 index 0ab579c45..000000000 --- a/buildroot/package/tinydtls/0002-Fix-compilation-of-tests-directory.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c629a108f5d03cd365c0ba71143ad507f6cd97f0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 28 Jul 2016 08:36:06 +0200 -Subject: [PATCH] Fix compilation of tests directory - -binaries in tests subdirectory depends on libtinydtls so add $(LIB) dependency -for dirs target in Makefile.in - -Signed-off-by: Fabrice Fontaine ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 7dcd424..c493705 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -68,8 +68,8 @@ check: - echo top_builddir: $(top_builddir) - $(MAKE) -C tests check - --dirs: $(SUBDIRS) -- for dir in $^; do \ -+dirs: $(LIB) $(SUBDIRS) -+ for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir ; \ - done - --- -2.7.4 - diff --git a/buildroot/package/tinydtls/Config.in b/buildroot/package/tinydtls/Config.in index 2f90eb243..98cbbb587 100644 --- a/buildroot/package/tinydtls/Config.in +++ b/buildroot/package/tinydtls/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_TINYDTLS machine. It is implemented in C and provides support for the mandatory cipher suites specified in CoAP. - https://sourceforge.net/projects/tinydtls + https://projects.eclipse.org/projects/iot.tinydtls comment "tinydtls needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/tinydtls/tinydtls.hash b/buildroot/package/tinydtls/tinydtls.hash index 66644df7a..be6bf182e 100644 --- a/buildroot/package/tinydtls/tinydtls.hash +++ b/buildroot/package/tinydtls/tinydtls.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccf6d8fbae03fb2e0ba32878ed8e57d8b4f73538b1064df90a3e764da5fac010 tinydtls-0.8.2.tar.gz -sha256 65fbf31c3551633e7dcc051fac80f2c1a73b0b077af9ed564d726155dfc40513 tinydtls.h +sha256 af73742835b5a66dc0b4a9c126ca8243b5db2986b4969d76e2b4531aa7e13f67 tinydtls-0.9-rc1.tar.gz +sha256 7e906fb56da52bb6bba38e77eec00e7d37fe65b0b7b28c4bf68ff036573d0de5 LICENSE diff --git a/buildroot/package/tinydtls/tinydtls.mk b/buildroot/package/tinydtls/tinydtls.mk index fe250014c..e683dea1a 100644 --- a/buildroot/package/tinydtls/tinydtls.mk +++ b/buildroot/package/tinydtls/tinydtls.mk @@ -4,13 +4,13 @@ # ################################################################################ -TINYDTLS_REL = r5 -TINYDTLS_VERSION = 0.8.2 -TINYDTLS_SITE = http://downloads.sourceforge.net/project/tinydtls/$(TINYDTLS_REL) -TINYDTLS_LICENSE = MIT -TINYDTLS_LICENSE_FILES = tinydtls.h +TINYDTLS_VERSION = 0.9-rc1 +TINYDTLS_SITE = $(call github,eclipse,tinydtls,v$(TINYDTLS_VERSION)) +TINYDTLS_LICENSE = EPL-1.0 or EDL-1.0 +TINYDTLS_LICENSE_FILES = LICENSE TINYDTLS_INSTALL_STAGING = YES -TINYDTLS_STRIP_COMPONENTS = 2 +# From git +TINYDTLS_AUTORECONF = YES # use inttypes.h data types instead of u_intXX_t for musl compatibility TINYDTLS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DSHA2_USE_INTTYPES_H" diff --git a/buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch b/buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch new file mode 100644 index 000000000..55c691b86 --- /dev/null +++ b/buildroot/package/upmpdcli/0001-Adapt-streamproxy-to-newer-microhttpd.patch @@ -0,0 +1,106 @@ +From 4fd8a07b560dcd4ad5706684d512d33707de3da0 Mon Sep 17 00:00:00 2001 +From: Jean-Francois Dockes +Date: Fri, 3 Jul 2020 19:26:37 +0200 +Subject: [PATCH] Adapt streamproxy to newer microhttpd where results are now + an enum + +Signed-off-by: Bernd Kuhls +[downloaded from upstream commit + https://framagit.org/medoc92/upmpdcli/-/commit/4fd8a07b560dcd4ad5706684d512d33707de3da0] +--- + src/mediaserver/cdplugins/streamproxy.cpp | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/mediaserver/cdplugins/streamproxy.cpp b/src/mediaserver/cdplugins/streamproxy.cpp +index abc57915..8d283834 100644 +--- a/src/mediaserver/cdplugins/streamproxy.cpp ++++ b/src/mediaserver/cdplugins/streamproxy.cpp +@@ -28,6 +28,11 @@ + #include + #include + ++ ++#if MHD_VERSION < 0x00097002 ++typedef int MHD_Result; ++#endif ++ + #include + #include + #include +@@ -155,7 +160,7 @@ public: + ~Internal(); + bool startMHD(); + +- int answerConn( ++ MHD_Result answerConn( + struct MHD_Connection *connection, const char *url, + const char *method, const char *version, + const char *upload_data, size_t *upload_data_size, +@@ -202,7 +207,7 @@ StreamProxy::Internal::Internal(int _listenport, UrlTransFunc _urltrans) + } + + +-static int answer_to_connection( ++static MHD_Result answer_to_connection( + void *cls, struct MHD_Connection *conn, + const char *url, const char *method, const char *version, + const char *upload_data, size_t *upload_data_size, +@@ -214,7 +219,7 @@ static int answer_to_connection( + return internal->answerConn( + conn, url, method, version, upload_data, upload_data_size, con_cls); + } else { +- return -1; ++ return MHD_NO; + } + } + +@@ -238,8 +243,8 @@ static int print_out_key (void *cls, enum MHD_ValueKind kind, + } + #endif /* PRINT_KEYS */ + +-static int mapvalues_cb(void *cls, enum MHD_ValueKind kind, +- const char *key, const char *value) ++static MHD_Result mapvalues_cb(void *cls, enum MHD_ValueKind kind, ++ const char *key, const char *value) + { + unordered_map *mp = (unordered_map *)cls; + if (mp) { +@@ -307,7 +312,7 @@ static bool processRange(struct MHD_Connection *mhdconn, uint64_t& offset) + return true; + } + +-int StreamProxy::Internal::answerConn( ++MHD_Result StreamProxy::Internal::answerConn( + struct MHD_Connection *mhdconn, const char *_url, + const char *method, const char *version, + const char *upload_data, size_t *upload_data_size, +@@ -352,7 +357,7 @@ int StreamProxy::Internal::answerConn( + return MHD_NO; + } + MHD_add_response_header (response, "Location", url.c_str()); +- int ret = MHD_queue_response(mhdconn, 302, response); ++ MHD_Result ret = MHD_queue_response(mhdconn, 302, response); + MHD_destroy_response(response); + return ret; + } +@@ -393,7 +398,7 @@ int StreamProxy::Internal::answerConn( + int code = httpcode ? httpcode : MHD_HTTP_INTERNAL_SERVER_ERROR; + struct MHD_Response *response = + MHD_create_response_from_buffer(0, 0, MHD_RESPMEM_PERSISTENT); +- int ret = MHD_queue_response(mhdconn, code, response); ++ MHD_Result ret = MHD_queue_response(mhdconn, code, response); + MHD_destroy_response(response); + LOGINF("StreamProxy::answerConn (1): return with http code: " << + code << endl); +@@ -434,7 +439,7 @@ int StreamProxy::Internal::answerConn( + if (reader->fetcher->fetchDone(&fetchcode, &httpcode)) { + code = httpcode ? httpcode : MHD_HTTP_INTERNAL_SERVER_ERROR; + } +- int ret = MHD_queue_response(mhdconn, code, response); ++ MHD_Result ret = MHD_queue_response(mhdconn, code, response); + MHD_destroy_response(response); + return ret; + } +-- +GitLab + diff --git a/buildroot/package/upx/upx.hash b/buildroot/package/upx/upx.hash index cc7fb66c9..7f3698ca0 100644 --- a/buildroot/package/upx/upx.hash +++ b/buildroot/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c upx-3.91-src.tar.bz2 +sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/upx/upx.mk b/buildroot/package/upx/upx.mk index 1fe7162c2..c577dfc2d 100644 --- a/buildroot/package/upx/upx.mk +++ b/buildroot/package/upx/upx.mk @@ -4,9 +4,9 @@ # ################################################################################ -UPX_VERSION = 3.91 -UPX_SITE = http://upx.sourceforge.net/download -UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.bz2 +UPX_VERSION = 3.96 +UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) +UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING @@ -15,10 +15,8 @@ HOST_UPX_DEPENDENCIES = host-ucl host-zlib # We need to specify all, otherwise the default target only prints a message # stating to "please choose a target for 'make'"... :-( define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) CPPFLAGS="$(HOST_CPPFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR) \ - CXXFLAGS_WERROR= \ - -C $(@D) all + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all endef # UPX has no install procedure, so install it manually. diff --git a/buildroot/package/vlc/vlc.hash b/buildroot/package/vlc/vlc.hash index 9eb8ec9dc..7775e449f 100644 --- a/buildroot/package/vlc/vlc.hash +++ b/buildroot/package/vlc/vlc.hash @@ -1,9 +1,9 @@ -# From https://get.videolan.org/vlc/3.0.9.2/vlc-3.0.9.2.tar.xz.sha256 -sha256 a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601 vlc-3.0.9.2.tar.xz -# From https://get.videolan.org/vlc/3.0.9.2/vlc-3.0.9.2.tar.xz.sha1 -sha1 f68eb80c6cb2baa96279b85f04f08fffc7dbf308 vlc-3.0.9.2.tar.xz -# From https://get.videolan.org/vlc/3.0.9.2/vlc-3.0.9.2.tar.xz.md5 -md5 bdedd425a7d41dc0664b1e65286c523c vlc-3.0.9.2.tar.xz +# From https://get.videolan.org/vlc/3.0.11/vlc-3.0.11.tar.xz.sha256 +sha256 3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919 vlc-3.0.11.tar.xz +# From https://get.videolan.org/vlc/3.0.11/vlc-3.0.11.tar.xz.sha1 +sha1 66d377a2f24b6b865d5c56530e10d84b8262b46c vlc-3.0.11.tar.xz +# From https://get.videolan.org/vlc/3.0.11/vlc-3.0.11.tar.xz.md5 +md5 7e68f9e2d307eb7cc16e7345cda9e978 vlc-3.0.11.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk index 76650eef7..38d975169 100644 --- a/buildroot/package/vlc/vlc.mk +++ b/buildroot/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.9.2 +VLC_VERSION = 3.0.11 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ @@ -123,6 +123,13 @@ else VLC_CONF_OPTS += --disable-avahi endif +ifeq ($(BR2_PACKAGE_DAV1D),y) +VLC_CONF_OPTS += --enable-dav1d +VLC_DEPENDENCIES += dav1d +else +VLC_CONF_OPTS += --disable-dav1d +endif + ifeq ($(BR2_PACKAGE_DBUS),y) VLC_CONF_OPTS += --enable-dbus VLC_DEPENDENCIES += dbus diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash index a76cc925a..44263745e 100644 --- a/buildroot/package/webkitgtk/webkitgtk.hash +++ b/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.28.2.tar.xz.sums -md5 ec0ef870ca37e3a5ebbead2f268a28ec webkitgtk-2.28.2.tar.xz -sha1 0aba97beba7b2677ed2d28aac51e429cb26c3fe6 webkitgtk-2.28.2.tar.xz -sha256 b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd webkitgtk-2.28.2.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.28.3.tar.xz.sums +md5 a03a4dcd2819baca14fdec5af68b4356 webkitgtk-2.28.3.tar.xz +sha1 af1d845d373e67fd666105e798a44e2cadaef83c webkitgtk-2.28.3.tar.xz +sha256 f0898ac072c220e13a4aee819408421a6cb56a6eb89170ceafe52468b0903522 webkitgtk-2.28.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/buildroot/package/webkitgtk/webkitgtk.mk b/buildroot/package/webkitgtk/webkitgtk.mk index 2abb083fc..f38ea5d20 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.28.2 +WEBKITGTK_VERSION = 2.28.3 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash index 6835f98d0..ac160cdf9 100644 --- a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash +++ b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-April/005296.html -sha256 16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3 wireguard-linux-compat-1.0.20200520.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2020-June/005597.html +sha256 130937724515799edf05ff8216bc837df8acda879428f3a7f96a3287758f9445 wireguard-linux-compat-1.0.20200623.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk index 9ad1ad025..bc155a1aa 100644 --- a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200520 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200623 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash index 57b496282..b74b69244 100644 --- a/buildroot/package/wireshark/wireshark.hash +++ b/buildroot/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.4.txt -sha1 bb4157b57c1bcdbac948a1282dafad027d57be9b wireshark-3.2.4.tar.xz -sha256 d17d461e849e2d0b033431c45f71d8ee8ec3c8faa232a6ad63069a47927db8aa wireshark-3.2.4.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.5.txt +sha1 468c547ad13df805322e0979b348dcc602904017 wireshark-3.2.5.tar.xz +sha256 bd89052a5766cce08b1090df49628567e48cdd24bbaa47667c851bac6aaac940 wireshark-3.2.5.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index 0d72f9dd9..638a8a249 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.2.4 +WIRESHARK_VERSION = 3.2.5 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license diff --git a/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash b/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash index 1380934af..0b821f344 100644 --- a/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/buildroot/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.6.0.tar.xz.sums -md5 456afeed22f6749f7b2a97c11660835d wpebackend-fdo-1.6.0.tar.xz -sha1 d128e2c7ff273d9b9f31217f6ac25be3b266d805 wpebackend-fdo-1.6.0.tar.xz -sha256 7f5bd7b9d8f97b1655f4dcd39fad92719d0fb3985b251da5802df13aaa09f567 wpebackend-fdo-1.6.0.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.6.1.tar.xz.sums +md5 ea6c2a13e6c2423f2c2b0b31fcf9567b wpebackend-fdo-1.6.1.tar.xz +sha1 53e38189324d9c0c87f40164d8349a827663aabd wpebackend-fdo-1.6.1.tar.xz +sha256 740eee3327acfb462b8460519a219e30dc0a870326e88e2ddc4fe2c8de20b1c9 wpebackend-fdo-1.6.1.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk index 99e10c5a0..5bc2d3ed3 100644 --- a/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.6.0 +WPEBACKEND_FDO_VERSION = 1.6.1 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES diff --git a/buildroot/package/wpewebkit/wpewebkit.hash b/buildroot/package/wpewebkit/wpewebkit.hash index 8c660d300..fcc35c502 100644 --- a/buildroot/package/wpewebkit/wpewebkit.hash +++ b/buildroot/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.28.2.tar.xz.sums -md5 c1f17d4b031e9462692443e3c089789c wpewebkit-2.28.2.tar.xz -sha1 b109cfec921eb466227ab3b8d21c5f5717311c8e wpewebkit-2.28.2.tar.xz -sha256 6929d28744702ead3574484ca02645c457a6fdcd6b43ccc9766d98dc3664e8dc wpewebkit-2.28.2.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.28.3.tar.xz.sums +md5 0b3655598f340a5c83cc26423fefcf36 wpewebkit-2.28.3.tar.xz +sha1 ea03d365584ef5e86ca28cec6ca072a4674e9312 wpewebkit-2.28.3.tar.xz +sha256 2539263a4d73c00abfe0205f54770dc1f6d2b635edbe41e748b507254f21e98b wpewebkit-2.28.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/buildroot/package/wpewebkit/wpewebkit.mk b/buildroot/package/wpewebkit/wpewebkit.mk index a6124d352..22c3d9646 100644 --- a/buildroot/package/wpewebkit/wpewebkit.mk +++ b/buildroot/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.28.2 +WPEWEBKIT_VERSION = 2.28.3 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES diff --git a/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk index bc05a2165..241876980 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk index f77c1706c..90e94d27c 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk index 1c157dd4c..83157f5c6 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk index cd60b34fc..ac3bf2e23 100644 --- a/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk index e8f6f3d2e..c867a6023 100644 --- a/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +++ b/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ARABIC_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk index d1176d54e..cc1573869 100644 --- a/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk index 5b05f5f79..788a76a2b 100644 --- a/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk index 4afec6ce6..2f055ddab 100644 --- a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk index 7a36c1105..4166b2d74 100644 --- a/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk index 9812ddc1b..90d9e5bbb 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk index 91dfeb2ac..deb99aa59 100644 --- a/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +++ b/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk @@ -12,6 +12,11 @@ XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk index 28329a36b..caca639c2 100644 --- a/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk index 9e8852aee..e75280308 100644 --- a/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +++ b/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_CURSOR_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk index f591b8b80..f5bd94138 100644 --- a/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +++ b/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk @@ -11,6 +11,11 @@ XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk index 10d24c6c5..1642b4135 100644 --- a/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +++ b/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_DEC_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk index 721f93d80..1393d67ea 100644 --- a/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +++ b/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_ISAS_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk index 1736aed17..78a5bbbf8 100644 --- a/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +++ b/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk @@ -11,6 +11,11 @@ XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_JIS_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk index 60105427d..b5da83f39 100644 --- a/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +++ b/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MICRO_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk index 226397208..8fa30ea31 100644 --- a/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk index dd62f0502..e03da6f1b 100644 --- a/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +++ b/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MISC_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk index 475fc68b2..6fcaa5dad 100644 --- a/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +++ b/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_MUTT_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk index b50ed5768..e07569d4b 100644 --- a/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +++ b/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk index dd444594e..a254d4a75 100644 --- a/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk index ae4444e59..6e580fd92 100644 --- a/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +++ b/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SONY_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk index c1e2dac72..737cfb5c9 100644 --- a/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +++ b/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk @@ -12,6 +12,11 @@ XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_SUN_MISC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk index 8e83d4466..e43cd1150 100644 --- a/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +++ b/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk @@ -12,6 +12,11 @@ XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data -XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_bdftopcf +XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = \ + xfont_font-util \ + host-xfont_font-util \ + host-xapp_mkfontscale \ + host-xapp_bdftopcf \ + host-gzip $(eval $(autotools-package)) diff --git a/buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch b/buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch new file mode 100644 index 000000000..0f735b884 --- /dev/null +++ b/buildroot/package/zstd/0001-programs-util.c-fix-build-without-st_mtime.patch @@ -0,0 +1,40 @@ +From 26d01bdb26f1c7487ad4ba0151221dfe28cd878d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 15 Jul 2020 21:19:14 +0200 +Subject: [PATCH] programs/util.c: fix build without st_mtime + +Since version 1.4.5 and commit +5af8cb7aea8d890b4801e50e5274371510f2cf33, if st_mtime is not defined, +programs/util.c uses utime without including utime.h which will raise +the following build failure on some of the buildroot autobuilders: + +util.c: In function 'UTIL_setFileStat': +util.c:161:24: error: storage size of 'timebuf' isn't known + struct utimbuf timebuf; + ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/be902c5d110f37bce622a2215191f155b7d3e7e0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/facebook/zstd/pull/2246] +--- + programs/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/programs/util.c b/programs/util.c +index a0d45745..2493a4ad 100644 +--- a/programs/util.c ++++ b/programs/util.c +@@ -28,7 +28,7 @@ extern "C" { + # include /* _chmod */ + #else + # include /* chown, stat */ +-# if PLATFORM_POSIX_VERSION < 200809L ++# if PLATFORM_POSIX_VERSION < 200809L || !defined(st_mtime) + # include /* utime */ + # else + # include /* AT_FDCWD */ +-- +2.27.0 + diff --git a/buildroot/package/zstd/zstd.hash b/buildroot/package/zstd/zstd.hash index 8a6926131..b764917c8 100644 --- a/buildroot/package/zstd/zstd.hash +++ b/buildroot/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# Locally computed -sha256 5eda3502ecc285c3c92ee0cc8cd002234dee39d539b3f692997a0e80de1d33de zstd-1.4.3.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz.sha256 +sha256 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e zstd-1.4.5.tar.gz # License files (locally computed as well) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE -sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING +sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/buildroot/package/zstd/zstd.mk b/buildroot/package/zstd/zstd.mk index 765fa6dd5..e2ba12b05 100644 --- a/buildroot/package/zstd/zstd.mk +++ b/buildroot/package/zstd/zstd.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZSTD_VERSION = 1.4.3 -ZSTD_SITE = $(call github,facebook,zstd,v$(ZSTD_VERSION)) +ZSTD_VERSION = 1.4.5 +ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 ZSTD_LICENSE_FILES = LICENSE COPYING diff --git a/buildroot/support/download/git b/buildroot/support/download/git index 075f665bb..15d8c66e0 100755 --- a/buildroot/support/download/git +++ b/buildroot/support/download/git @@ -176,6 +176,19 @@ date="$( _git log -1 --pretty=format:%cD )" # There might be submodules, so fetch them. if [ ${recurse} -eq 1 ]; then _git submodule update --init --recursive + + # Older versions of git will store the absolute path of the git tree + # in the .git of submodules, while newer versions just use relative + # paths. Detect and fix the older variants to use relative paths, so + # that the archives are reproducible across a wider range of git + # versions. However, we can't do that if git is too old and uses + # full repositories for submodules. + cmd='printf "%s\n" "${path}/"' + for module_dir in $( _git submodule --quiet foreach "'${cmd}'" ); do + [ -f "${module_dir}/.git" ] || continue + relative_dir="$( sed -r -e 's,/+,/,g; s,[^/]+/,../,g' <<<"${module_dir}" )" + sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: "${relative_dir}":" "${module_dir}/.git" + done fi # Generate the archive, sort with the C locale so that it is reproducible. diff --git a/buildroot/support/scripts/br2-external b/buildroot/support/scripts/br2-external index 171526f8c..ededd2d90 100755 --- a/buildroot/support/scripts/br2-external +++ b/buildroot/support/scripts/br2-external @@ -33,9 +33,8 @@ main() { # Trap any unexpected error to generate a meaningful error message trap "error 'unexpected error while generating ${ofile}\n'" ERR - do_validate ${@//:/ } - mkdir -p "${outputdir}" + do_validate "${outputdir}" ${@//:/ } do_mk "${outputdir}" do_kconfig "${outputdir}" } @@ -51,7 +50,9 @@ main() { # snippet means that there were no error. # do_validate() { + local outputdir="${1}" local br2_ext + shift if [ ${#} -eq 0 ]; then # No br2-external tree is valid @@ -60,7 +61,7 @@ do_validate() { for br2_ext in "${@}"; do do_validate_one "${br2_ext}" - done + done >"${outputdir}/.br2-external.mk" } do_validate_one() { @@ -74,7 +75,7 @@ do_validate_one() { error "'%s': permission denied\n" "${br2_ext}" fi if [ ! -f "${br2_ext}/external.desc" ]; then - error "'%s': does not have a name (in 'external.desc'). See %s\n" \ + error "'%s': does not have an 'external.desc'. See %s\n" \ "${br2_ext}" "${MANUAL_URL}" fi br2_name="$(sed -r -e '/^name: +(.*)$/!d; s//\1/' "${br2_ext}/external.desc")" diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk index 998117b8e..ddd5e3888 100644 --- a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk @@ -8,7 +8,7 @@ OPENJDK_HELLO_WORLD_DEPENDENCIES = openjdk define OPENJDK_HELLO_WORLD_BUILD_CMDS $(INSTALL) -D $(OPENJDK_HELLO_WORLD_PKGDIR)/HelloWorld.java $(@D)/HelloWorld.java - $(HOST_DIR)/bin/javac $(@D)/HelloWorld.java + $(JAVAC) $(@D)/HelloWorld.java endef define OPENJDK_HELLO_WORLD_INSTALL_TARGET_CMDS diff --git a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk index f279e5cd7..2028ad40c 100644 --- a/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk +++ b/buildroot/support/testing/tests/package/br2-external/openjdk/package/openjdk-jni-test/openjdk-jni-test.mk @@ -10,7 +10,7 @@ JNI_INCLUDE_PATH = $(BUILD_DIR)/openjdk-$(OPENJDK_VERSION)/build/linux-aarch64-s define OPENJDK_JNI_TEST_BUILD_CMDS # Compile Java classes and generate native headers - $(HOST_DIR)/bin/javac -d $(@D) -h $(@D) \ + $(JAVAC) -d $(@D) -h $(@D) \ $(OPENJDK_JNI_TEST_PKGDIR)/JniTest.java \ $(OPENJDK_JNI_TEST_PKGDIR)/JniWrapper.java \ $(OPENJDK_JNI_TEST_PKGDIR)/JniHelper.java diff --git a/buildroot/toolchain/helpers.mk b/buildroot/toolchain/helpers.mk index 44d0c83d1..17bc159f3 100644 --- a/buildroot/toolchain/helpers.mk +++ b/buildroot/toolchain/helpers.mk @@ -184,7 +184,7 @@ check_gcc_version = \ exit 0 ; \ fi; \ real_version=`$(1) -dumpversion` ; \ - if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \ + if [[ ! "$${real_version}." =~ ^$${expected_version}\. ]] ; then \ printf "Incorrect selection of gcc version: expected %s.x, got %s\n" \ "$${expected_version}" "$${real_version}" ; \ exit 1 ; \ diff --git a/buildroot/toolchain/toolchain-wrapper.c b/buildroot/toolchain/toolchain-wrapper.c index 8cfc963cc..aa6d560fe 100644 --- a/buildroot/toolchain/toolchain-wrapper.c +++ b/buildroot/toolchain/toolchain-wrapper.c @@ -177,6 +177,7 @@ static void check_unsafe_path(const char *arg, } } +#ifdef BR_NEED_SOURCE_DATE_EPOCH /* Returns false if SOURCE_DATE_EPOCH was not defined in the environment. * * Returns true if SOURCE_DATE_EPOCH is in the environment and represent @@ -230,6 +231,15 @@ bool parse_source_date_epoch_from_env(void) } return true; } +#else +bool parse_source_date_epoch_from_env(void) +{ + /* The compiler is recent enough to handle SOURCE_DATE_EPOCH itself + * so we do not need to do anything here. + */ + return false; +} +#endif int main(int argc, char **argv) { diff --git a/buildroot/toolchain/toolchain-wrapper.mk b/buildroot/toolchain/toolchain-wrapper.mk index 09dda1789..f1312c5c7 100644 --- a/buildroot/toolchain/toolchain-wrapper.mk +++ b/buildroot/toolchain/toolchain-wrapper.mk @@ -28,6 +28,9 @@ TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot else TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined endif +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),) +TOOLCHAIN_WRAPPER_OPTS += -DBR_NEED_SOURCE_DATE_EPOCH +endif endif # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a