From 035e3884d847107ca1e954e1b56a98d618b26c0d Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 20 May 2020 17:32:11 +0200 Subject: [PATCH] Update Buildroot 2020.02.2 (#682) Signed-off-by: Pascal Vizeli --- buildroot/.br2-external.in.jpeg | 5 - buildroot/.br2-external.in.menus | 5 - buildroot/.br2-external.in.openssl | 5 - buildroot/.br2-external.in.paths | 5 - buildroot/.br2-external.in.toolchains | 5 - buildroot/.br2-external.mk | 10 - buildroot/CHANGES | 42 ++ buildroot/DEVELOPERS | 11 +- buildroot/Makefile | 6 +- buildroot/board/hardkernel/odroidc2/boot.ini | 176 ------ .../board/hardkernel/odroidc2/genimage.cfg | 27 - .../board/hardkernel/odroidc2/post-image.sh | 19 - .../board/hardkernel/odroidc2/readme.txt | 53 -- .../board/solidrun/mx6cubox/post-build.sh | 6 +- buildroot/board/udoo/neo/post-build.sh | 5 +- buildroot/board/wandboard/post-build.sh | 6 +- buildroot/configs/amarula_a64_relic_defconfig | 1 + .../engicam_imx6qdl_icore_qt5_defconfig | 2 +- .../configs/freescale_imx28evk_defconfig | 2 +- buildroot/configs/imx23evk_defconfig | 2 +- buildroot/configs/imx6-sabresd_qt5_defconfig | 1 - .../minnowboard_max-graphical_defconfig | 1 + .../olimex_a20_olinuxino_lime2_defconfig | 4 + .../olimex_a20_olinuxino_lime_defconfig | 4 + .../configs/olimex_imx233_olinuxino_defconfig | 2 +- .../configs/qemu_ppc_virtex_ml507_defconfig | 2 +- buildroot/configs/qemu_riscv32_virt_defconfig | 1 - buildroot/configs/qemu_riscv64_virt_defconfig | 1 - .../docs/manual/adding-packages-python.txt | 7 +- buildroot/docs/manual/manual.html | 17 +- buildroot/docs/manual/manual.pdf | Bin 563684 -> 563665 bytes buildroot/docs/manual/manual.text | 13 +- buildroot/fs/cpio/init | 3 - buildroot/linux/Config.in | 10 +- buildroot/linux/linux.hash | 14 +- ...log_pid-Use-a-temporary-file-then-re.patch | 77 +++ buildroot/package/apache/apache.hash | 6 +- buildroot/package/apache/apache.mk | 3 +- .../azure-iot-sdk-c/azure-iot-sdk-c.mk | 42 +- .../2.31.1/0019-xtensa-fix-PR-ld-25861.patch | 376 +++++++++++++ ...TENSA_NDIFF-handling-for-PR-ld-25861.patch | 128 +++++ .../2.32/0008-xtensa-fix-PR-ld-25861.patch | 432 ++++++++++++++ ...TENSA_NDIFF-handling-for-PR-ld-25861.patch | 128 +++++ .../2.33.1/0005-xtensa-fix-PR-ld-25861.patch | 432 ++++++++++++++ ...TENSA_NDIFF-handling-for-PR-ld-25861.patch | 128 +++++ buildroot/package/boinc/boinc.mk | 1 + ...se_check_build_instead_of_check_user.patch | 17 - buildroot/package/c-ares/c-ares.hash | 4 +- buildroot/package/c-ares/c-ares.mk | 4 +- buildroot/package/cvs/cvs.hash | 9 +- buildroot/package/cvs/cvs.mk | 2 + buildroot/package/docker-cli/docker-cli.hash | 2 +- buildroot/package/docker-cli/docker-cli.mk | 2 +- .../docker-containerd/docker-containerd.hash | 2 +- .../docker-containerd/docker-containerd.mk | 2 +- .../package/docker-engine/docker-engine.hash | 2 +- .../package/docker-engine/docker-engine.mk | 2 +- buildroot/package/domoticz/domoticz.mk | 3 + buildroot/package/e2fsprogs/e2fsprogs.hash | 4 +- buildroot/package/e2fsprogs/e2fsprogs.mk | 2 +- buildroot/package/efl/efl.mk | 2 + buildroot/package/evtest/Config.in | 2 +- buildroot/package/evtest/evtest.hash | 2 +- buildroot/package/evtest/evtest.mk | 3 +- ...x-version.-h-sh-generation-with-para.patch | 84 +++ buildroot/package/exim/S86exim | 10 +- buildroot/package/exim/exim.mk | 12 +- buildroot/package/exim/exim.service | 4 + ...vcodec-cbs_jpeg-Check-length-for-SOS.patch | 33 ++ buildroot/package/ffmpeg/Config.in | 7 + buildroot/package/ffmpeg/ffmpeg.mk | 14 + ..._floatbar.c-fix-build-without-Xfixes.patch | 32 -- buildroot/package/freerdp/freerdp.hash | 6 +- buildroot/package/freerdp/freerdp.mk | 11 +- .../imx-gpu-g2d/imx-gpu-g2d.hash | 2 +- .../freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 2 +- buildroot/package/gcc/gcc.mk | 2 +- buildroot/package/gflags/gflags.mk | 6 +- .../glibc.hash | 2 +- buildroot/package/glibc/glibc.mk | 2 +- buildroot/package/haproxy/haproxy.mk | 2 +- buildroot/package/irrlicht/irrlicht.mk | 7 + buildroot/package/jpeg/Config.in | 10 +- buildroot/package/kodi-pvr-vuplus/Config.in | 4 + buildroot/package/libarchive/libarchive.mk | 11 +- buildroot/package/libcoap/libcoap.mk | 12 +- buildroot/package/libfm-extra/Config.in | 2 +- buildroot/package/libglib2/libglib2.mk | 5 + .../0001-fix-build-without-GNU-libiconv.patch | 60 -- ...01-htp.pc.in-add-lz-to-Libs.private.patch} | 2 +- buildroot/package/libhtp/libhtp.hash | 4 +- buildroot/package/libhtp/libhtp.mk | 2 +- .../0001-configure-automake-foreign.patch | 16 - buildroot/package/libid3tag/libid3tag.hash | 7 +- buildroot/package/libid3tag/libid3tag.mk | 13 +- buildroot/package/libinput/libinput.hash | 10 +- buildroot/package/libinput/libinput.mk | 2 +- ... 0002-configure-ac-automake-foreign.patch} | 0 .../0003-remove-deprecated-cflags.patch | 33 -- .../libmad/0004-thumb2-fixed-arm.patch | 40 -- .../libmad/0005-thumb2-imdct-arm.patch | 20 - buildroot/package/libmad/libmad.hash | 8 +- buildroot/package/libmad/libmad.mk | 21 +- buildroot/package/libopenssl/libopenssl.hash | 6 +- buildroot/package/libopenssl/libopenssl.mk | 2 +- ...IL_KEY_-build-errors-with-fno-common.patch | 525 ++++++++++++++++++ ...e-leftovers-of-cil_mem_error_handler.patch | 63 +++ buildroot/package/libsepol/Config.in | 12 +- .../0001-libssh.h-bump-to-version-0.9.4.patch | 29 + ...eturning-SSH_AGAIN-from-ssh_channel_.patch | 45 ++ buildroot/package/libssh/libssh.hash | 4 +- buildroot/package/libssh/libssh.mk | 2 +- ...02-keytable-use-input_event-properly.patch | 36 ++ ...dd-compatibility-for-input_event_sec.patch | 35 ++ ...rsor-limit-width-height-input-values.patch | 40 ++ .../package/libvncserver/libvncserver.mk | 3 + buildroot/package/libwpe/libwpe.hash | 10 +- buildroot/package/libwpe/libwpe.mk | 2 +- .../package/linux-headers/Config.in.host | 10 +- ...ACK-only-build-and-install-localedef.patch | 0 ...y-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0 ...itializer-for-flexible-array-member-.patch | 0 .../localedef.hash | 2 +- buildroot/package/localedef/localedef.mk | 2 +- buildroot/package/lvm2/lvm2.mk | 14 +- ...2-add-sysroot-path-to-mariadb_config.patch | 29 + buildroot/package/matchbox/matchbox.hash | 6 +- buildroot/package/matchbox/matchbox.mk | 2 +- buildroot/package/mbedtls/mbedtls.hash | 6 +- buildroot/package/mbedtls/mbedtls.mk | 2 +- buildroot/package/mc/mc.mk | 7 + buildroot/package/mesa3d-headers/dri.pc | 10 + .../package/mesa3d-headers/mesa3d-headers.mk | 9 +- ...dencies-base.py-add-pkg_config_stati.patch | 38 ++ .../package/meson/cross-compilation.conf.in | 1 + buildroot/package/midori/Config.in | 6 +- buildroot/package/msgpack/msgpack.hash | 2 +- buildroot/package/msgpack/msgpack.mk | 2 +- buildroot/package/netsnmp/netsnmp.mk | 1 - buildroot/package/nginx/nginx.hash | 2 +- buildroot/package/nginx/nginx.mk | 2 +- ...ompiledHeader.cmake-Add-c-argument-t.patch | 57 ++ buildroot/package/openjdk/Config.in | 1 - buildroot/package/openjdk/openjdk.mk | 14 +- buildroot/package/openldap/openldap.hash | 10 +- buildroot/package/openldap/openldap.mk | 4 +- buildroot/package/openvpn/openvpn.hash | 2 +- buildroot/package/openvpn/openvpn.mk | 2 +- .../package/p7zip/0001-CVE-2016-9296.patch | 25 + .../package/p7zip/0002-CVE-2017-17969.patch | 37 ++ .../package/p7zip/0003-CVE-2018-5996.patch | 223 ++++++++ buildroot/package/p7zip/p7zip.mk | 7 + ...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 | 5 +- buildroot/package/paho-mqtt-c/paho-mqtt-c.mk | 11 +- ...Check-for-sys-auxv.h-before-using-it.patch | 60 -- buildroot/package/php/Config.ext | 1 + buildroot/package/php/php.hash | 2 +- buildroot/package/php/php.mk | 14 +- buildroot/package/pkg-meson.mk | 2 + .../0001-make-netgroup-support-optional.patch | 211 ++++++- .../polkit/0002-jsauthority-memleak.patch | 28 + ...lkit-0.116-pkttyagent-sigttou-bg-job.patch | 34 ++ buildroot/package/polkit/polkit.mk | 8 +- buildroot/package/polkit/polkit.service | 12 + .../package/python-attrs/python-attrs.hash | 8 +- buildroot/package/python-crossbar/Config.in | 1 + buildroot/package/python-dpkt/Config.in | 4 +- buildroot/package/python-flask/Config.in | 5 +- .../package/python-flask/python-flask.hash | 9 +- .../package/python-flask/python-flask.mk | 4 +- buildroot/package/python-future/Config.in | 1 - ...-Add-separate-mechanism-to-load-libc.patch | 90 +++ ...o-as-additional-shared-object-suffix.patch | 57 ++ buildroot/package/python-iptables/Config.in | 4 + .../package/python-jedi/python-jedi.hash | 9 +- buildroot/package/python-jedi/python-jedi.mk | 5 +- ...gs-with-punctuation-after-as-part-of.patch | 53 ++ .../0002-Better-fix-for-issue-348.patch | 32 ++ .../python-markdown2/python-markdown2.mk | 4 + buildroot/package/python/python.hash | 8 +- buildroot/package/python/python.mk | 2 +- buildroot/package/python3/python3.mk | 4 + buildroot/package/qemu/Config.in.host | 1 + buildroot/package/qemu/qemu.mk | 8 + buildroot/package/qpdf/qpdf.mk | 2 +- buildroot/package/qt5/qt5.mk | 2 +- buildroot/package/qt5/qt53d/qt53d.hash | 4 +- ...tbase-Fix-build-error-when-using-EGL.patch | 0 ...ble-conversion-enable-for-microblaze.patch | 0 ...3-double-conversion-enable-for-nios2.patch | 0 .../qt5base/{5.12.7 => 5.12.8}/qt5base.hash | 4 +- .../package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +- .../package/qt5/qt5charts/qt5charts.hash | 4 +- .../{5.12.7 => 5.12.8}/qt5connectivity.hash | 4 +- ...gtexture-fix-debug-build-with-uclibc.patch | 0 .../qt5/qt5declarative/qt5declarative.hash | 4 +- .../qt5graphicaleffects.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../package/qt5/qt5location/qt5location.hash | 4 +- .../qt5/qt5multimedia/qt5multimedia.hash | 4 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../{5.12.7 => 5.12.8}/qt5quickcontrols2.hash | 4 +- .../package/qt5/qt5script/qt5script.hash | 4 +- buildroot/package/qt5/qt5scxml/qt5scxml.hash | 4 +- .../package/qt5/qt5sensors/qt5sensors.hash | 4 +- .../{5.12.7 => 5.12.8}/qt5serialbus.hash | 4 +- .../{5.12.7 => 5.12.8}/qt5serialport.hash | 4 +- buildroot/package/qt5/qt5svg/qt5svg.hash | 4 +- buildroot/package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5virtualkeyboard.hash | 4 +- .../package/qt5/qt5wayland/qt5wayland.hash | 4 +- .../qt5/qt5webchannel/qt5webchannel.hash | 4 +- ..._config-Fixes-when-use_sysroot-false.patch | 0 .../{5.12.7 => 5.12.8}/qt5webengine.hash | 4 +- .../qt5/qt5websockets/qt5websockets.hash | 4 +- .../package/qt5/qt5webview/qt5webview.hash | 4 +- .../{5.12.7 => 5.12.8}/qt5x11extras.hash | 4 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- buildroot/package/samba4/samba4.hash | 6 +- buildroot/package/samba4/samba4.mk | 2 +- ...ols-fix-build-failure-against-gcc-10.patch | 49 ++ buildroot/package/squid/squid.hash | 8 +- buildroot/package/squid/squid.mk | 2 +- buildroot/package/strongswan/strongswan.mk | 5 + ...figure.ac-fix-static-build-with-pcap.patch | 29 - ...re-proper-shabang-on-python-scripts.patch} | 0 ...re.ac-fix-cross-compilation-with-lua.patch | 33 ++ .../0002-configure.ac-fix-disable-geoip.patch | 33 -- ...004-stream-reject-broken-ACK-packets.patch | 40 -- buildroot/package/suricata/suricata.hash | 6 +- buildroot/package/suricata/suricata.mk | 7 +- buildroot/package/tzdata/tzdata.hash | 6 +- buildroot/package/tzdata/tzdata.mk | 7 +- ...001-blkdiscard-use-O_EXCL-add-force.patch} | 0 ...-fdisk_set_disklabel_id_from_string.patch} | 0 ...-add-disk-id-to-change-disk-UUID-ID.patch} | 0 ...types.h-before-checking-SYS_pidfd_s.patch} | 0 ...0005-include-cleanup-pidfd-inckudes.patch} | 0 ...t-sector-size-ignore-unknown-headers.patch | 138 +++++ ...Don-t-assume-strerror_l-is-available.patch | 6 +- buildroot/package/vlc/vlc.hash | 12 +- buildroot/package/vlc/vlc.mk | 9 +- buildroot/package/vnstat/vnstat.hash | 2 +- buildroot/package/vnstat/vnstat.mk | 2 +- buildroot/package/webkitgtk/webkitgtk.hash | 8 +- buildroot/package/webkitgtk/webkitgtk.mk | 2 +- buildroot/package/wget/wget.mk | 4 + .../package/wireguard-linux-compat/Config.in | 5 +- .../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 | 10 +- .../package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- .../wpewebkit/0001-Fix-build-with-musl.patch | 6 +- buildroot/package/wpewebkit/wpewebkit.hash | 8 +- buildroot/package/wpewebkit/wpewebkit.mk | 2 +- buildroot/package/zic/zic.hash | 6 +- buildroot/package/zic/zic.mk | 2 +- buildroot/support/gnuconfig/README.buildroot | 2 +- .../tests/package/test_python_django.py | 10 +- .../toolchain/toolchain-buildroot/Config.in | 1 + 264 files changed, 4460 insertions(+), 1085 deletions(-) delete mode 100644 buildroot/.br2-external.in.jpeg delete mode 100644 buildroot/.br2-external.in.menus delete mode 100644 buildroot/.br2-external.in.openssl delete mode 100644 buildroot/.br2-external.in.paths delete mode 100644 buildroot/.br2-external.in.toolchains delete mode 100644 buildroot/.br2-external.mk delete mode 100644 buildroot/board/hardkernel/odroidc2/boot.ini delete mode 100644 buildroot/board/hardkernel/odroidc2/genimage.cfg delete mode 100755 buildroot/board/hardkernel/odroidc2/post-image.sh delete mode 100644 buildroot/board/hardkernel/odroidc2/readme.txt create mode 100644 buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch create mode 100644 buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch create mode 100644 buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch create mode 100644 buildroot/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch create mode 100644 buildroot/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch create mode 100644 buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch create mode 100644 buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch delete mode 100644 buildroot/package/c-ares/0001-use_check_build_instead_of_check_user.patch create mode 100644 buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch create mode 100644 buildroot/package/ffmpeg/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch delete mode 100644 buildroot/package/freerdp/0001-xf_floatbar.c-fix-build-without-Xfixes.patch rename buildroot/package/glibc/{2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 => 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427}/glibc.hash (70%) delete mode 100644 buildroot/package/libhtp/0001-fix-build-without-GNU-libiconv.patch rename buildroot/package/libhtp/{0002-htp.pc.in-add-lz-to-Libs.private.patch => 0001-htp.pc.in-add-lz-to-Libs.private.patch} (93%) delete mode 100644 buildroot/package/libid3tag/0001-configure-automake-foreign.patch rename buildroot/package/libmad/{0006-configure-ac-automake-foreign.patch => 0002-configure-ac-automake-foreign.patch} (100%) delete mode 100644 buildroot/package/libmad/0003-remove-deprecated-cflags.patch delete mode 100644 buildroot/package/libmad/0004-thumb2-fixed-arm.patch delete mode 100644 buildroot/package/libmad/0005-thumb2-imdct-arm.patch create mode 100644 buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch create mode 100644 buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch create mode 100644 buildroot/package/libssh/0001-libssh.h-bump-to-version-0.9.4.patch create mode 100644 buildroot/package/libssh/0002-channels-Avoid-returning-SSH_AGAIN-from-ssh_channel_.patch create mode 100644 buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch create mode 100644 buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch create mode 100644 buildroot/package/libvncserver/0006-libvncclient-cursor-limit-width-height-input-values.patch rename buildroot/package/localedef/{2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 => 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427}/0001-HACK-only-build-and-install-localedef.patch (100%) rename buildroot/package/localedef/{2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 => 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%) rename buildroot/package/localedef/{2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 => 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427}/0003-localedef-Use-initializer-for-flexible-array-member-.patch (100%) rename buildroot/package/localedef/{2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 => 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427}/localedef.hash (70%) create mode 100644 buildroot/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch create mode 100644 buildroot/package/mesa3d-headers/dri.pc create mode 100644 buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch create mode 100644 buildroot/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch create mode 100644 buildroot/package/p7zip/0001-CVE-2016-9296.patch create mode 100644 buildroot/package/p7zip/0002-CVE-2017-17969.patch create mode 100644 buildroot/package/p7zip/0003-CVE-2018-5996.patch create mode 100644 buildroot/package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch create mode 100644 buildroot/package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch delete mode 100644 buildroot/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch create mode 100644 buildroot/package/polkit/0002-jsauthority-memleak.patch create mode 100644 buildroot/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch create mode 100644 buildroot/package/polkit/polkit.service create mode 100644 buildroot/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch create mode 100644 buildroot/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch create mode 100644 buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch create mode 100644 buildroot/package/python-markdown2/0002-Better-fix-for-issue-348.patch rename buildroot/package/qt5/qt5base/{5.12.7 => 5.12.8}/0001-qtbase-Fix-build-error-when-using-EGL.patch (100%) rename buildroot/package/qt5/qt5base/{5.12.7 => 5.12.8}/0002-double-conversion-enable-for-microblaze.patch (100%) rename buildroot/package/qt5/qt5base/{5.12.7 => 5.12.8}/0003-double-conversion-enable-for-nios2.patch (100%) rename buildroot/package/qt5/qt5base/{5.12.7 => 5.12.8}/qt5base.hash (80%) rename buildroot/package/qt5/qt5connectivity/{5.12.7 => 5.12.8}/qt5connectivity.hash (74%) rename buildroot/package/qt5/qt5declarative/{5.12.7 => 5.12.8}/0001-qsgtexture-fix-debug-build-with-uclibc.patch (100%) rename buildroot/package/qt5/qt5quickcontrols2/{5.12.7 => 5.12.8}/qt5quickcontrols2.hash (65%) rename buildroot/package/qt5/qt5serialbus/{5.12.7 => 5.12.8}/qt5serialbus.hash (70%) rename buildroot/package/qt5/qt5serialport/{5.12.7 => 5.12.8}/qt5serialport.hash (74%) rename buildroot/package/qt5/qt5virtualkeyboard/{5.12.7 => 5.12.8}/qt5virtualkeyboard.hash (78%) rename buildroot/package/qt5/qt5webengine/{5.12.7 => 5.12.8}/0001-pkg_config-Fixes-when-use_sysroot-false.patch (100%) rename buildroot/package/qt5/qt5webengine/{5.12.7 => 5.12.8}/qt5webengine.hash (99%) rename buildroot/package/qt5/qt5x11extras/{5.12.7 => 5.12.8}/qt5x11extras.hash (74%) create mode 100644 buildroot/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch delete mode 100644 buildroot/package/suricata/0001-configure.ac-fix-static-build-with-pcap.patch rename buildroot/package/suricata/{0003-python-ensure-proper-shabang-on-python-scripts.patch => 0001-python-ensure-proper-shabang-on-python-scripts.patch} (100%) create mode 100644 buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch delete mode 100644 buildroot/package/suricata/0002-configure.ac-fix-disable-geoip.patch delete mode 100644 buildroot/package/suricata/0004-stream-reject-broken-ACK-packets.patch rename buildroot/package/util-linux/{0003-blkdiscard-use-O_EXCL-add-force.patch => 0001-blkdiscard-use-O_EXCL-add-force.patch} (100%) rename buildroot/package/util-linux/{0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch => 0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch} (100%) rename buildroot/package/util-linux/{0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch => 0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch} (100%) rename buildroot/package/util-linux/{0006-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch => 0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch} (100%) rename buildroot/package/util-linux/{0007-include-cleanup-pidfd-inckudes.patch => 0005-include-cleanup-pidfd-inckudes.patch} (100%) create mode 100644 buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch diff --git a/buildroot/.br2-external.in.jpeg b/buildroot/.br2-external.in.jpeg deleted file mode 100644 index 19d58283d..000000000 --- a/buildroot/.br2-external.in.jpeg +++ /dev/null @@ -1,5 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# - -# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.menus b/buildroot/.br2-external.in.menus deleted file mode 100644 index 19d58283d..000000000 --- a/buildroot/.br2-external.in.menus +++ /dev/null @@ -1,5 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# - -# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.openssl b/buildroot/.br2-external.in.openssl deleted file mode 100644 index 19d58283d..000000000 --- a/buildroot/.br2-external.in.openssl +++ /dev/null @@ -1,5 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# - -# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.paths b/buildroot/.br2-external.in.paths deleted file mode 100644 index 19d58283d..000000000 --- a/buildroot/.br2-external.in.paths +++ /dev/null @@ -1,5 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# - -# No br2-external tree defined. diff --git a/buildroot/.br2-external.in.toolchains b/buildroot/.br2-external.in.toolchains deleted file mode 100644 index 19d58283d..000000000 --- a/buildroot/.br2-external.in.toolchains +++ /dev/null @@ -1,5 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# - -# No br2-external tree defined. diff --git a/buildroot/.br2-external.mk b/buildroot/.br2-external.mk deleted file mode 100644 index 43dc5f047..000000000 --- a/buildroot/.br2-external.mk +++ /dev/null @@ -1,10 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# - -BR2_EXTERNAL ?= -BR2_EXTERNAL_NAMES = -BR2_EXTERNAL_DIRS = -BR2_EXTERNAL_MKS = - -# No br2-external tree defined. diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 5b54eb0e3..7dda1c47e 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,45 @@ +2020.02.2, released May 12th, 2020 + + Important / security related fixes. + + Musl: Disallow on PPC64 cores without AltiVec support + (E.G. e5500). + + fs/cpio: Correctly handle booting with 'console=' + + release: Ensure temporary .br2-external.* files are not + included in the release tarball + + Defconfigs: Fix various mistyped config options, or config + options where the dependencies were no longer met. + + Updated/fixed packages: apache, azure-iot-sdk-c, binutils, + boinc, c-ares, cvs, docker-cli, docker-containerd, + docker-engine, domoticz, e2fsprogs, efl, evtest, exim, ffmpeg, + freerdp, gcc, gflags, glibc, gnuconfig, haproxy, imx-gpu-2d, + irrlicht, jpeg kodi-pvr-vuplus, libarchive, libcoap, + libfpm-extra, libglib2, libhtp, libid3tag, libinput, libmad, + libopenssl, libsepol, libssh, libv4l, libvncserver, libwpe, + localedef, mariadb, matchbox, mbedtls, mc, mesa3d-headers, + meson, midori, msgpack, netsnmp, nginx, ogre, openjdk, + openldap, openvpn, p7zip, paho-mqtt-c, php, polkit, python, + python-attrs, python-crossbar, python-dpkt, python-flask, + python-future, python-iptables, python-jedi, python-markdown2, + python3, qemu, qpdf, qt5, samba4, squashfs, squid, strongswan, + suricata, tzdata, util-linux, vlc, wget, webkitgtk, + wireguard-linux-compat, wireshark, wpebackend-fdo, wpewebkit, + zic + + Issues resolved (http://bugs.uclibc.org): + + #11866: initramfs file system fails to boot using Grub on EFI x86_64 + #12271: python-iptables runtime dependencies + #12726: systemctl preset-all failed for ctrl-alt-del.target + #12751: OpenJdk package installation issues on target + #12796: Update OpenSSL to Version 1.1.1g to patch CVE-2020-1967 + #12811: bootstrap stuck and no login prompt + #12841: util-linux/sfdisk 2.35.1 fails on sector-size header + 2020.02.1, released April 10th, 2020 Important / security related fixes. diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index dd44331b8..b623d17c8 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -484,18 +484,12 @@ F: package/sunxi-boards/ N: Carlos Santos F: package/busybox/ -F: package/cups/ -F: package/cups-filters/ -F: package/gtest/ F: package/initscripts/ F: package/intel-microcode/ -F: package/libpam-radius-auth/ -F: package/libpam-tacplus/ F: package/liburiparser/ F: package/modem-manager/ F: package/pamtester/ F: package/pcm-tools/ -F: package/perl-file-util/ F: package/skeleton-custom/ F: package/skeleton-init-common/ F: package/skeleton-init-none/ @@ -676,7 +670,7 @@ F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ F: package/ev3dev-linux-drivers/ -N: Davide Viti +N: Davide Viti F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ @@ -2090,9 +2084,6 @@ F: package/libfreeimage/ N: Renaud Aubin F: package/libhttpparser/ -N: Rhys Williams -F: package/lirc-tools/ - N: Ricardo Martincoski F: package/atop/ F: package/thermald/ diff --git a/buildroot/Makefile b/buildroot/Makefile index ddc1265d0..cd6d66908 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.1 +export BR2_VERSION := 2020.02.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1586551000 +BR2_VERSION_EPOCH = 1589285000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -1189,7 +1189,7 @@ release: OUT = buildroot-$(BR2_VERSION) release: git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar $(MAKE) O=$(OUT) manual-html manual-text manual-pdf - $(MAKE) O=$(OUT) clean + $(MAKE) O=$(OUT) distclean tar rf $(OUT).tar $(OUT) gzip -9 -c < $(OUT).tar > $(OUT).tar.gz bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2 diff --git a/buildroot/board/hardkernel/odroidc2/boot.ini b/buildroot/board/hardkernel/odroidc2/boot.ini deleted file mode 100644 index 2fdffa304..000000000 --- a/buildroot/board/hardkernel/odroidc2/boot.ini +++ /dev/null @@ -1,176 +0,0 @@ -ODROIDC2-UBOOT-CONFIG - -######################################################################## -# Changes made to this are overwritten every time there's a new upgrade -# To make your changes permanent change it on -# boot.ini.default -# After changing it on boot.ini.default run the bootini command to -# rewrite this file with your personal permanent settings. -# Documentation: http://odroid.com/dokuwiki/doku.php?id=en:c2_persistent_bootini -######################################################################## - -# Possible screen resolutions -# Uncomment only a single Line! The line with setenv written. -# At least one mode must be selected. - -# Custom modeline! -# To use custom modeline you need to disable all the below resolutions -# and setup your own! -# For more information check our wiki: -# http://odroid.com/dokuwiki/doku.php?id=en:c2_hdmi_autosetting -# Example below: -# setenv m "custombuilt" -# setenv modeline "1920,1200,154000,74040,60,1920,1968,2000,2080,1200,1202,1208,1235,1,0,1" - -# 480 Lines (720x480) -# setenv m "480i60hz" # Interlaced 60Hz -# setenv m "480i_rpt" # Interlaced for Rear Projection Televisions 60Hz -# setenv m "480p60hz" # 480 Progressive 60Hz -# setenv m "480p_rpt" # 480 Progressive for Rear Projection Televisions 60Hz - -# 576 Lines (720x576) -# setenv m "576i50hz" # Interlaced 50Hz -# setenv m "576i_rpt" # Interlaced for Rear Projection Televisions 50Hz -# setenv m "576p50hz" # Progressive 50Hz -# setenv m "576p_rpt" # Progressive for Rear Projection Televisions 50Hz - -# 720 Lines (1280x720) -# setenv m "720p50hz" # 50Hz -# setenv m "720p60hz" # 60Hz - -# 1080 Lines (1920x1080) -# setenv m "1080i60hz" # Interlaced 60Hz -setenv m "1080p60hz" # Progressive 60Hz -# setenv m "1080i50hz" # Interlaced 50Hz -# setenv m "1080p50hz" # Progressive 50Hz -# setenv m "1080p24hz" # Progressive 24Hz - -# 4K (3840x2160) -# setenv m "2160p30hz" # Progressive 30Hz -# setenv m "2160p25hz" # Progressive 25Hz -# setenv m "2160p24hz" # Progressive 24Hz -# setenv m "smpte24hz" # Progressive 24Hz SMPTE -# setenv m "2160p50hz" # Progressive 50Hz -# setenv m "2160p60hz" # Progressive 60Hz -# setenv m "2160p50hz420" # Progressive 50Hz with YCbCr 4:2:0 (Requires TV/Monitor that supports it) -# setenv m "2160p60hz420" # Progressive 60Hz with YCbCr 4:2:0 (Requires TV/Monitor that supports it) - -### VESA modes ### -# setenv m "640x480p60hz" -# setenv m "800x480p60hz" -# setenv m "480x800p60hz" -# setenv m "800x600p60hz" -# setenv m "1024x600p60hz" -# setenv m "1024x768p60hz" -# setenv m "1280x800p60hz" -# setenv m "1280x1024p60hz" -# setenv m "1360x768p60hz" -# setenv m "1440x900p60hz" -# setenv m "1600x900p60hz" -# setenv m "1680x1050p60hz" -# setenv m "1600x1200p60hz" -# setenv m "1920x1200p60hz" -# setenv m "2560x1080p60hz" -# setenv m "2560x1440p60hz" -# setenv m "2560x1600p60hz" -# setenv m "3440x1440p60hz" - -# HDMI BPP Mode -setenv m_bpp "32" -# setenv m_bpp "24" -# setenv m_bpp "16" - -# HDMI DVI/VGA modes -# By default its set to HDMI, if needed change below. -# Uncomment only a single Line. -# setenv vout "dvi" -# setenv vout "vga" - -# HDMI HotPlug Detection control -# Allows you to force HDMI thinking that the cable is connected. -# true = HDMI will believe that cable is always connected -# false = will let board/monitor negotiate the connection status -setenv hpd "true" -# setenv hpd "false" - -# Monitor output -# Controls if HDMI PHY should output anything to the monitor -setenv monitor_onoff "false" # true or false - -# Server Mode (aka. No Graphics) -# Setting nographics to 1 will disable all video subsystem -# This mode is ideal of server type usage. (Saves ~300Mb of RAM) -setenv nographics "0" - -# Meson Timer -# 1 - Meson Timer -# 0 - Arch Timer -# Using meson_timer improves the video playback however it breaks KVM (virtualization). -# Using arch timer allows KVM/Virtualization to work however you'll experience poor video -setenv mesontimer "1" - -# UHS (Ultra High Speed) MicroSD mode enable/disable -setenv disableuhs "false" - -# MicroSD Card Detection enable/disable -# Force the MMC controlled to believe that a card is connected. -setenv mmc_removable "true" - -# USB Multi WebCam tweak -# Only enable this if you use it. -setenv usbmulticam "false" - -# Default Console Device Setting -setenv condev "console=ttyS0,115200n8 console=tty0" # on both - -# CPU Frequency / Cores control -########################################### -### WARNING!!! WARNING!!! WARNING!!! -# Before changing anything here please read the wiki entry: -# http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq -# -# MAX CPU's -# setenv maxcpus "1" -# setenv maxcpus "2" -# setenv maxcpus "3" -setenv maxcpus "4" - -# MAX Frequency -# setenv max_freq "2016" # 2.016GHz -# setenv max_freq "1944" # 1.944GHz -# setenv max_freq "1944" # 1.944GHz -# setenv max_freq "1920" # 1.920GHz -# setenv max_freq "1896" # 1.896GHz -# setenv max_freq "1752" # 1.752GHz -# setenv max_freq "1680" # 1.680GHz -# setenv max_freq "1656" # 1.656GHz -setenv max_freq "1536" # 1.536GHz - - - -########################################### - -# Boot Arguments -if test "${m}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi - -setenv bootargs "root=/dev/mmcblk0p2 rootwait ro ${condev} no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes net.ifnames=0 elevator=noop disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}" - -# Booting - -setenv loadaddr "0x11000000" -setenv dtb_loadaddr "0x1000000" -setenv initrd_loadaddr "0x13000000" - -fatload mmc 0:1 ${loadaddr} Image -fatload mmc 0:1 ${dtb_loadaddr} meson64_odroidc2.dtb -fdt addr ${dtb_loadaddr} - -if test "${mesontimer}" = "0"; then fdt rm /meson_timer; fdt rm /cpus/cpu@0/timer; fdt rm /cpus/cpu@1/timer; fdt rm /cpus/cpu@2/timer; fdt rm /cpus/cpu@3/timer; fi -if test "${mesontimer}" = "1"; then fdt rm /timer; fi - -if test "${nographics}" = "1"; then fdt rm /reserved-memory; fdt rm /aocec; fi -if test "${nographics}" = "1"; then fdt rm /meson-fb; fdt rm /amhdmitx; fdt rm /picdec; fdt rm /ppmgr; fi -if test "${nographics}" = "1"; then fdt rm /meson-vout; fdt rm /mesonstream; fdt rm /meson-fb; fi -if test "${nographics}" = "1"; then fdt rm /deinterlace; fdt rm /codec_mm; fi - -booti ${loadaddr} - ${dtb_loadaddr} diff --git a/buildroot/board/hardkernel/odroidc2/genimage.cfg b/buildroot/board/hardkernel/odroidc2/genimage.cfg deleted file mode 100644 index 15f97d445..000000000 --- a/buildroot/board/hardkernel/odroidc2/genimage.cfg +++ /dev/null @@ -1,27 +0,0 @@ -image boot.vfat { - vfat { - files = { - "boot.ini", - "Image", - "meson64_odroidc2.dtb" - } - } - size = 32M -} - -image sdcard.img { - hdimage { - } - - partition vfat { - partition-type = 0xC - image = "boot.vfat" - offset = 1048576 - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/buildroot/board/hardkernel/odroidc2/post-image.sh b/buildroot/board/hardkernel/odroidc2/post-image.sh deleted file mode 100755 index aaf12c1e7..000000000 --- a/buildroot/board/hardkernel/odroidc2/post-image.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -cp ${BOARD_DIR}/boot.ini ${BINARIES_DIR}/ - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -dd if=${BINARIES_DIR}/u-boot.bin of=${BINARIES_DIR}/sdcard.img bs=1 count=442 conv=sync,notrunc -dd if=${BINARIES_DIR}/u-boot.bin of=${BINARIES_DIR}/sdcard.img bs=512 skip=1 seek=1 conv=fsync,notrunc diff --git a/buildroot/board/hardkernel/odroidc2/readme.txt b/buildroot/board/hardkernel/odroidc2/readme.txt deleted file mode 100644 index b44aa67f5..000000000 --- a/buildroot/board/hardkernel/odroidc2/readme.txt +++ /dev/null @@ -1,53 +0,0 @@ -ODROID-C2 - -Intro -===== -To be able to use ODROID-C2 board with the images generated by -Buildroot, you have to prepare the SDCard or eMMC. - -How to build it -=============== - - $ make odroidc2_defconfig - -Then you can edit the build options using - - $ make menuconfig - -Compile all and build rootfs image: - - $ make - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- Image - +-- boot.ini [1] - +-- boot.vfat - +-- meson64_odroidc2.dtb - +-- rootfs.ext2 - +-- rootfs.ext4 - +-- rootfs.tar - +-- sdcard.img - `-- u-boot.bin - -[1] This is the ODROID-C2 configuration file used in u-boot. - -How to write the SD card or eMMC -================================ - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card or eMMC with "dd": - - $ sudo dd if=output/images/sdcard.img of=/dev/sdX - -Insert the SDcard into your ODROID-C2, and power it up. Your new system -should come up now. diff --git a/buildroot/board/solidrun/mx6cubox/post-build.sh b/buildroot/board/solidrun/mx6cubox/post-build.sh index 43e091c5d..6ddc11370 100755 --- a/buildroot/board/solidrun/mx6cubox/post-build.sh +++ b/buildroot/board/solidrun/mx6cubox/post-build.sh @@ -2,7 +2,7 @@ BOARD_DIR="$(dirname $0)" -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ --n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr +install -d -m 755 $TARGET_DIR/boot -install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr +$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ + -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr diff --git a/buildroot/board/udoo/neo/post-build.sh b/buildroot/board/udoo/neo/post-build.sh index 43e091c5d..6ccd87faf 100755 --- a/buildroot/board/udoo/neo/post-build.sh +++ b/buildroot/board/udoo/neo/post-build.sh @@ -2,7 +2,6 @@ BOARD_DIR="$(dirname $0)" +install -d -m 755 $TARGET_DIR/boot $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ --n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr - -install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr + -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr diff --git a/buildroot/board/wandboard/post-build.sh b/buildroot/board/wandboard/post-build.sh index 43e091c5d..6ddc11370 100755 --- a/buildroot/board/wandboard/post-build.sh +++ b/buildroot/board/wandboard/post-build.sh @@ -2,7 +2,7 @@ BOARD_DIR="$(dirname $0)" -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ --n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr +install -d -m 755 $TARGET_DIR/boot -install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr +$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ + -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr diff --git a/buildroot/configs/amarula_a64_relic_defconfig b/buildroot/configs/amarula_a64_relic_defconfig index f2e7e7f96..304a3ef82 100644 --- a/buildroot/configs/amarula_a64_relic_defconfig +++ b/buildroot/configs/amarula_a64_relic_defconfig @@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_GENERIC_ISSUE="Welcome to Amarula A64-Relic" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_PACKAGE_HOST_ANDROID_TOOLS=y BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig index 4d3d4e3a2..fdbca331a 100644 --- a/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -9,6 +9,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Bootloader BR2_TARGET_UBOOT=y @@ -51,7 +52,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y # qt5 BR2_PACKAGE_QT5=y -BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_FONTCONFIG=y diff --git a/buildroot/configs/freescale_imx28evk_defconfig b/buildroot/configs/freescale_imx28evk_defconfig index b0a0c15ef..520c63f67 100644 --- a/buildroot/configs/freescale_imx28evk_defconfig +++ b/buildroot/configs/freescale_imx28evk_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT4=y +BR2_TARGET_ROOTFS_EXT2_4=y # To generate SD Image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/imx23evk_defconfig b/buildroot/configs/imx23evk_defconfig index 87610d1b7..b5bfc849b 100644 --- a/buildroot/configs/imx23evk_defconfig +++ b/buildroot/configs/imx23evk_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT4=y +BR2_TARGET_ROOTFS_EXT2_4=y # To generate SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot/configs/imx6-sabresd_qt5_defconfig b/buildroot/configs/imx6-sabresd_qt5_defconfig index 47c00284d..8fcc4f713 100644 --- a/buildroot/configs/imx6-sabresd_qt5_defconfig +++ b/buildroot/configs/imx6-sabresd_qt5_defconfig @@ -68,7 +68,6 @@ BR2_PACKAGE_MESA3D_DEMOS=y # Qt5 BR2_PACKAGE_QT5=y -BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_FONTCONFIG=y diff --git a/buildroot/configs/minnowboard_max-graphical_defconfig b/buildroot/configs/minnowboard_max-graphical_defconfig index 33630c6b0..910c324e2 100644 --- a/buildroot/configs/minnowboard_max-graphical_defconfig +++ b/buildroot/configs/minnowboard_max-graphical_defconfig @@ -42,6 +42,7 @@ BR2_PACKAGE_MESA3D_DEMOS=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y +BR2_PACKAGE_MESA3D_OPENGL_GLX=y # Framebuffer (just for testing purposes) BR2_PACKAGE_FB_TEST_APP=y diff --git a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig index 21b681a1f..4419d9bc2 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig @@ -6,6 +6,10 @@ BR2_ARM_EABIHF=y # Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Toolchain +# glibc is needed for sunxi-mali-mainline-package. +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" diff --git a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig index 029f9ebad..fd34054af 100644 --- a/buildroot/configs/olimex_a20_olinuxino_lime_defconfig +++ b/buildroot/configs/olimex_a20_olinuxino_lime_defconfig @@ -6,6 +6,10 @@ BR2_ARM_EABIHF=y # Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Toolchain +# glibc is needed for sunxi-mali-mainline-package. +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" diff --git a/buildroot/configs/olimex_imx233_olinuxino_defconfig b/buildroot/configs/olimex_imx233_olinuxino_defconfig index 26e5ad139..275dd98af 100644 --- a/buildroot/configs/olimex_imx233_olinuxino_defconfig +++ b/buildroot/configs/olimex_imx233_olinuxino_defconfig @@ -33,7 +33,7 @@ BR2_PACKAGE_ZD1211_FIRMWARE=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT4=y +BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set # U-Boot diff --git a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig index c7c324d5e..8b105cf7e 100644 --- a/buildroot/configs/qemu_ppc_virtex_ml507_defconfig +++ b/buildroot/configs/qemu_ppc_virtex_ml507_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Use soft float -BR2_SOFT_FLOAT=y +BR2_POWERPC_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y diff --git a/buildroot/configs/qemu_riscv32_virt_defconfig b/buildroot/configs/qemu_riscv32_virt_defconfig index 914eada00..242cc69e5 100644 --- a/buildroot/configs/qemu_riscv32_virt_defconfig +++ b/buildroot/configs/qemu_riscv32_virt_defconfig @@ -23,7 +23,6 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_USE_PLAT=y BR2_TARGET_OPENSBI_PLAT="qemu/virt" # host-qemu for gitlab testing diff --git a/buildroot/configs/qemu_riscv64_virt_defconfig b/buildroot/configs/qemu_riscv64_virt_defconfig index 5c52f7a0f..10d789948 100644 --- a/buildroot/configs/qemu_riscv64_virt_defconfig +++ b/buildroot/configs/qemu_riscv64_virt_defconfig @@ -22,7 +22,6 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_USE_PLAT=y BR2_TARGET_OPENSBI_PLAT="qemu/virt" # host-qemu for gitlab testing diff --git a/buildroot/docs/manual/adding-packages-python.txt b/buildroot/docs/manual/adding-packages-python.txt index 74e2e78b2..0c100859b 100644 --- a/buildroot/docs/manual/adding-packages-python.txt +++ b/buildroot/docs/manual/adding-packages-python.txt @@ -98,10 +98,9 @@ Note that: dependencies are automatically added as needed by the Python package infrastructure. - * Similarly, it is not needed to add +host-setuptools+ and/or - +host-distutilscross+ dependencies to +PYTHON_FOO_DEPENDENCIES+ for - setuptools-based packages, since these are automatically added by - the Python infrastructure as needed. + * Similarly, it is not needed to add +host-setuptools+ to + +PYTHON_FOO_DEPENDENCIES+ for setuptools-based packages, since it's + automatically added by the Python infrastructure as needed. One variable specific to the Python infrastructure is mandatory: diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 3977e9f33..3a2218cae 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
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

List of Examples

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

Buildroot 2020.02.1 manual generated on 2020-04-10 -20:44:54 UTC from git revision 80e565bbeb

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
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

List of Examples

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

Buildroot 2020.02.2 manual generated on 2020-05-12 +12:18:35 UTC from git revision 2f7183d131

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 @@ -3608,10 +3608,9 @@ It is not necessary to add python or -Similarly, it is not needed to add host-setuptools and/or - host-distutilscross dependencies to PYTHON_FOO_DEPENDENCIES for - setuptools-based packages, since these are automatically added by - the Python infrastructure as needed. +Similarly, it is not needed to add host-setuptools to + PYTHON_FOO_DEPENDENCIES for setuptools-based packages, since it’s + automatically added by the Python infrastructure as needed.

One variable specific to the Python infrastructure is mandatory:

  • PYTHON_FOO_SETUP_TYPE, to define which Python build system is used by the package. The two supported values are distutils and @@ -5213,7 +5212,7 @@ large number of commits in the series;
  • deep impact of the changes in the rest of the project;
  • -RFC [4]; +RFC [4];
  • whenever you feel it will help presenting your work, your choices, the review process, etc. @@ -5417,7 +5416,7 @@ to trigger all run-test test case jobs: 
 $ git push gitlab HEAD:<name>-runtime-tests
  • to trigger one test case job, a specific branch naming string is used that includes the full test case name. -
 $ git push gitlab HEAD:<name>-<test case name>

[4] RFC: (Request for comments) change proposal

Chapter 22. DEVELOPERS file and get-developers

The main Buildroot directory contains a file named DEVELOPERS that +

 $ git push gitlab HEAD:<name>-<test case name>

[4] RFC: (Request for comments) change proposal

Chapter 22. DEVELOPERS file and get-developers

The main Buildroot directory contains a file named DEVELOPERS that lists the developers involved with various areas of Buildroot. Thanks to this file, the get-developers tool allows to:

  • Calculate the list of developers to whom patches should be sent, by diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index 6191b0db8bb8b4d472e73875400ac8170296ec99..64c19ef7d6cbd24605b03f47ccb113fa76776e2b 100644 GIT binary patch delta 14240 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 diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index e9c3af74d..848cba11b 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -163,13 +163,13 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2020.02.1 manual generated on 2020-04-10 20:45:00 UTC from -git revision 80e565bbeb +Buildroot 2020.02.2 manual generated on 2020-05-12 12:18:45 UTC from +git revision 2f7183d131 The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id= -80e565bbebc61bf113bcd3b3475fa27a5127f466] file in the Buildroot +2f7183d13133f2ded97fee273bd0cbed10226e4e] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers @@ -5167,10 +5167,9 @@ Note that: PYTHON_FOO_DEPENDENCIES variable of a package, since these basic dependencies are automatically added as needed by the Python package infrastructure. - * Similarly, it is not needed to add host-setuptools and/or - host-distutilscross dependencies to PYTHON_FOO_DEPENDENCIES for - setuptools-based packages, since these are automatically added by - the Python infrastructure as needed. + * Similarly, it is not needed to add host-setuptools to + PYTHON_FOO_DEPENDENCIES for setuptools-based packages, since it’s + automatically added by the Python infrastructure as needed. One variable specific to the Python infrastructure is mandatory: diff --git a/buildroot/fs/cpio/init b/buildroot/fs/cpio/init index dbe09ac68..b0af18b67 100755 --- a/buildroot/fs/cpio/init +++ b/buildroot/fs/cpio/init @@ -1,7 +1,4 @@ #!/bin/sh # devtmpfs does not get automounted for initramfs /bin/mount -t devtmpfs devtmpfs /dev -exec 0/dev/console -exec 2>/dev/console exec /sbin/init "$@" diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index c367b3337..8b8776771 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -30,7 +30,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.4)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (4.19.98-cip19)" + bool "Latest CIP SLTS version (4.19.118-cip25)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -49,7 +49,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (4.19.98-cip19-rt7)" + bool "Latest CIP RT SLTS version (4.19.115-cip24-rt9)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -128,9 +128,9 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.4.31" if BR2_LINUX_KERNEL_LATEST_VERSION - default "4.19.98-cip19" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "4.19.98-cip19-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "5.4.40" 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 \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index f6bad5c8e..ed76f6804 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a11083f8f809887f6a0f8d4467532385b99418f17998fe6e837807491c276eeb linux-5.4.31.tar.xz +sha256 83563f027687ecaafb41d0d2d52056f40ec9822f8a9e43592e215349730020ab linux-5.4.40.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063 linux-4.4.218.tar.xz -sha256 df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd linux-4.9.218.tar.xz -sha256 cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c linux-4.14.175.tar.xz -sha256 1e40a0dc6afc95a259f97b80d5f5ef8f89e2ee49e993ba6844e2bc55de361f0e linux-4.19.114.tar.xz +sha256 cd963e66d7fb07f142fa5274ec90f46c8388a327e2ba28c5fec245d734b0d425 linux-4.4.223.tar.xz +sha256 cf5300e6f5d8c66c2bed8f00d53f9c58103731809862427012e4010f5d782ae5 linux-4.9.223.tar.xz +sha256 444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e linux-4.14.180.tar.xz +sha256 5050268ec5cf003d96366d1611ecfa4ab6974125d6fa26cea1ccb81dd4df00a5 linux-4.19.122.tar.xz # Locally computed -sha256 18f9ddba0b777d1942d6c81877ba97c4bcd08488e2c409e57dcce866b9de5fc2 linux-cip-4.19.98-cip19.tar.gz -sha256 7d5aeb67da41dc66ef28621ef994ef4403e8b1f5c3df38b1843da20972444280 linux-cip-4.19.98-cip19-rt7.tar.gz +sha256 ea53913813cb5a9069608532b327de7a7ed0fdc8fed8c6f10cd55d1ac6a58ffb linux-cip-4.19.118-cip25.tar.gz +sha256 7f0a0db0e1cfb14053523f4432f1ad1468b5bd42305b44905c4b103466c8d655 linux-cip-4.19.115-cip24-rt9.tar.gz # Licenses hashes sha256 ee5808b032a67f587d3541099d46de34f5bec8cd5976114ba07f1299ee6001ff COPYING diff --git a/buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch b/buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch new file mode 100644 index 000000000..af3cd47a3 --- /dev/null +++ b/buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch @@ -0,0 +1,77 @@ +From 5b95d256387b45fbe33f7ee7890ae35afdd5c371 Mon Sep 17 00:00:00 2001 +From: Joe Orton +Date: Fri, 13 Mar 2020 14:34:18 +0000 +Subject: [PATCH] * server/log.c (ap_log_pid): Use a temporary file, then + rename once successfully written; also add error checking. Avoids startup + failures if a previous httpd invocation crashed while writing the pidfile. + +Submitted by: Nicolas Carrier , jorton +Github: closes #100, closes #69 +PR: 63140 + +git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875153 13f79535-47bb-0310-9956-ffa450edef68 +Signed-off-by: Nicolas Carrier +--- + server/log.c | 33 ++++++++++++++++++++++++++------- + 1 file changed, 26 insertions(+), 7 deletions(-) + +diff --git a/server/log.c b/server/log.c +index f0bde6e4b8..8d54b4e057 100644 +--- a/server/log.c ++++ b/server/log.c +@@ -1598,6 +1598,9 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) + pid_t mypid; + apr_status_t rv; + const char *fname; ++ char *temp_fname; ++ apr_fileperms_t perms; ++ char pidstr[64]; + + if (!filename) { + return; +@@ -1626,19 +1629,35 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) + fname); + } + +- if ((rv = apr_file_open(&pid_file, fname, +- APR_WRITE | APR_CREATE | APR_TRUNCATE, +- APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p)) +- != APR_SUCCESS) { ++ temp_fname = apr_pstrcat(p, fname, ".XXXXXX", NULL); ++ rv = apr_file_mktemp(&pid_file, temp_fname, ++ APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE, p); ++ if (rv != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(00099) +- "could not create %s", fname); ++ "could not create %s", temp_fname); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, APLOGNO(00100) + "%s: could not log pid to file %s", + ap_server_argv0, fname); + exit(1); + } +- apr_file_printf(pid_file, "%" APR_PID_T_FMT APR_EOL_STR, mypid); +- apr_file_close(pid_file); ++ ++ apr_snprintf(pidstr, sizeof pidstr, "%" APR_PID_T_FMT APR_EOL_STR, mypid); ++ ++ perms = APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD; ++ rv = apr_file_perms_set(temp_fname, perms); ++ if (rv == APR_SUCCESS) ++ rv = apr_file_write_full(pid_file, pidstr, strlen(pidstr), NULL); ++ if (rv == APR_SUCCESS) ++ rv = apr_file_close(pid_file); ++ if (rv == APR_SUCCESS) ++ rv = apr_file_rename(temp_fname, fname, p); ++ if (rv != APR_SUCCESS) { ++ ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(10231) ++ "%s: Failed creating pid file %s", ++ ap_server_argv0, temp_fname); ++ exit(1); ++ } ++ + saved_pid = mypid; + } + +-- +2.25.2 + diff --git a/buildroot/package/apache/apache.hash b/buildroot/package/apache/apache.hash index 24c00eb94..7b0e4ad8e 100644 --- a/buildroot/package/apache/apache.hash +++ b/buildroot/package/apache/apache.hash @@ -1,4 +1,4 @@ -# From http://archive.apache.org/dist/httpd/httpd-2.4.41.tar.bz2.sha256 -sha256 133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40 httpd-2.4.41.tar.bz2 +# From http://archive.apache.org/dist/httpd/httpd-2.4.43.tar.bz2.sha256 +sha256 a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43 httpd-2.4.43.tar.bz2 # Locally computed -sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE +sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/buildroot/package/apache/apache.mk b/buildroot/package/apache/apache.mk index 5fcb9e537..068f36e32 100644 --- a/buildroot/package/apache/apache.mk +++ b/buildroot/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.41 +APACHE_VERSION = 2.4.43 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 @@ -99,6 +99,7 @@ APACHE_CONF_OPTS += --disable-deflate endif define APACHE_FIX_STAGING_APACHE_CONFIG + $(SED) 's%"/usr/bin"%"$(STAGING_DIR)/usr/bin"%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk endef diff --git a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index 8b3f67039..f63297844 100644 --- a/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -17,35 +17,55 @@ AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON # The project only supports building one kind of library. # Further the install target installs the wrong files, so we do it here: ifeq ($(BR2_STATIC_LIBS),y) -AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.a c-utility/libaziotsharedutil.a \ - iothub_client/libiothub_client.a iothub_client/libiothub_client_mqtt_ws_transport.a \ +AZURE_IOT_SDK_C_LIBS += \ + uamqp/libuamqp.a \ + c-utility/libaziotsharedutil.a \ + iothub_client/libiothub_client.a \ + iothub_client/libiothub_client_mqtt_ws_transport.a \ iothub_client/libiothub_client_amqp_ws_transport.a \ iothub_client/libiothub_client_http_transport.a \ iothub_client/libiothub_client_amqp_transport.a \ iothub_client/libiothub_client_mqtt_transport.a \ - iothub_service_client/libiothub_service_client.a serializer/libserializer.a umqtt/libumqtt.a + iothub_service_client/libiothub_service_client.a \ + serializer/libserializer.a \ + umqtt/libumqtt.a \ + libparson.a else -AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.so c-utility/libaziotsharedutil.so \ - iothub_client/libiothub_client.so iothub_client/libiothub_client_mqtt_ws_transport.so \ +AZURE_IOT_SDK_C_LIBS += \ + uamqp/libuamqp.so \ + c-utility/libaziotsharedutil.so \ + iothub_client/libiothub_client.so \ + iothub_client/libiothub_client_mqtt_ws_transport.so \ iothub_client/libiothub_client_amqp_ws_transport.so \ iothub_client/libiothub_client_http_transport.so \ iothub_client/libiothub_client_amqp_transport.so \ iothub_client/libiothub_client_mqtt_transport.so \ - iothub_service_client/libiothub_service_client.so serializer/libserializer.so umqtt/libumqtt.so + iothub_service_client/libiothub_service_client.so \ + serializer/libserializer.so \ + umqtt/libumqtt.so.1.1.11 \ + libparson.so + +define AZURE_IOT_SDK_C_CREATE_SYMLINKS + ln -sf libumqtt.so.1.1.11 $(1)/usr/lib/libumqtt.so.1 + ln -sf libumqtt.so.1.1.11 $(1)/usr/lib/libumqtt.so +endef endif -define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS +define AZURE_IOT_SDK_C_INSTALL_LIBS $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(STAGING_DIR)/usr/lib/ + $(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l)) ) + $(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1)) +endef + +define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS + $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR)) cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/ cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/ endef define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS - $(foreach l,$(AZURE_IOT_SDK_C_LIBS), \ - $(INSTALL) -D -m 0755 $(@D)/$(l) $(TARGET_DIR)/usr/lib/ - ) + $(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR)) endef $(eval $(cmake-package)) diff --git a/buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch new file mode 100644 index 000000000..8ca8c965d --- /dev/null +++ b/buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch @@ -0,0 +1,376 @@ +From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sun, 19 Apr 2020 19:04:41 -0700 +Subject: [PATCH] xtensa: fix PR ld/25861 + +Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences +(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32} +for negative differences (subtracted symbol follows diminished symbol). +Don't generate XTENSA_DIFF relocations in the assembler, generate +XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position. + +Handle XTENSA_DIFF in BFD for compatibility with old object files. +Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value +as unsigned. + +2020-04-22 Max Filippov +bfd/ + * bfd-in2.h: Regenerated. + * elf32-xtensa.c (elf_howto_table): New entries for + R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. + (elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc) + (relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and + R_XTENSA_NDIFF{8,16,32}. + * libbfd.h (bfd_reloc_code_real_names): Add names for + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32}. + * reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32} + and BFD_RELOC_XTENSA_NDIFF{8,16,32}. + +binutils/ + * readelf.c (is_none_reloc): Recognize + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32}. + +gas/ + * config/tc-xtensa.c (md_apply_fix): Replace + BFD_RELOC_XTENSA_DIFF{8,16,32} generation with + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32} generation. + * testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16 + with BFD_RELOC_XTENSA_PDIFF16 in the expected output. + +include/ + * elf/xtensa.h (elf_xtensa_reloc_type): New entries for + R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. + +Signed-off-by: Max Filippov +--- +Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20 + + bfd/bfd-in2.h | 20 ++++++- + bfd/elf32-xtensa.c | 89 +++++++++++++++++++++++++++++- + bfd/libbfd.h | 6 ++ + bfd/reloc.c | 24 ++++++++ + binutils/readelf.c | 8 ++- + gas/config/tc-xtensa.c | 12 +++- + gas/testsuite/gas/xtensa/loc.d | 2 +- + include/elf/xtensa.h | 6 ++ + 11 files changed, 160 insertions(+), 7 deletions(-) + +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 37114607b515..be6a30f57955 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures. */ + PLT entries. Otherwise, this is just a generic 32-bit relocation. */ + BFD_RELOC_XTENSA_PLT, + +-/* Xtensa relocations to mark the difference of two local symbols. ++/* Xtensa relocations for backward compatibility. These have been replaced ++by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. ++Xtensa relocations to mark the difference of two local symbols. + These are only needed to support linker relaxation and can be ignored + when not relaxing. The field is set to the value of the difference + assuming no relaxation. The relocation encodes the position of the +@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND. */ + BFD_RELOC_XTENSA_TLS_ARG, + BFD_RELOC_XTENSA_TLS_CALL, + ++/* Xtensa relocations to mark the difference of two local symbols. ++These are only needed to support linker relaxation and can be ignored ++when not relaxing. The field is set to the value of the difference ++assuming no relaxation. The relocation encodes the position of the ++subtracted symbol so the linker can determine whether to adjust the field ++value. PDIFF relocations are used for positive differences, NDIFF ++relocations are used for negative differences. The difference value ++is treated as unsigned with these relocation types, giving full ++8/16 value ranges. */ ++ BFD_RELOC_XTENSA_PDIFF8, ++ BFD_RELOC_XTENSA_PDIFF16, ++ BFD_RELOC_XTENSA_PDIFF32, ++ BFD_RELOC_XTENSA_NDIFF8, ++ BFD_RELOC_XTENSA_NDIFF16, ++ BFD_RELOC_XTENSA_NDIFF32, ++ + /* 8 bit signed offset in (ix+d) or (iy+d). */ + BFD_RELOC_Z80_DISP8, + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index 473a9d76f289..fded42d52a9a 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] = + HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, + bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL", + FALSE, 0, 0, FALSE), ++ ++ HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE), ++ HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE), ++ HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE), ++ ++ HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE), ++ HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE), ++ HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE), + }; + + #if DEBUG_GEN_RELOC +@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + TRACE ("BFD_RELOC_XTENSA_DIFF32"); + return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ]; + ++ case BFD_RELOC_XTENSA_PDIFF8: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF8"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ]; ++ ++ case BFD_RELOC_XTENSA_PDIFF16: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF16"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ]; ++ ++ case BFD_RELOC_XTENSA_PDIFF32: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF32"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF8: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF8"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF16: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF16"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF32: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF32"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ]; ++ + case BFD_RELOC_XTENSA_RTLD: + TRACE ("BFD_RELOC_XTENSA_RTLD"); + return &elf_howto_table[(unsigned) R_XTENSA_RTLD ]; +@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto, + case R_XTENSA_DIFF8: + case R_XTENSA_DIFF16: + case R_XTENSA_DIFF32: ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF8: ++ case R_XTENSA_NDIFF16: ++ case R_XTENSA_NDIFF32: + case R_XTENSA_TLS_FUNC: + case R_XTENSA_TLS_ARG: + case R_XTENSA_TLS_CALL: +@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + + if (r_type == R_XTENSA_DIFF8 + || r_type == R_XTENSA_DIFF16 +- || r_type == R_XTENSA_DIFF32) ++ || r_type == R_XTENSA_DIFF32 ++ || r_type == R_XTENSA_PDIFF8 ++ || r_type == R_XTENSA_PDIFF16 ++ || r_type == R_XTENSA_PDIFF32 ++ || r_type == R_XTENSA_NDIFF8 ++ || r_type == R_XTENSA_NDIFF16 ++ || r_type == R_XTENSA_NDIFF32) + { + bfd_signed_vma diff_value = 0; + bfd_vma new_end_offset, diff_mask = 0; +@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + diff_value = + bfd_get_signed_32 (abfd, &contents[old_source_offset]); + break; ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_NDIFF8: ++ diff_value = ++ bfd_get_8 (abfd, &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_NDIFF16: ++ diff_value = ++ bfd_get_16 (abfd, &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF32: ++ diff_value = ++ bfd_get_32 (abfd, &contents[old_source_offset]); ++ break; + } + ++ if (r_type >= R_XTENSA_NDIFF8 ++ && r_type <= R_XTENSA_NDIFF32) ++ diff_value = -diff_value; ++ + new_end_offset = offset_with_removed_text_map + (&target_relax_info->action_list, + r_rel.target_offset + diff_value); +@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + bfd_put_signed_32 (abfd, diff_value, + &contents[old_source_offset]); + break; ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_NDIFF8: ++ diff_mask = 0xff; ++ bfd_put_8 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_NDIFF16: ++ diff_mask = 0xffff; ++ bfd_put_16 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF32: ++ diff_mask = 0xffffffff; ++ bfd_put_32 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; + } + + /* Check for overflow. Sign bits must be all zeroes or all ones */ +diff --git a/bfd/libbfd.h b/bfd/libbfd.h +index 3c184fcadadf..989f4bc0b595 100644 +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", + "BFD_RELOC_XTENSA_TLS_FUNC", + "BFD_RELOC_XTENSA_TLS_ARG", + "BFD_RELOC_XTENSA_TLS_CALL", ++ "BFD_RELOC_XTENSA_PDIFF8", ++ "BFD_RELOC_XTENSA_PDIFF16", ++ "BFD_RELOC_XTENSA_PDIFF32", ++ "BFD_RELOC_XTENSA_NDIFF8", ++ "BFD_RELOC_XTENSA_NDIFF16", ++ "BFD_RELOC_XTENSA_NDIFF32", + "BFD_RELOC_Z80_DISP8", + "BFD_RELOC_Z80_BYTE0", + "BFD_RELOC_Z80_BYTE1", +diff --git a/bfd/reloc.c b/bfd/reloc.c +index c4dec86d1d46..f5df8e2ab3eb 100644 +--- a/bfd/reloc.c ++++ b/bfd/reloc.c +@@ -6556,6 +6556,8 @@ ENUMX + ENUMX + BFD_RELOC_XTENSA_DIFF32 + ENUMDOC ++ Xtensa relocations for backward compatibility. These have been replaced ++ by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. + Xtensa relocations to mark the difference of two local symbols. + These are only needed to support linker relaxation and can be ignored + when not relaxing. The field is set to the value of the difference +@@ -6668,6 +6670,28 @@ ENUMX + BFD_RELOC_XTENSA_TLS_CALL + ENUMDOC + Xtensa TLS relocations. ++ENUM ++ BFD_RELOC_XTENSA_PDIFF8 ++ENUMX ++ BFD_RELOC_XTENSA_PDIFF16 ++ENUMX ++ BFD_RELOC_XTENSA_PDIFF32 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF8 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF16 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF32 ++ENUMDOC ++ Xtensa relocations to mark the difference of two local symbols. ++ These are only needed to support linker relaxation and can be ignored ++ when not relaxing. The field is set to the value of the difference ++ assuming no relaxation. The relocation encodes the position of the ++ subtracted symbol so the linker can determine whether to adjust the field ++ value. PDIFF relocations are used for positive differences, NDIFF ++ relocations are used for negative differences. The difference value ++ is treated as unsigned with these relocation types, giving full ++ 8/16 value ranges. + + ENUM + BFD_RELOC_Z80_DISP8 +diff --git a/binutils/readelf.c b/binutils/readelf.c +index d4756c93b345..800918f901c8 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type) + return (reloc_type == 0 /* R_XTENSA_NONE. */ + || reloc_type == 17 /* R_XTENSA_DIFF8. */ + || reloc_type == 18 /* R_XTENSA_DIFF16. */ +- || reloc_type == 19 /* R_XTENSA_DIFF32. */); ++ || reloc_type == 19 /* R_XTENSA_DIFF32. */ ++ || reloc_type == 57 /* R_XTENSA_PDIFF8. */ ++ || reloc_type == 58 /* R_XTENSA_PDIFF16. */ ++ || reloc_type == 59 /* R_XTENSA_PDIFF32. */ ++ || reloc_type == 60 /* R_XTENSA_NDIFF8. */ ++ || reloc_type == 61 /* R_XTENSA_NDIFF16. */ ++ || reloc_type == 62 /* R_XTENSA_NDIFF32. */); + } + return FALSE; + } +diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c +index 71d4d94a8d7d..ee75c13548ff 100644 +--- a/gas/config/tc-xtensa.c ++++ b/gas/config/tc-xtensa.c +@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) + case BFD_RELOC_8: + if (fixP->fx_subsy) + { ++ bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset ++ < S_GET_VALUE (fixP->fx_subsy); ++ + switch (fixP->fx_r_type) + { + case BFD_RELOC_8: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8; + fixP->fx_signed = 0; + break; + case BFD_RELOC_16: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16; + fixP->fx_signed = 0; + break; + case BFD_RELOC_32: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32; + fixP->fx_signed = 0; + break; + default: +diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d +index 71983cc90055..8fb3425999d5 100644 +--- a/gas/testsuite/gas/xtensa/loc.d ++++ b/gas/testsuite/gas/xtensa/loc.d +@@ -6,5 +6,5 @@ + + RELOCATION RECORDS FOR \[\.debug_line\]: + #... +-.*R_XTENSA_DIFF16.*\.text\+0x00009c42 ++.*R_XTENSA_PDIFF16.*\.text\+0x00009c42 + #... +diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h +index 2eb5e4e52941..bd5c80d13777 100644 +--- a/include/elf/xtensa.h ++++ b/include/elf/xtensa.h +@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type) + RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54) + RELOC_NUMBER (R_XTENSA_TLS_ARG, 55) + RELOC_NUMBER (R_XTENSA_TLS_CALL, 56) ++ RELOC_NUMBER (R_XTENSA_PDIFF8, 57) ++ RELOC_NUMBER (R_XTENSA_PDIFF16, 58) ++ RELOC_NUMBER (R_XTENSA_PDIFF32, 59) ++ RELOC_NUMBER (R_XTENSA_NDIFF8, 60) ++ RELOC_NUMBER (R_XTENSA_NDIFF16, 61) ++ RELOC_NUMBER (R_XTENSA_NDIFF32, 62) + END_RELOC_NUMBERS (R_XTENSA_max) + + /* Processor-specific flags for the ELF header e_flags field. */ +-- +2.20.1 + diff --git a/buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch new file mode 100644 index 000000000..28f17d7c5 --- /dev/null +++ b/buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch @@ -0,0 +1,128 @@ +From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sat, 25 Apr 2020 00:40:25 -0700 +Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861 + +Fields marked with XTENSA_NDIFF relocations are not negated, they only +have sign bits removed. Don't negate their values when relaxation is +performed. Don't add sign bits when the value is zero. Report overflow +when the result has negative sign but all significant bits are zero. + +2020-04-29 Max Filippov +bfd/ + * elf32-xtensa.c (relax_section): Don't negate diff_value for + XTENSA_NDIFF relocations. Don't add sign bits whe diff_value + equals 0. Report overflow when the result has negative sign but + all significant bits are zero. + +Signed-off-by: Max Filippov +Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556 +--- + + bfd/elf32-xtensa.c | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index fded42d52a9a..4327b027911f 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + switch (r_type) + { + case R_XTENSA_DIFF8: ++ diff_mask = 0x7f; + diff_value = + bfd_get_signed_8 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_DIFF16: ++ diff_mask = 0x7fff; + diff_value = + bfd_get_signed_16 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_DIFF32: ++ diff_mask = 0x7fffffff; + diff_value = + bfd_get_signed_32 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF8: + case R_XTENSA_NDIFF8: ++ diff_mask = 0xff; + diff_value = + bfd_get_8 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF16: + case R_XTENSA_NDIFF16: ++ diff_mask = 0xffff; + diff_value = + bfd_get_16 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF32: + case R_XTENSA_NDIFF32: ++ diff_mask = 0xffffffff; + diff_value = + bfd_get_32 (abfd, &contents[old_source_offset]); + break; + } + + if (r_type >= R_XTENSA_NDIFF8 +- && r_type <= R_XTENSA_NDIFF32) +- diff_value = -diff_value; ++ && r_type <= R_XTENSA_NDIFF32 ++ && diff_value) ++ diff_value |= ~diff_mask; + + new_end_offset = offset_with_removed_text_map + (&target_relax_info->action_list, +@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + switch (r_type) + { + case R_XTENSA_DIFF8: +- diff_mask = 0x7f; + bfd_put_signed_8 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_DIFF16: +- diff_mask = 0x7fff; + bfd_put_signed_16 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_DIFF32: +- diff_mask = 0x7fffffff; + bfd_put_signed_32 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF8: + case R_XTENSA_NDIFF8: +- diff_mask = 0xff; + bfd_put_8 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF16: + case R_XTENSA_NDIFF16: +- diff_mask = 0xffff; + bfd_put_16 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF32: + case R_XTENSA_NDIFF32: +- diff_mask = 0xffffffff; + bfd_put_32 (abfd, diff_value, + &contents[old_source_offset]); + break; + } + +- /* Check for overflow. Sign bits must be all zeroes or all ones */ +- if ((diff_value & ~diff_mask) != 0 && +- (diff_value & ~diff_mask) != (-1 & ~diff_mask)) ++ /* Check for overflow. Sign bits must be all zeroes or ++ all ones. When sign bits are all ones diff_value ++ may not be zero. */ ++ if (((diff_value & ~diff_mask) != 0 ++ && (diff_value & ~diff_mask) != ~diff_mask) ++ || (diff_value && (bfd_vma) diff_value == ~diff_mask)) + { + (*link_info->callbacks->reloc_dangerous) + (link_info, _("overflow after relaxation"), +-- +2.20.1 + diff --git a/buildroot/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch new file mode 100644 index 000000000..2df46c652 --- /dev/null +++ b/buildroot/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch @@ -0,0 +1,432 @@ +From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sun, 19 Apr 2020 19:04:41 -0700 +Subject: [PATCH] xtensa: fix PR ld/25861 + +Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences +(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32} +for negative differences (subtracted symbol follows diminished symbol). +Don't generate XTENSA_DIFF relocations in the assembler, generate +XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position. + +Handle XTENSA_DIFF in BFD for compatibility with old object files. +Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value +as unsigned. + +2020-04-22 Max Filippov +bfd/ + * bfd-in2.h: Regenerated. + * elf32-xtensa.c (elf_howto_table): New entries for + R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. + (elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc) + (relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and + R_XTENSA_NDIFF{8,16,32}. + * libbfd.h (bfd_reloc_code_real_names): Add names for + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32}. + * reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32} + and BFD_RELOC_XTENSA_NDIFF{8,16,32}. + +binutils/ + * readelf.c (is_none_reloc): Recognize + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32}. + +gas/ + * config/tc-xtensa.c (md_apply_fix): Replace + BFD_RELOC_XTENSA_DIFF{8,16,32} generation with + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32} generation. + * testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16 + with BFD_RELOC_XTENSA_PDIFF16 in the expected output. + +include/ + * elf/xtensa.h (elf_xtensa_reloc_type): New entries for + R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. + +ld/ + * testsuite/ld-xtensa/relax-loc.d: New test definition. + * testsuite/ld-xtensa/relax-loc.s: New test source. + * testsuite/ld-xtensa/xtensa.exp (relax-loc): New test. + +Signed-off-by: Max Filippov +--- +Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20 + + bfd/bfd-in2.h | 20 ++++++- + bfd/elf32-xtensa.c | 89 +++++++++++++++++++++++++++++- + bfd/libbfd.h | 6 ++ + bfd/reloc.c | 24 ++++++++ + binutils/readelf.c | 8 ++- + gas/config/tc-xtensa.c | 12 +++- + gas/testsuite/gas/xtensa/loc.d | 2 +- + include/elf/xtensa.h | 6 ++ + ld/testsuite/ld-xtensa/relax-loc.d | 7 +++ + ld/testsuite/ld-xtensa/relax-loc.s | 15 +++++ + ld/testsuite/ld-xtensa/xtensa.exp | 1 + + 11 files changed, 183 insertions(+), 7 deletions(-) + create mode 100644 ld/testsuite/ld-xtensa/relax-loc.d + create mode 100644 ld/testsuite/ld-xtensa/relax-loc.s + +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 37114607b515..be6a30f57955 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures. */ + PLT entries. Otherwise, this is just a generic 32-bit relocation. */ + BFD_RELOC_XTENSA_PLT, + +-/* Xtensa relocations to mark the difference of two local symbols. ++/* Xtensa relocations for backward compatibility. These have been replaced ++by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. ++Xtensa relocations to mark the difference of two local symbols. + These are only needed to support linker relaxation and can be ignored + when not relaxing. The field is set to the value of the difference + assuming no relaxation. The relocation encodes the position of the +@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND. */ + BFD_RELOC_XTENSA_TLS_ARG, + BFD_RELOC_XTENSA_TLS_CALL, + ++/* Xtensa relocations to mark the difference of two local symbols. ++These are only needed to support linker relaxation and can be ignored ++when not relaxing. The field is set to the value of the difference ++assuming no relaxation. The relocation encodes the position of the ++subtracted symbol so the linker can determine whether to adjust the field ++value. PDIFF relocations are used for positive differences, NDIFF ++relocations are used for negative differences. The difference value ++is treated as unsigned with these relocation types, giving full ++8/16 value ranges. */ ++ BFD_RELOC_XTENSA_PDIFF8, ++ BFD_RELOC_XTENSA_PDIFF16, ++ BFD_RELOC_XTENSA_PDIFF32, ++ BFD_RELOC_XTENSA_NDIFF8, ++ BFD_RELOC_XTENSA_NDIFF16, ++ BFD_RELOC_XTENSA_NDIFF32, ++ + /* 8 bit signed offset in (ix+d) or (iy+d). */ + BFD_RELOC_Z80_DISP8, + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index 473a9d76f289..fded42d52a9a 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] = + HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, + bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL", + FALSE, 0, 0, FALSE), ++ ++ HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE), ++ HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE), ++ HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE), ++ ++ HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE), ++ HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE), ++ HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE), + }; + + #if DEBUG_GEN_RELOC +@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + TRACE ("BFD_RELOC_XTENSA_DIFF32"); + return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ]; + ++ case BFD_RELOC_XTENSA_PDIFF8: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF8"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ]; ++ ++ case BFD_RELOC_XTENSA_PDIFF16: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF16"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ]; ++ ++ case BFD_RELOC_XTENSA_PDIFF32: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF32"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF8: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF8"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF16: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF16"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF32: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF32"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ]; ++ + case BFD_RELOC_XTENSA_RTLD: + TRACE ("BFD_RELOC_XTENSA_RTLD"); + return &elf_howto_table[(unsigned) R_XTENSA_RTLD ]; +@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto, + case R_XTENSA_DIFF8: + case R_XTENSA_DIFF16: + case R_XTENSA_DIFF32: ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF8: ++ case R_XTENSA_NDIFF16: ++ case R_XTENSA_NDIFF32: + case R_XTENSA_TLS_FUNC: + case R_XTENSA_TLS_ARG: + case R_XTENSA_TLS_CALL: +@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + + if (r_type == R_XTENSA_DIFF8 + || r_type == R_XTENSA_DIFF16 +- || r_type == R_XTENSA_DIFF32) ++ || r_type == R_XTENSA_DIFF32 ++ || r_type == R_XTENSA_PDIFF8 ++ || r_type == R_XTENSA_PDIFF16 ++ || r_type == R_XTENSA_PDIFF32 ++ || r_type == R_XTENSA_NDIFF8 ++ || r_type == R_XTENSA_NDIFF16 ++ || r_type == R_XTENSA_NDIFF32) + { + bfd_signed_vma diff_value = 0; + bfd_vma new_end_offset, diff_mask = 0; +@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + diff_value = + bfd_get_signed_32 (abfd, &contents[old_source_offset]); + break; ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_NDIFF8: ++ diff_value = ++ bfd_get_8 (abfd, &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_NDIFF16: ++ diff_value = ++ bfd_get_16 (abfd, &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF32: ++ diff_value = ++ bfd_get_32 (abfd, &contents[old_source_offset]); ++ break; + } + ++ if (r_type >= R_XTENSA_NDIFF8 ++ && r_type <= R_XTENSA_NDIFF32) ++ diff_value = -diff_value; ++ + new_end_offset = offset_with_removed_text_map + (&target_relax_info->action_list, + r_rel.target_offset + diff_value); +@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + bfd_put_signed_32 (abfd, diff_value, + &contents[old_source_offset]); + break; ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_NDIFF8: ++ diff_mask = 0xff; ++ bfd_put_8 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_NDIFF16: ++ diff_mask = 0xffff; ++ bfd_put_16 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF32: ++ diff_mask = 0xffffffff; ++ bfd_put_32 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; + } + + /* Check for overflow. Sign bits must be all zeroes or all ones */ +diff --git a/bfd/libbfd.h b/bfd/libbfd.h +index 3c184fcadadf..989f4bc0b595 100644 +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", + "BFD_RELOC_XTENSA_TLS_FUNC", + "BFD_RELOC_XTENSA_TLS_ARG", + "BFD_RELOC_XTENSA_TLS_CALL", ++ "BFD_RELOC_XTENSA_PDIFF8", ++ "BFD_RELOC_XTENSA_PDIFF16", ++ "BFD_RELOC_XTENSA_PDIFF32", ++ "BFD_RELOC_XTENSA_NDIFF8", ++ "BFD_RELOC_XTENSA_NDIFF16", ++ "BFD_RELOC_XTENSA_NDIFF32", + "BFD_RELOC_Z80_DISP8", + "BFD_RELOC_Z80_BYTE0", + "BFD_RELOC_Z80_BYTE1", +diff --git a/bfd/reloc.c b/bfd/reloc.c +index c4dec86d1d46..f5df8e2ab3eb 100644 +--- a/bfd/reloc.c ++++ b/bfd/reloc.c +@@ -6556,6 +6556,8 @@ ENUMX + ENUMX + BFD_RELOC_XTENSA_DIFF32 + ENUMDOC ++ Xtensa relocations for backward compatibility. These have been replaced ++ by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. + Xtensa relocations to mark the difference of two local symbols. + These are only needed to support linker relaxation and can be ignored + when not relaxing. The field is set to the value of the difference +@@ -6668,6 +6670,28 @@ ENUMX + BFD_RELOC_XTENSA_TLS_CALL + ENUMDOC + Xtensa TLS relocations. ++ENUM ++ BFD_RELOC_XTENSA_PDIFF8 ++ENUMX ++ BFD_RELOC_XTENSA_PDIFF16 ++ENUMX ++ BFD_RELOC_XTENSA_PDIFF32 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF8 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF16 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF32 ++ENUMDOC ++ Xtensa relocations to mark the difference of two local symbols. ++ These are only needed to support linker relaxation and can be ignored ++ when not relaxing. The field is set to the value of the difference ++ assuming no relaxation. The relocation encodes the position of the ++ subtracted symbol so the linker can determine whether to adjust the field ++ value. PDIFF relocations are used for positive differences, NDIFF ++ relocations are used for negative differences. The difference value ++ is treated as unsigned with these relocation types, giving full ++ 8/16 value ranges. + + ENUM + BFD_RELOC_Z80_DISP8 +diff --git a/binutils/readelf.c b/binutils/readelf.c +index d4756c93b345..800918f901c8 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type) + return (reloc_type == 0 /* R_XTENSA_NONE. */ + || reloc_type == 17 /* R_XTENSA_DIFF8. */ + || reloc_type == 18 /* R_XTENSA_DIFF16. */ +- || reloc_type == 19 /* R_XTENSA_DIFF32. */); ++ || reloc_type == 19 /* R_XTENSA_DIFF32. */ ++ || reloc_type == 57 /* R_XTENSA_PDIFF8. */ ++ || reloc_type == 58 /* R_XTENSA_PDIFF16. */ ++ || reloc_type == 59 /* R_XTENSA_PDIFF32. */ ++ || reloc_type == 60 /* R_XTENSA_NDIFF8. */ ++ || reloc_type == 61 /* R_XTENSA_NDIFF16. */ ++ || reloc_type == 62 /* R_XTENSA_NDIFF32. */); + } + return FALSE; + } +diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c +index 71d4d94a8d7d..ee75c13548ff 100644 +--- a/gas/config/tc-xtensa.c ++++ b/gas/config/tc-xtensa.c +@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) + case BFD_RELOC_8: + if (fixP->fx_subsy) + { ++ bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset ++ < S_GET_VALUE (fixP->fx_subsy); ++ + switch (fixP->fx_r_type) + { + case BFD_RELOC_8: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8; + fixP->fx_signed = 0; + break; + case BFD_RELOC_16: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16; + fixP->fx_signed = 0; + break; + case BFD_RELOC_32: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32; + fixP->fx_signed = 0; + break; + default: +diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d +index 71983cc90055..8fb3425999d5 100644 +--- a/gas/testsuite/gas/xtensa/loc.d ++++ b/gas/testsuite/gas/xtensa/loc.d +@@ -6,5 +6,5 @@ + + RELOCATION RECORDS FOR \[\.debug_line\]: + #... +-.*R_XTENSA_DIFF16.*\.text\+0x00009c42 ++.*R_XTENSA_PDIFF16.*\.text\+0x00009c42 + #... +diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h +index 2eb5e4e52941..bd5c80d13777 100644 +--- a/include/elf/xtensa.h ++++ b/include/elf/xtensa.h +@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type) + RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54) + RELOC_NUMBER (R_XTENSA_TLS_ARG, 55) + RELOC_NUMBER (R_XTENSA_TLS_CALL, 56) ++ RELOC_NUMBER (R_XTENSA_PDIFF8, 57) ++ RELOC_NUMBER (R_XTENSA_PDIFF16, 58) ++ RELOC_NUMBER (R_XTENSA_PDIFF32, 59) ++ RELOC_NUMBER (R_XTENSA_NDIFF8, 60) ++ RELOC_NUMBER (R_XTENSA_NDIFF16, 61) ++ RELOC_NUMBER (R_XTENSA_NDIFF32, 62) + END_RELOC_NUMBERS (R_XTENSA_max) + + /* Processor-specific flags for the ELF header e_flags field. */ +diff --git a/ld/testsuite/ld-xtensa/relax-loc.d b/ld/testsuite/ld-xtensa/relax-loc.d +new file mode 100644 +index 000000000000..3c8d673732ff +--- /dev/null ++++ b/ld/testsuite/ld-xtensa/relax-loc.d +@@ -0,0 +1,7 @@ ++#as: --text-section-literals ++#ld: ++#objdump: --dwarf=decodedline ++#... ++relax-loc.s[ ]+1[ ]+0x400054[ ]+.* ++relax-loc.s[ ]+2[ ]+0x40005c[ ]+.* ++#... +diff --git a/ld/testsuite/ld-xtensa/relax-loc.s b/ld/testsuite/ld-xtensa/relax-loc.s +new file mode 100644 +index 000000000000..d768470e287a +--- /dev/null ++++ b/ld/testsuite/ld-xtensa/relax-loc.s +@@ -0,0 +1,15 @@ ++ .file 1 "relax-loc.s" ++ .globl _start ++ .globl _ResetVector ++ .text ++_ResetVector: ++_start: ++ .loc 1 1 ++ j 1f ++ .literal_position ++1: ++ .loc 1 2 ++ ++ .rep 10000 ++ movi a2, 0x12345678 ++ .endr +diff --git a/ld/testsuite/ld-xtensa/xtensa.exp b/ld/testsuite/ld-xtensa/xtensa.exp +index 9b2235b2151b..de39887936ad 100644 +--- a/ld/testsuite/ld-xtensa/xtensa.exp ++++ b/ld/testsuite/ld-xtensa/xtensa.exp +@@ -27,6 +27,7 @@ run_dump_test "call_overflow" + run_dump_test "coalesce" + run_dump_test "diff_overflow" + run_dump_test "lcall" ++run_dump_test "relax-loc" + + run_dump_test "relax-static-pie" + run_dump_test "relax-static-local-pie" +-- +2.20.1 + diff --git a/buildroot/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch new file mode 100644 index 000000000..28f17d7c5 --- /dev/null +++ b/buildroot/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch @@ -0,0 +1,128 @@ +From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sat, 25 Apr 2020 00:40:25 -0700 +Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861 + +Fields marked with XTENSA_NDIFF relocations are not negated, they only +have sign bits removed. Don't negate their values when relaxation is +performed. Don't add sign bits when the value is zero. Report overflow +when the result has negative sign but all significant bits are zero. + +2020-04-29 Max Filippov +bfd/ + * elf32-xtensa.c (relax_section): Don't negate diff_value for + XTENSA_NDIFF relocations. Don't add sign bits whe diff_value + equals 0. Report overflow when the result has negative sign but + all significant bits are zero. + +Signed-off-by: Max Filippov +Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556 +--- + + bfd/elf32-xtensa.c | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index fded42d52a9a..4327b027911f 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + switch (r_type) + { + case R_XTENSA_DIFF8: ++ diff_mask = 0x7f; + diff_value = + bfd_get_signed_8 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_DIFF16: ++ diff_mask = 0x7fff; + diff_value = + bfd_get_signed_16 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_DIFF32: ++ diff_mask = 0x7fffffff; + diff_value = + bfd_get_signed_32 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF8: + case R_XTENSA_NDIFF8: ++ diff_mask = 0xff; + diff_value = + bfd_get_8 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF16: + case R_XTENSA_NDIFF16: ++ diff_mask = 0xffff; + diff_value = + bfd_get_16 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF32: + case R_XTENSA_NDIFF32: ++ diff_mask = 0xffffffff; + diff_value = + bfd_get_32 (abfd, &contents[old_source_offset]); + break; + } + + if (r_type >= R_XTENSA_NDIFF8 +- && r_type <= R_XTENSA_NDIFF32) +- diff_value = -diff_value; ++ && r_type <= R_XTENSA_NDIFF32 ++ && diff_value) ++ diff_value |= ~diff_mask; + + new_end_offset = offset_with_removed_text_map + (&target_relax_info->action_list, +@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + switch (r_type) + { + case R_XTENSA_DIFF8: +- diff_mask = 0x7f; + bfd_put_signed_8 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_DIFF16: +- diff_mask = 0x7fff; + bfd_put_signed_16 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_DIFF32: +- diff_mask = 0x7fffffff; + bfd_put_signed_32 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF8: + case R_XTENSA_NDIFF8: +- diff_mask = 0xff; + bfd_put_8 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF16: + case R_XTENSA_NDIFF16: +- diff_mask = 0xffff; + bfd_put_16 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF32: + case R_XTENSA_NDIFF32: +- diff_mask = 0xffffffff; + bfd_put_32 (abfd, diff_value, + &contents[old_source_offset]); + break; + } + +- /* Check for overflow. Sign bits must be all zeroes or all ones */ +- if ((diff_value & ~diff_mask) != 0 && +- (diff_value & ~diff_mask) != (-1 & ~diff_mask)) ++ /* Check for overflow. Sign bits must be all zeroes or ++ all ones. When sign bits are all ones diff_value ++ may not be zero. */ ++ if (((diff_value & ~diff_mask) != 0 ++ && (diff_value & ~diff_mask) != ~diff_mask) ++ || (diff_value && (bfd_vma) diff_value == ~diff_mask)) + { + (*link_info->callbacks->reloc_dangerous) + (link_info, _("overflow after relaxation"), +-- +2.20.1 + diff --git a/buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch b/buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch new file mode 100644 index 000000000..2df46c652 --- /dev/null +++ b/buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch @@ -0,0 +1,432 @@ +From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sun, 19 Apr 2020 19:04:41 -0700 +Subject: [PATCH] xtensa: fix PR ld/25861 + +Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences +(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32} +for negative differences (subtracted symbol follows diminished symbol). +Don't generate XTENSA_DIFF relocations in the assembler, generate +XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position. + +Handle XTENSA_DIFF in BFD for compatibility with old object files. +Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value +as unsigned. + +2020-04-22 Max Filippov +bfd/ + * bfd-in2.h: Regenerated. + * elf32-xtensa.c (elf_howto_table): New entries for + R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. + (elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc) + (relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and + R_XTENSA_NDIFF{8,16,32}. + * libbfd.h (bfd_reloc_code_real_names): Add names for + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32}. + * reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32} + and BFD_RELOC_XTENSA_NDIFF{8,16,32}. + +binutils/ + * readelf.c (is_none_reloc): Recognize + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32}. + +gas/ + * config/tc-xtensa.c (md_apply_fix): Replace + BFD_RELOC_XTENSA_DIFF{8,16,32} generation with + BFD_RELOC_XTENSA_PDIFF{8,16,32} and + BFD_RELOC_XTENSA_NDIFF{8,16,32} generation. + * testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16 + with BFD_RELOC_XTENSA_PDIFF16 in the expected output. + +include/ + * elf/xtensa.h (elf_xtensa_reloc_type): New entries for + R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. + +ld/ + * testsuite/ld-xtensa/relax-loc.d: New test definition. + * testsuite/ld-xtensa/relax-loc.s: New test source. + * testsuite/ld-xtensa/xtensa.exp (relax-loc): New test. + +Signed-off-by: Max Filippov +--- +Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20 + + bfd/bfd-in2.h | 20 ++++++- + bfd/elf32-xtensa.c | 89 +++++++++++++++++++++++++++++- + bfd/libbfd.h | 6 ++ + bfd/reloc.c | 24 ++++++++ + binutils/readelf.c | 8 ++- + gas/config/tc-xtensa.c | 12 +++- + gas/testsuite/gas/xtensa/loc.d | 2 +- + include/elf/xtensa.h | 6 ++ + ld/testsuite/ld-xtensa/relax-loc.d | 7 +++ + ld/testsuite/ld-xtensa/relax-loc.s | 15 +++++ + ld/testsuite/ld-xtensa/xtensa.exp | 1 + + 11 files changed, 183 insertions(+), 7 deletions(-) + create mode 100644 ld/testsuite/ld-xtensa/relax-loc.d + create mode 100644 ld/testsuite/ld-xtensa/relax-loc.s + +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 37114607b515..be6a30f57955 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures. */ + PLT entries. Otherwise, this is just a generic 32-bit relocation. */ + BFD_RELOC_XTENSA_PLT, + +-/* Xtensa relocations to mark the difference of two local symbols. ++/* Xtensa relocations for backward compatibility. These have been replaced ++by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. ++Xtensa relocations to mark the difference of two local symbols. + These are only needed to support linker relaxation and can be ignored + when not relaxing. The field is set to the value of the difference + assuming no relaxation. The relocation encodes the position of the +@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND. */ + BFD_RELOC_XTENSA_TLS_ARG, + BFD_RELOC_XTENSA_TLS_CALL, + ++/* Xtensa relocations to mark the difference of two local symbols. ++These are only needed to support linker relaxation and can be ignored ++when not relaxing. The field is set to the value of the difference ++assuming no relaxation. The relocation encodes the position of the ++subtracted symbol so the linker can determine whether to adjust the field ++value. PDIFF relocations are used for positive differences, NDIFF ++relocations are used for negative differences. The difference value ++is treated as unsigned with these relocation types, giving full ++8/16 value ranges. */ ++ BFD_RELOC_XTENSA_PDIFF8, ++ BFD_RELOC_XTENSA_PDIFF16, ++ BFD_RELOC_XTENSA_PDIFF32, ++ BFD_RELOC_XTENSA_NDIFF8, ++ BFD_RELOC_XTENSA_NDIFF16, ++ BFD_RELOC_XTENSA_NDIFF32, ++ + /* 8 bit signed offset in (ix+d) or (iy+d). */ + BFD_RELOC_Z80_DISP8, + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index 473a9d76f289..fded42d52a9a 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] = + HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, + bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL", + FALSE, 0, 0, FALSE), ++ ++ HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE), ++ HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE), ++ HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE), ++ ++ HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE), ++ HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE), ++ HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, ++ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE), + }; + + #if DEBUG_GEN_RELOC +@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + TRACE ("BFD_RELOC_XTENSA_DIFF32"); + return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ]; + ++ case BFD_RELOC_XTENSA_PDIFF8: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF8"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ]; ++ ++ case BFD_RELOC_XTENSA_PDIFF16: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF16"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ]; ++ ++ case BFD_RELOC_XTENSA_PDIFF32: ++ TRACE ("BFD_RELOC_XTENSA_PDIFF32"); ++ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF8: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF8"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF16: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF16"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ]; ++ ++ case BFD_RELOC_XTENSA_NDIFF32: ++ TRACE ("BFD_RELOC_XTENSA_NDIFF32"); ++ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ]; ++ + case BFD_RELOC_XTENSA_RTLD: + TRACE ("BFD_RELOC_XTENSA_RTLD"); + return &elf_howto_table[(unsigned) R_XTENSA_RTLD ]; +@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto, + case R_XTENSA_DIFF8: + case R_XTENSA_DIFF16: + case R_XTENSA_DIFF32: ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF8: ++ case R_XTENSA_NDIFF16: ++ case R_XTENSA_NDIFF32: + case R_XTENSA_TLS_FUNC: + case R_XTENSA_TLS_ARG: + case R_XTENSA_TLS_CALL: +@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + + if (r_type == R_XTENSA_DIFF8 + || r_type == R_XTENSA_DIFF16 +- || r_type == R_XTENSA_DIFF32) ++ || r_type == R_XTENSA_DIFF32 ++ || r_type == R_XTENSA_PDIFF8 ++ || r_type == R_XTENSA_PDIFF16 ++ || r_type == R_XTENSA_PDIFF32 ++ || r_type == R_XTENSA_NDIFF8 ++ || r_type == R_XTENSA_NDIFF16 ++ || r_type == R_XTENSA_NDIFF32) + { + bfd_signed_vma diff_value = 0; + bfd_vma new_end_offset, diff_mask = 0; +@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + diff_value = + bfd_get_signed_32 (abfd, &contents[old_source_offset]); + break; ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_NDIFF8: ++ diff_value = ++ bfd_get_8 (abfd, &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_NDIFF16: ++ diff_value = ++ bfd_get_16 (abfd, &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF32: ++ diff_value = ++ bfd_get_32 (abfd, &contents[old_source_offset]); ++ break; + } + ++ if (r_type >= R_XTENSA_NDIFF8 ++ && r_type <= R_XTENSA_NDIFF32) ++ diff_value = -diff_value; ++ + new_end_offset = offset_with_removed_text_map + (&target_relax_info->action_list, + r_rel.target_offset + diff_value); +@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + bfd_put_signed_32 (abfd, diff_value, + &contents[old_source_offset]); + break; ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_NDIFF8: ++ diff_mask = 0xff; ++ bfd_put_8 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_NDIFF16: ++ diff_mask = 0xffff; ++ bfd_put_16 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF32: ++ diff_mask = 0xffffffff; ++ bfd_put_32 (abfd, diff_value, ++ &contents[old_source_offset]); ++ break; + } + + /* Check for overflow. Sign bits must be all zeroes or all ones */ +diff --git a/bfd/libbfd.h b/bfd/libbfd.h +index 3c184fcadadf..989f4bc0b595 100644 +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", + "BFD_RELOC_XTENSA_TLS_FUNC", + "BFD_RELOC_XTENSA_TLS_ARG", + "BFD_RELOC_XTENSA_TLS_CALL", ++ "BFD_RELOC_XTENSA_PDIFF8", ++ "BFD_RELOC_XTENSA_PDIFF16", ++ "BFD_RELOC_XTENSA_PDIFF32", ++ "BFD_RELOC_XTENSA_NDIFF8", ++ "BFD_RELOC_XTENSA_NDIFF16", ++ "BFD_RELOC_XTENSA_NDIFF32", + "BFD_RELOC_Z80_DISP8", + "BFD_RELOC_Z80_BYTE0", + "BFD_RELOC_Z80_BYTE1", +diff --git a/bfd/reloc.c b/bfd/reloc.c +index c4dec86d1d46..f5df8e2ab3eb 100644 +--- a/bfd/reloc.c ++++ b/bfd/reloc.c +@@ -6556,6 +6556,8 @@ ENUMX + ENUMX + BFD_RELOC_XTENSA_DIFF32 + ENUMDOC ++ Xtensa relocations for backward compatibility. These have been replaced ++ by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. + Xtensa relocations to mark the difference of two local symbols. + These are only needed to support linker relaxation and can be ignored + when not relaxing. The field is set to the value of the difference +@@ -6668,6 +6670,28 @@ ENUMX + BFD_RELOC_XTENSA_TLS_CALL + ENUMDOC + Xtensa TLS relocations. ++ENUM ++ BFD_RELOC_XTENSA_PDIFF8 ++ENUMX ++ BFD_RELOC_XTENSA_PDIFF16 ++ENUMX ++ BFD_RELOC_XTENSA_PDIFF32 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF8 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF16 ++ENUMX ++ BFD_RELOC_XTENSA_NDIFF32 ++ENUMDOC ++ Xtensa relocations to mark the difference of two local symbols. ++ These are only needed to support linker relaxation and can be ignored ++ when not relaxing. The field is set to the value of the difference ++ assuming no relaxation. The relocation encodes the position of the ++ subtracted symbol so the linker can determine whether to adjust the field ++ value. PDIFF relocations are used for positive differences, NDIFF ++ relocations are used for negative differences. The difference value ++ is treated as unsigned with these relocation types, giving full ++ 8/16 value ranges. + + ENUM + BFD_RELOC_Z80_DISP8 +diff --git a/binutils/readelf.c b/binutils/readelf.c +index d4756c93b345..800918f901c8 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type) + return (reloc_type == 0 /* R_XTENSA_NONE. */ + || reloc_type == 17 /* R_XTENSA_DIFF8. */ + || reloc_type == 18 /* R_XTENSA_DIFF16. */ +- || reloc_type == 19 /* R_XTENSA_DIFF32. */); ++ || reloc_type == 19 /* R_XTENSA_DIFF32. */ ++ || reloc_type == 57 /* R_XTENSA_PDIFF8. */ ++ || reloc_type == 58 /* R_XTENSA_PDIFF16. */ ++ || reloc_type == 59 /* R_XTENSA_PDIFF32. */ ++ || reloc_type == 60 /* R_XTENSA_NDIFF8. */ ++ || reloc_type == 61 /* R_XTENSA_NDIFF16. */ ++ || reloc_type == 62 /* R_XTENSA_NDIFF32. */); + } + return FALSE; + } +diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c +index 71d4d94a8d7d..ee75c13548ff 100644 +--- a/gas/config/tc-xtensa.c ++++ b/gas/config/tc-xtensa.c +@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) + case BFD_RELOC_8: + if (fixP->fx_subsy) + { ++ bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset ++ < S_GET_VALUE (fixP->fx_subsy); ++ + switch (fixP->fx_r_type) + { + case BFD_RELOC_8: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8; + fixP->fx_signed = 0; + break; + case BFD_RELOC_16: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16; + fixP->fx_signed = 0; + break; + case BFD_RELOC_32: +- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; ++ fixP->fx_r_type = neg ++ ? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32; + fixP->fx_signed = 0; + break; + default: +diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d +index 71983cc90055..8fb3425999d5 100644 +--- a/gas/testsuite/gas/xtensa/loc.d ++++ b/gas/testsuite/gas/xtensa/loc.d +@@ -6,5 +6,5 @@ + + RELOCATION RECORDS FOR \[\.debug_line\]: + #... +-.*R_XTENSA_DIFF16.*\.text\+0x00009c42 ++.*R_XTENSA_PDIFF16.*\.text\+0x00009c42 + #... +diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h +index 2eb5e4e52941..bd5c80d13777 100644 +--- a/include/elf/xtensa.h ++++ b/include/elf/xtensa.h +@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type) + RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54) + RELOC_NUMBER (R_XTENSA_TLS_ARG, 55) + RELOC_NUMBER (R_XTENSA_TLS_CALL, 56) ++ RELOC_NUMBER (R_XTENSA_PDIFF8, 57) ++ RELOC_NUMBER (R_XTENSA_PDIFF16, 58) ++ RELOC_NUMBER (R_XTENSA_PDIFF32, 59) ++ RELOC_NUMBER (R_XTENSA_NDIFF8, 60) ++ RELOC_NUMBER (R_XTENSA_NDIFF16, 61) ++ RELOC_NUMBER (R_XTENSA_NDIFF32, 62) + END_RELOC_NUMBERS (R_XTENSA_max) + + /* Processor-specific flags for the ELF header e_flags field. */ +diff --git a/ld/testsuite/ld-xtensa/relax-loc.d b/ld/testsuite/ld-xtensa/relax-loc.d +new file mode 100644 +index 000000000000..3c8d673732ff +--- /dev/null ++++ b/ld/testsuite/ld-xtensa/relax-loc.d +@@ -0,0 +1,7 @@ ++#as: --text-section-literals ++#ld: ++#objdump: --dwarf=decodedline ++#... ++relax-loc.s[ ]+1[ ]+0x400054[ ]+.* ++relax-loc.s[ ]+2[ ]+0x40005c[ ]+.* ++#... +diff --git a/ld/testsuite/ld-xtensa/relax-loc.s b/ld/testsuite/ld-xtensa/relax-loc.s +new file mode 100644 +index 000000000000..d768470e287a +--- /dev/null ++++ b/ld/testsuite/ld-xtensa/relax-loc.s +@@ -0,0 +1,15 @@ ++ .file 1 "relax-loc.s" ++ .globl _start ++ .globl _ResetVector ++ .text ++_ResetVector: ++_start: ++ .loc 1 1 ++ j 1f ++ .literal_position ++1: ++ .loc 1 2 ++ ++ .rep 10000 ++ movi a2, 0x12345678 ++ .endr +diff --git a/ld/testsuite/ld-xtensa/xtensa.exp b/ld/testsuite/ld-xtensa/xtensa.exp +index 9b2235b2151b..de39887936ad 100644 +--- a/ld/testsuite/ld-xtensa/xtensa.exp ++++ b/ld/testsuite/ld-xtensa/xtensa.exp +@@ -27,6 +27,7 @@ run_dump_test "call_overflow" + run_dump_test "coalesce" + run_dump_test "diff_overflow" + run_dump_test "lcall" ++run_dump_test "relax-loc" + + run_dump_test "relax-static-pie" + run_dump_test "relax-static-local-pie" +-- +2.20.1 + diff --git a/buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch new file mode 100644 index 000000000..28f17d7c5 --- /dev/null +++ b/buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch @@ -0,0 +1,128 @@ +From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Sat, 25 Apr 2020 00:40:25 -0700 +Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861 + +Fields marked with XTENSA_NDIFF relocations are not negated, they only +have sign bits removed. Don't negate their values when relaxation is +performed. Don't add sign bits when the value is zero. Report overflow +when the result has negative sign but all significant bits are zero. + +2020-04-29 Max Filippov +bfd/ + * elf32-xtensa.c (relax_section): Don't negate diff_value for + XTENSA_NDIFF relocations. Don't add sign bits whe diff_value + equals 0. Report overflow when the result has negative sign but + all significant bits are zero. + +Signed-off-by: Max Filippov +Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556 +--- + + bfd/elf32-xtensa.c | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c +index fded42d52a9a..4327b027911f 100644 +--- a/bfd/elf32-xtensa.c ++++ b/bfd/elf32-xtensa.c +@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + switch (r_type) + { + case R_XTENSA_DIFF8: ++ diff_mask = 0x7f; + diff_value = + bfd_get_signed_8 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_DIFF16: ++ diff_mask = 0x7fff; + diff_value = + bfd_get_signed_16 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_DIFF32: ++ diff_mask = 0x7fffffff; + diff_value = + bfd_get_signed_32 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF8: + case R_XTENSA_NDIFF8: ++ diff_mask = 0xff; + diff_value = + bfd_get_8 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF16: + case R_XTENSA_NDIFF16: ++ diff_mask = 0xffff; + diff_value = + bfd_get_16 (abfd, &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF32: + case R_XTENSA_NDIFF32: ++ diff_mask = 0xffffffff; + diff_value = + bfd_get_32 (abfd, &contents[old_source_offset]); + break; + } + + if (r_type >= R_XTENSA_NDIFF8 +- && r_type <= R_XTENSA_NDIFF32) +- diff_value = -diff_value; ++ && r_type <= R_XTENSA_NDIFF32 ++ && diff_value) ++ diff_value |= ~diff_mask; + + new_end_offset = offset_with_removed_text_map + (&target_relax_info->action_list, +@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) + switch (r_type) + { + case R_XTENSA_DIFF8: +- diff_mask = 0x7f; + bfd_put_signed_8 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_DIFF16: +- diff_mask = 0x7fff; + bfd_put_signed_16 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_DIFF32: +- diff_mask = 0x7fffffff; + bfd_put_signed_32 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF8: + case R_XTENSA_NDIFF8: +- diff_mask = 0xff; + bfd_put_8 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF16: + case R_XTENSA_NDIFF16: +- diff_mask = 0xffff; + bfd_put_16 (abfd, diff_value, + &contents[old_source_offset]); + break; + case R_XTENSA_PDIFF32: + case R_XTENSA_NDIFF32: +- diff_mask = 0xffffffff; + bfd_put_32 (abfd, diff_value, + &contents[old_source_offset]); + break; + } + +- /* Check for overflow. Sign bits must be all zeroes or all ones */ +- if ((diff_value & ~diff_mask) != 0 && +- (diff_value & ~diff_mask) != (-1 & ~diff_mask)) ++ /* Check for overflow. Sign bits must be all zeroes or ++ all ones. When sign bits are all ones diff_value ++ may not be zero. */ ++ if (((diff_value & ~diff_mask) != 0 ++ && (diff_value & ~diff_mask) != ~diff_mask) ++ || (diff_value && (bfd_vma) diff_value == ~diff_mask)) + { + (*link_info->callbacks->reloc_dangerous) + (link_info, _("overflow after relaxation"), +-- +2.20.1 + diff --git a/buildroot/package/boinc/boinc.mk b/buildroot/package/boinc/boinc.mk index 827eaa0c8..5dccf4c43 100644 --- a/buildroot/package/boinc/boinc.mk +++ b/buildroot/package/boinc/boinc.mk @@ -15,6 +15,7 @@ BOINC_LICENSE = LGPL-3.0+ BOINC_LICENSE_FILES = COPYING COPYING.LESSER BOINC_DEPENDENCIES = host-pkgconf libcurl openssl BOINC_AUTORECONF = YES +BOINC_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ diff --git a/buildroot/package/c-ares/0001-use_check_build_instead_of_check_user.patch b/buildroot/package/c-ares/0001-use_check_build_instead_of_check_user.patch deleted file mode 100644 index 8210ed673..000000000 --- a/buildroot/package/c-ares/0001-use_check_build_instead_of_check_user.patch +++ /dev/null @@ -1,17 +0,0 @@ -Use XC_CHECK_BUILD_FLAGS instead of XC_CHECK_USER_FLAGS. -Otherwise it complains of CPPFLAGS in CFLAGS. - -Signed-off-by: Gustavo Zacarias - -diff -Nura c-ares-1.10.0.orig/m4/xc-cc-check.m4 c-ares-1.10.0/m4/xc-cc-check.m4 ---- c-ares-1.10.0.orig/m4/xc-cc-check.m4 2013-12-26 19:40:46.354195974 -0300 -+++ c-ares-1.10.0/m4/xc-cc-check.m4 2013-12-26 19:41:01.850718535 -0300 -@@ -59,7 +59,7 @@ - - AC_DEFUN([_XC_PROG_CC], [ - AC_REQUIRE([_XC_PROG_CC_PREAMBLE])dnl -- AC_REQUIRE([XC_CHECK_USER_FLAGS])dnl -+ AC_REQUIRE([XC_CHECK_BUILD_FLAGS])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AM_PROG_CC_C_O])dnl diff --git a/buildroot/package/c-ares/c-ares.hash b/buildroot/package/c-ares/c-ares.hash index a3599aaa1..04a87402e 100644 --- a/buildroot/package/c-ares/c-ares.hash +++ b/buildroot/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 6cdb97871f2930530c97deb7cf5c8fa4be5a0b02c7cea6e7c7667672a39d6852 c-ares-1.15.0.tar.gz +sha256 d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce c-ares-1.16.1.tar.gz # Hash for license file -sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md +sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/buildroot/package/c-ares/c-ares.mk b/buildroot/package/c-ares/c-ares.mk index f9e440d9b..f07a7e566 100644 --- a/buildroot/package/c-ares/c-ares.mk +++ b/buildroot/package/c-ares/c-ares.mk @@ -4,12 +4,10 @@ # ################################################################################ -C_ARES_VERSION = 1.15.0 +C_ARES_VERSION = 1.16.1 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom -# Rebuild configure to avoid XC_CHECK_USER_CFLAGS -C_ARES_AUTORECONF = YES C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md diff --git a/buildroot/package/cvs/cvs.hash b/buildroot/package/cvs/cvs.hash index b386d887b..7b03a552d 100644 --- a/buildroot/package/cvs/cvs.hash +++ b/buildroot/package/cvs/cvs.hash @@ -1,3 +1,8 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs/cvs_1.12.13-12%2Bsqueeze1.dsc -sha256 b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1 cvs_1.12.13.orig.tar.gz -sha256 d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f cvs_1.12.13-12+squeeze1.diff.gz +sha256 b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1 cvs_1.12.13.orig.tar.gz +sha256 d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f cvs_1.12.13-12+squeeze1.diff.gz + +# Hash for license files, locally computed +sha256 569c5b876327d899cf444b2277fe910128a38ca71d90755fe4125dd44f8ece02 COPYING +sha256 da0e282103fb508894e78db519aab255e36971ce0bc87de585e3b05014b83b1e COPYING.LIB +sha256 ee9a2fbdb626c0ac57fd8e569f357eb2e6d6c80cc6f41efa8bd126d5ea589d72 lib/glob-libc.h diff --git a/buildroot/package/cvs/cvs.mk b/buildroot/package/cvs/cvs.mk index 6f28b4dbe..563802cc9 100644 --- a/buildroot/package/cvs/cvs.mk +++ b/buildroot/package/cvs/cvs.mk @@ -8,6 +8,8 @@ CVS_VERSION = 1.12.13 CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz CVS_PATCH = cvs_$(CVS_VERSION)-12+squeeze1.diff.gz CVS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs +CVS_LICENSE = GPL-1.0+, LGPL-2.0+, LGPL-2.1+ (glob) +CVS_LICENSE_FILES = COPYING COPYING.LIB lib/glob-libc.h CVS_DEPENDENCIES = ncurses CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes diff --git a/buildroot/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash index 44f13c8bf..ef98aed9a 100644 --- a/buildroot/package/docker-cli/docker-cli.hash +++ b/buildroot/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 00d06baf4793794c0fd9ecad5b7e95aed6eb942f24c8b6e2d7c7f7564b9743ad docker-cli-19.03.5.tar.gz +sha256 36dd85273c95f4755e08b37ea9660a1bf5c315570b679a0ce268750ca1ed3801 docker-cli-19.03.8.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk index 4ad30e027..37f2a0e1c 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.5 +DOCKER_CLI_VERSION = 19.03.8 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_WORKSPACE = gopath diff --git a/buildroot/package/docker-containerd/docker-containerd.hash b/buildroot/package/docker-containerd/docker-containerd.hash index a4acc1771..95288be58 100644 --- a/buildroot/package/docker-containerd/docker-containerd.hash +++ b/buildroot/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41 docker-containerd-1.2.12.tar.gz +sha256 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 docker-containerd-1.2.13.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/buildroot/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk index 3fef99445..57d7d8bf6 100644 --- a/buildroot/package/docker-containerd/docker-containerd.mk +++ b/buildroot/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.2.12 +DOCKER_CONTAINERD_VERSION = 1.2.13 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash index 1f1643d37..c23eea90a 100644 --- a/buildroot/package/docker-engine/docker-engine.hash +++ b/buildroot/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bc5d1ac503e44593be8003ed0ad9c75bf0da535db19837a9338429c438bd4637 docker-engine-19.03.5.tar.gz +sha256 13ec45ad45091111bd566aca9d81989b3f05e0625dab68d33c3ad81ff924172f docker-engine-19.03.8.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index 3936f6449..2e88ba8a5 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.5 +DOCKER_ENGINE_VERSION = 19.03.8 DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 diff --git a/buildroot/package/domoticz/domoticz.mk b/buildroot/package/domoticz/domoticz.mk index ab560ba05..aeac0c65e 100644 --- a/buildroot/package/domoticz/domoticz.mk +++ b/buildroot/package/domoticz/domoticz.mk @@ -33,6 +33,9 @@ DOMOTICZ_CONF_OPTS += \ ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb +DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON +else +DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF endif ifeq ($(BR2_PACKAGE_OPENZWAVE),y) diff --git a/buildroot/package/e2fsprogs/e2fsprogs.hash b/buildroot/package/e2fsprogs/e2fsprogs.hash index 3ecbe4eaa..b563af27f 100644 --- a/buildroot/package/e2fsprogs/e2fsprogs.hash +++ b/buildroot/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.5/sha256sums.asc -sha256 f9faccc0d90f73556e797dc7cc5979b582bd50d3f8609c0f2ad48c736d44aede e2fsprogs-1.45.5.tar.xz +# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/sha256sums.asc +sha256 ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256 e2fsprogs-1.45.6.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/buildroot/package/e2fsprogs/e2fsprogs.mk b/buildroot/package/e2fsprogs/e2fsprogs.mk index fd59f701d..41986eec5 100644 --- a/buildroot/package/e2fsprogs/e2fsprogs.mk +++ b/buildroot/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.45.5 +E2FSPROGS_VERSION = 1.45.6 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) diff --git a/buildroot/package/efl/efl.mk b/buildroot/package/efl/efl.mk index f1e69f8a2..d8364ed76 100644 --- a/buildroot/package/efl/efl.mk +++ b/buildroot/package/efl/efl.mk @@ -257,6 +257,8 @@ EFL_CONF_OPTS += --disable-image-loader-webp endif ifeq ($(BR2_PACKAGE_POPPLER),y) +# poppler needs c++11 +EFL_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" EFL_DEPENDENCIES += poppler EFL_CONF_OPTS += --enable-poppler else diff --git a/buildroot/package/evtest/Config.in b/buildroot/package/evtest/Config.in index 1087217ee..e74bac02f 100644 --- a/buildroot/package/evtest/Config.in +++ b/buildroot/package/evtest/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_EVTEST device. It then monitors the device and displays all the events layer events generated. - http://cgit.freedesktop.org/evtest + https://gitlab.freedesktop.org/libevdev/evtest diff --git a/buildroot/package/evtest/evtest.hash b/buildroot/package/evtest/evtest.hash index 566d423fc..b1ee24371 100644 --- a/buildroot/package/evtest/evtest.hash +++ b/buildroot/package/evtest/evtest.hash @@ -1,5 +1,5 @@ # locally computed -sha256 73d5b604d57551418d282fedee3deae9f851afb3c355dccc87153364c046efd3 evtest-1.34.tar.gz +sha256 0e7a2eeff380af796e5e9b21b6f48fd706c58c931162c151c2c1074bdfeb85c6 evtest-evtest-1.34.tar.gz # License files sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/evtest/evtest.mk b/buildroot/package/evtest/evtest.mk index d2fd01c2d..8b8667e04 100644 --- a/buildroot/package/evtest/evtest.mk +++ b/buildroot/package/evtest/evtest.mk @@ -5,7 +5,8 @@ ################################################################################ EVTEST_VERSION = 1.34 -EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot +EVTEST_SOURCE = evtest-evtest-$(EVTEST_VERSION).tar.gz +EVTEST_SITE = https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-$(EVTEST_VERSION) EVTEST_LICENSE = GPL-2.0+ EVTEST_LICENSE_FILES = COPYING EVTEST_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch b/buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch new file mode 100644 index 000000000..e97bd78a6 --- /dev/null +++ b/buildroot/package/exim/0007-Makefile-Base-fix-version.-h-sh-generation-with-para.patch @@ -0,0 +1,84 @@ +From 19f6e36d3473ddba1a211e7af9352a10febb7270 Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Fri, 1 May 2020 16:27:48 +0200 +Subject: [PATCH] Makefile-Base: fix version.{h,sh} generation with parallel + build + +When using parallel make (make -j) the build sometimes fails either +during 'make' or during 'make install'. + +Error messages look either like: + + make[1]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4' + /bin/sh scripts/source_checks + `Makefile' is up to date. + + make[2]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4/build-br' + /bin/sh ../scripts/Configure-os.c + ../scripts/reversion: Your copy of Exim lacks any version information. + Makefile:785: recipe for target 'version.sh' failed + +or like: + + DESTDIR=/home/buildroot/autobuild/instance-2/output-1/target INSTALL_ARG="-no_chown -no_symlink" build=br /usr/bin/make -j4 -C /home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4 CFLAGS="-std=c99 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os " install + make[1]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4' + /bin/sh scripts/source_checks + `Makefile' is up to date. + + make[2]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/exim-4.93.0.4/build-br' + /home/buildroot/autobuild/instance-2/output-1/host/bin/i586-linux-gcc version.c + version.c: In function 'version_init': + version.c:32:1: error: expected expression before ';' token + ; + ^ + +This is due to the rule: + + version.h version.sh:: + @../scripts/reversion + +that executes reversion twice, once to satisfy the version.h target and +once for version.sh. This is unnecessary because reversion generates both +files anyway, but harmless without parallel build. When using parallel make +however reversion is sporadically run in a time sequence such that the +generated files are being used by other rules while they are being +rewritten by the second reversion instance. + +Fix by making only one of the two targets run reversion, and the other one +depend on it. + +Fixes builds found by the Buildroot autobuilders: + http://autobuild.buildroot.net/results/ebf/ebfccad007e216564889645a07f5487747116331// + http://autobuild.buildroot.net/results/56a/56a8457efcb32579ad6da99a769b6438dd0db267// + http://autobuild.buildroot.net/results/6a1/6a1f8a352649baf767b094cb6bbe2a7397fa7fac// + http://autobuild.buildroot.net/results/5ed/5ed1c42b3d33198f32d1267e5cc2b1fa1211495a// + http://autobuild.buildroot.net/results/b30/b304569948fd481ce33ecd052a1036153c5d459e// + http://autobuild.buildroot.net/results/d2c/d2c7abfe08672e53ff890127f787f8d2e84860f4// + +Signed-off-by: Luca Ceresoli +Upstream-status: patch submitted (https://bugs.exim.org/show_bug.cgi?id=2566) + +--- + OS/Makefile-Base | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/OS/Makefile-Base b/OS/Makefile-Base +index b66678bee4de..4966c25b5359 100644 +--- a/OS/Makefile-Base ++++ b/OS/Makefile-Base +@@ -664,9 +664,11 @@ PHDRS = ../config.h \ + + # Update Exim's version information and build the version object. + +-version.h version.sh:: ++version.sh:: + @../scripts/reversion + ++version.h: version.sh ++ + cnumber.h: version.h + + version.o: $(HDRS) cnumber.h version.h version.c +-- +2.26.2 + diff --git a/buildroot/package/exim/S86exim b/buildroot/package/exim/S86exim index bec88fc22..0d09361f6 100644 --- a/buildroot/package/exim/S86exim +++ b/buildroot/package/exim/S86exim @@ -3,11 +3,19 @@ # Start/stop exim # -PIDFILE=/var/lock/exim/exim-daemon.pid +PIDFILE=/var/run/exim/exim.pid case "$1" in start) echo "Starting exim..." + if [ ! -d /var/log/exim ]; then + mkdir -p /var/log/exim + chown exim:mail /var/log/exim + fi + if [ ! -d /var/run/exim ]; then + mkdir -p /var/run/exim + chown root:mail /var/run/exim + fi start-stop-daemon -S -x exim -- -bd ;; stop) diff --git a/buildroot/package/exim/exim.mk b/buildroot/package/exim/exim.mk index e4b0bfc1b..dc445c6d9 100644 --- a/buildroot/package/exim/exim.mk +++ b/buildroot/package/exim/exim.mk @@ -39,6 +39,8 @@ define EXIM_USE_DEFAULT_CONFIG_FILE $(INSTALL) -m 0644 $(@D)/src/EDITME $(@D)/Local/Makefile $(call exim-config-change,BIN_DIRECTORY,/usr/sbin) $(call exim-config-change,CONFIGURE_FILE,/etc/exim/configure) + $(call exim-config-change,LOG_FILE_PATH,/var/log/exim/exim_%slog) + $(call exim-config-change,PID_FILE_PATH,/var/run/exim/exim.pid) $(call exim-config-change,EXIM_USER,ref:exim) $(call exim-config-change,EXIM_GROUP,mail) $(call exim-config-change,TRANSPORT_LMTP,yes) @@ -118,16 +120,14 @@ endif # We need the host version of macro_predef during the build, before # building it we need to prepare the makefile. -# "The -j (parallel) flag must not be used with make" -# (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html) define EXIM_BUILD_CMDS - $(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) makefile - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D)/build-br macro_predef \ + $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) makefile + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build-br macro_predef \ CC=$(HOSTCC) \ LNCC=$(HOSTCC) \ CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" - $(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \ + $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ CFLAGS="-std=c99 $(TARGET_CFLAGS)" endef @@ -135,7 +135,7 @@ endef # something when installing... define EXIM_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \ - $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \ + $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ CFLAGS="-std=c99 $(TARGET_CFLAGS)" \ install chmod u+s $(TARGET_DIR)/usr/sbin/exim diff --git a/buildroot/package/exim/exim.service b/buildroot/package/exim/exim.service index fe97727ab..ac3f067de 100644 --- a/buildroot/package/exim/exim.service +++ b/buildroot/package/exim/exim.service @@ -3,6 +3,10 @@ Description=Exim MTA After=syslog.target network.target [Service] +User=exim +Group=mail +LogsDirectory=exim +RuntimeDirectory=exim ExecStart=/usr/sbin/exim -bdf Restart=always diff --git a/buildroot/package/ffmpeg/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch b/buildroot/package/ffmpeg/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch new file mode 100644 index 000000000..343d49600 --- /dev/null +++ b/buildroot/package/ffmpeg/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch @@ -0,0 +1,33 @@ +From 1812352d767ccf5431aa440123e2e260a4db2726 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer +Date: Sat, 7 Mar 2020 15:42:58 +0100 +Subject: [PATCH] avcodec/cbs_jpeg: Check length for SOS + +Fixes: out of array access +Fixes: 19734/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5673507031875584 +Fixes: 19353/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5703944462663680 + +Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg +Signed-off-by: Michael Niedermayer + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/FFmpeg/FFmpeg/commit/1812352d767ccf5431aa440123e2e260a4db2726] +--- + libavcodec/cbs_jpeg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c +index 6bbce5f89b7..89512a26bbf 100644 +--- a/libavcodec/cbs_jpeg.c ++++ b/libavcodec/cbs_jpeg.c +@@ -197,6 +197,9 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, + if (marker == JPEG_MARKER_SOS) { + length = AV_RB16(frag->data + start); + ++ if (length > end - start) ++ return AVERROR_INVALIDDATA; ++ + data_ref = NULL; + data = av_malloc(end - start + + AV_INPUT_BUFFER_PADDING_SIZE); diff --git a/buildroot/package/ffmpeg/Config.in b/buildroot/package/ffmpeg/Config.in index 33baff262..2efef7dd8 100644 --- a/buildroot/package/ffmpeg/Config.in +++ b/buildroot/package/ffmpeg/Config.in @@ -67,6 +67,13 @@ config BR2_PACKAGE_FFMPEG_FFPROBE FFprobe is a utility to determine the audio and video characteristics of a container file. +config BR2_PACKAGE_FFMPEG_XCBGRAB + bool "Build X11 screen grabbing" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + help + X11 screen grabbing using libxcb. + config BR2_PACKAGE_FFMPEG_AVRESAMPLE bool "Build libavresample" help diff --git a/buildroot/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk index b7148bbba..d01a9620d 100644 --- a/buildroot/package/ffmpeg/ffmpeg.mk +++ b/buildroot/package/ffmpeg/ffmpeg.mk @@ -16,6 +16,9 @@ FFMPEG_LICENSE += and GPL-2.0+ FFMPEG_LICENSE_FILES += COPYING.GPLv2 endif +# 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch +FFMPEG_IGNORE_CVES += CVE-2020-12284 + FFMPEG_CONF_OPTS = \ --prefix=/usr \ --enable-avfilter \ @@ -96,6 +99,17 @@ else FFMPEG_CONF_OPTS += --disable-ffprobe endif +ifeq ($(BR2_PACKAGE_FFMPEG_XCBGRAB),y) +FFMPEG_CONF_OPTS += \ + --enable-libxcb \ + --enable-libxcb-shape \ + --enable-libxcb-shm \ + --enable-libxcb-xfixes +FFMPEG_DEPENDENCIES += libxcb +else +FFMPEG_CONF_OPTS += --disable-libxcb +endif + ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y) FFMPEG_CONF_OPTS += --enable-postproc else diff --git a/buildroot/package/freerdp/0001-xf_floatbar.c-fix-build-without-Xfixes.patch b/buildroot/package/freerdp/0001-xf_floatbar.c-fix-build-without-Xfixes.patch deleted file mode 100644 index c0b419588..000000000 --- a/buildroot/package/freerdp/0001-xf_floatbar.c-fix-build-without-Xfixes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7dbb64cb62049159d9d71b9be39f469bbd116f41 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 18 Apr 2019 23:40:52 +0200 -Subject: [PATCH] xf_floatbar.c: fix build without Xfixes - -Remove unneeded include on Xfixes.h as it is not always available and -not used in xf_floatbar.c - -Fixes: - - http://autobuild.buildroot.org/results/69245e574787bada718c52c805ec137041dc233d - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/5354] ---- - client/X11/xf_floatbar.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/client/X11/xf_floatbar.c b/client/X11/xf_floatbar.c -index 3643b6052..04912aa79 100644 ---- a/client/X11/xf_floatbar.c -+++ b/client/X11/xf_floatbar.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - - #include "xf_floatbar.h" --- -2.20.1 - diff --git a/buildroot/package/freerdp/freerdp.hash b/buildroot/package/freerdp/freerdp.hash index 7a6859551..b94ca1053 100644 --- a/buildroot/package/freerdp/freerdp.hash +++ b/buildroot/package/freerdp/freerdp.hash @@ -1,3 +1,5 @@ +# From https://pub.freerdp.com/releases/freerdp-2.0.1.tar.gz.sha256 +sha256 2c4841c6a52fb153346436447708cbae7b479a7d8112d093e95d8c98f084be1b freerdp-2.1.0.tar.gz + # Locally calculated -sha256 3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49 freerdp-2.0.0-rc4.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/freerdp/freerdp.mk b/buildroot/package/freerdp/freerdp.mk index a477e74cb..d3038bd5c 100644 --- a/buildroot/package/freerdp/freerdp.mk +++ b/buildroot/package/freerdp/freerdp.mk @@ -4,8 +4,8 @@ # ################################################################################ -FREERDP_VERSION = 2.0.0-rc4 -FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION)) +FREERDP_VERSION = 2.1.0 +FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 FREERDP_LICENSE_FILES = LICENSE @@ -42,6 +42,13 @@ else FREERDP_CONF_OPTS += -DWITH_ALSA=OFF endif +ifeq ($(BR2_PACKAGE_LIBUSB),y) +FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=ON +FREERDP_DEPENDENCIES += libusb +else +FREERDP_CONF_OPTS += -DCHANNEL_URBDRC=OFF +endif + ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) FREERDP_CONF_OPTS += -DWITH_PULSE=ON FREERDP_DEPENDENCIES += pulseaudio diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash index 8ecfbfe40..98ca7fbe7 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d6d02d035d988cbdb2014794f2efe970a3f5ac277202882bbf553bb7fd789d2 imx-gpu-g2d-6.4.0.p1.0-aarch32.bin +sha256 6d6d02d035d988cbdb2014794f2efe970a3f5ac277202882bbf553bb7fd789d2 imx-gpu-g2d-6.4.0.p1.0-arm.bin sha256 35885f435dbe951d2c0f439a376ed8a59a50b67a1b7e1e14fa2ab03995abb1ad imx-gpu-g2d-6.4.0.p1.0-aarch64.bin sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING sha256 9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7 EULA diff --git a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index 6598e4c32..770017097 100644 --- a/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -7,7 +7,7 @@ ifeq ($(BR2_aarch64),y) IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch32 +IMX_GPU_G2D_VERSION = 6.4.0.p1.0-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin diff --git a/buildroot/package/gcc/gcc.mk b/buildroot/package/gcc/gcc.mk index fe7167b2f..50f2a3fcb 100644 --- a/buildroot/package/gcc/gcc.mk +++ b/buildroot/package/gcc/gcc.mk @@ -100,7 +100,7 @@ HOST_GCC_COMMON_CONF_ENV = \ GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) -# used to fix ../../../../libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: ‘st.st_mode’ may be used uninitialized in this function [-Werror=maybe-uninitialized] +# used to fix ../../../../libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized] ifeq ($(BR2_ENABLE_DEBUG),y) GCC_COMMON_TARGET_CFLAGS += -Wno-error endif diff --git a/buildroot/package/gflags/gflags.mk b/buildroot/package/gflags/gflags.mk index c4fce45b3..f32869f70 100644 --- a/buildroot/package/gflags/gflags.mk +++ b/buildroot/package/gflags/gflags.mk @@ -10,8 +10,12 @@ GFLAGS_INSTALL_STAGING = YES GFLAGS_LICENSE = BSD-3-Clause GFLAGS_LICENSE_FILES = COPYING.txt +# Force Release otherwise libraries will be suffixed by _debug which will raise +# unexpected build failures with packages that use gflags (e.g. rocksdb) +GFLAGS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -GFLAGS_CONF_OPTS = -DBUILD_gflags_LIB=OFF \ +GFLAGS_CONF_OPTS += -DBUILD_gflags_LIB=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -DNO_THREADS" endif diff --git a/buildroot/package/glibc/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/glibc.hash b/buildroot/package/glibc/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/glibc.hash similarity index 70% rename from buildroot/package/glibc/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/glibc.hash rename to buildroot/package/glibc/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/glibc.hash index 4283ea04b..6677d32db 100644 --- a/buildroot/package/glibc/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/glibc.hash +++ b/buildroot/package/glibc/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 fe1ca8099bc2cda997d8a585f1a512e59df56c52c9c7363a4058da2725c8f4a9 glibc-2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91.tar.gz +sha256 4462f56696332efbc5b0c2f86d7aa75a2a02c3d44bc4345fa42b5bab1225de5c glibc-2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/glibc/glibc.mk b/buildroot/package/glibc/glibc.mk index 2ca73343b..4621c9c2f 100644 --- a/buildroot/package/glibc/glibc.mk +++ b/buildroot/package/glibc/glibc.mk @@ -17,7 +17,7 @@ else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 +GLIBC_VERSION = 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk index 6752367fa..e59896b48 100644 --- a/buildroot/package/haproxy/haproxy.mk +++ b/buildroot/package/haproxy/haproxy.mk @@ -19,7 +19,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) HAPROXY_LIBS += -latomic endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) # threads uses atomics on gcc >= 4.7 and sync otherwise (see # include/common/hathreads.h) ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y) diff --git a/buildroot/package/irrlicht/irrlicht.mk b/buildroot/package/irrlicht/irrlicht.mk index a1e190d98..bd82815cd 100644 --- a/buildroot/package/irrlicht/irrlicht.mk +++ b/buildroot/package/irrlicht/irrlicht.mk @@ -38,6 +38,13 @@ ifeq ($(BR2_STATIC_LIBS),) IRRLICHT_CONF_OPTS += sharedlib endif +# Irrlicht fail to detect properly the NEON support on aarch64 or ARM with NEON FPU support. +# While linking an application with libIrrlicht.so, we get an undefined reference to +# png_init_filter_functions_neon. +# Some files are missing in the libpng bundled in Irrlicht, in particular arm/arm_init.c, +# so disable NEON support completely. +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0" + define IRRLICHT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(IRRLICHT_SUBDIR) $(IRRLICHT_CONF_OPTS) diff --git a/buildroot/package/jpeg/Config.in b/buildroot/package/jpeg/Config.in index 3d0fea83b..97139c784 100644 --- a/buildroot/package/jpeg/Config.in +++ b/buildroot/package/jpeg/Config.in @@ -1,8 +1,3 @@ -config BR2_PACKAGE_JPEG - bool "jpeg support" - help - Select the desired JPEG library provider. - # jpeg-turbo has simd support for some architectures config BR2_PACKAGE_JPEG_SIMD_SUPPORT bool @@ -11,6 +6,11 @@ config BR2_PACKAGE_JPEG_SIMD_SUPPORT default y if BR2_POWERPC_CPU_HAS_ALTIVEC default y if BR2_aarch64 || BR2_aarch64_be +config BR2_PACKAGE_JPEG + bool "jpeg support" + help + Select the desired JPEG library provider. + if BR2_PACKAGE_JPEG choice diff --git a/buildroot/package/kodi-pvr-vuplus/Config.in b/buildroot/package/kodi-pvr-vuplus/Config.in index 96320f6fc..b6a03e843 100644 --- a/buildroot/package/kodi-pvr-vuplus/Config.in +++ b/buildroot/package/kodi-pvr-vuplus/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_PVR_VUPLUS bool "kodi-pvr-vuplus" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp select BR2_PACKAGE_JSON_FOR_MODERN_CPP select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_TINYXML @@ -7,3 +8,6 @@ config BR2_PACKAGE_KODI_PVR_VUPLUS VuPlus PVR client addon for Kodi https://github.com/kodi-pvr/pvr.vuplus + +comment "kodi-pvr-vuplus needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/buildroot/package/libarchive/libarchive.mk b/buildroot/package/libarchive/libarchive.mk index 60838eea0..ad0823e54 100644 --- a/buildroot/package/libarchive/libarchive.mk +++ b/buildroot/package/libarchive/libarchive.mk @@ -79,6 +79,13 @@ else LIBARCHIVE_CONF_OPTS += --without-xml2 endif +ifeq ($(BR2_PACKAGE_LZ4),y) +LIBARCHIVE_CONF_OPTS += --with-lz4 +LIBARCHIVE_DEPENDENCIES += lz4 +else +LIBARCHIVE_CONF_OPTS += --without-lz4 +endif + ifeq ($(BR2_PACKAGE_LZO),y) LIBARCHIVE_DEPENDENCIES += lzo else @@ -124,11 +131,13 @@ HOST_LIBARCHIVE_CONF_OPTS = \ --without-expat \ --without-libiconv-prefix \ --without-xml2 \ + --without-lz4 \ --without-lzo2 \ --without-mbedtls \ --without-nettle \ --without-openssl \ - --without-lzma + --without-lzma \ + --without-zstd $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/libcoap/libcoap.mk b/buildroot/package/libcoap/libcoap.mk index e2fbaa3df..bea0e6888 100644 --- a/buildroot/package/libcoap/libcoap.mk +++ b/buildroot/package/libcoap/libcoap.mk @@ -10,7 +10,17 @@ LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause LIBCOAP_LICENSE_FILES = COPYING LICENSE LIBCOAP_DEPENDENCIES = host-pkgconf -LIBCOAP_CONF_OPTS = --disable-examples +LIBCOAP_CONF_OPTS = --disable-examples --without-tinydtls LIBCOAP_AUTORECONF = YES +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBCOAP_DEPENDENCIES += gnutls +LIBCOAP_CONF_OPTS += --enable-dtls --with-gnutls --without-openssl +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBCOAP_DEPENDENCIES += openssl +LIBCOAP_CONF_OPTS += --enable-dtls --without-gnutls --with-openssl +else +LIBCOAP_CONF_OPTS += --disable-dtls +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/libfm-extra/Config.in b/buildroot/package/libfm-extra/Config.in index eefc022c4..60e6fda30 100644 --- a/buildroot/package/libfm-extra/Config.in +++ b/buildroot/package/libfm-extra/Config.in @@ -10,6 +10,6 @@ config BR2_PACKAGE_LIBFM_EXTRA http://wiki.lxde.org/en/Libfm -comment "libfm-extra needs a toolchain w/ wchar, threads, C++" +comment "libfm-extra needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libglib2/libglib2.mk b/buildroot/package/libglib2/libglib2.mk index f00818f69..a206639f7 100644 --- a/buildroot/package/libglib2/libglib2.mk +++ b/buildroot/package/libglib2/libglib2.mk @@ -52,6 +52,11 @@ LIBGLIB2_CONF_OPTS = \ -Dinstalled_tests=false \ -Doss_fuzz=disabled +LIBGLIB2_MESON_EXTRA_PROPERTIES = \ + have_c99_vsnprintf=true \ + have_c99_snprintf=true \ + have_unix98_printf=true + ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES += libiconv endif diff --git a/buildroot/package/libhtp/0001-fix-build-without-GNU-libiconv.patch b/buildroot/package/libhtp/0001-fix-build-without-GNU-libiconv.patch deleted file mode 100644 index 8f6cddf2d..000000000 --- a/buildroot/package/libhtp/0001-fix-build-without-GNU-libiconv.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1531a8e9b91b567979a2a0d7fd6a4c2e9126b01c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 6 Mar 2019 23:06:54 +0100 -Subject: [PATCH] fix build without GNU libiconv - -iconvctl is only defined in GNU libiconv so check for the availability -of this function before using it - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/OISF/libhtp/pull/193] ---- - configure.ac | 18 ++++++++++++++++++ - htp/htp_transcoder.c | 2 +- - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7f0a58d..388ec7b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -155,6 +155,24 @@ sinclude(m4/lib-link.m4) - sinclude(m4/lib-prefix.m4) - AM_ICONV - -+# iconvctl is not standard, it is defined only in GNU libiconv -+AC_MSG_CHECKING(for iconvctl) -+TMPLIBS="${LIBS}" -+LIBS="${LIBS} ${LIBICONV}" -+ -+AC_TRY_LINK([#include -+ #include ], -+ [int iconv_param = 0; -+ iconv_t cd = iconv_open("",""); -+ iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, &iconv_param); -+ iconv_close(cd);], -+ [ac_cv_func_iconvctl=yes]) -+AC_MSG_RESULT($ac_cv_func_iconvctl) -+if test "$ac_cv_func_iconvctl" == yes; then -+ AC_DEFINE(HAVE_ICONVCTL,1,"Define to 1 if you have the `iconvctl' function.") -+fi -+LIBS="${TMPLIBS}" -+ - dnl ----------------------------------------------- - dnl Check and enable the GCC opts we want to use. - dnl We may need to add more checks -diff --git a/htp/htp_transcoder.c b/htp/htp_transcoder.c -index 57ff74c..d8e8280 100644 ---- a/htp/htp_transcoder.c -+++ b/htp/htp_transcoder.c -@@ -64,7 +64,7 @@ int htp_transcode_params(htp_connp_t *connp, htp_table_t **params, int destroy_o - return HTP_ERROR; - } - -- #if (_LIBICONV_VERSION >= 0x0108) -+ #if (_LIBICONV_VERSION >= 0x0108 && HAVE_ICONVCTL) - int iconv_param = 0; - iconvctl(cd, ICONV_SET_TRANSLITERATE, &iconv_param); - iconv_param = 1; --- -2.14.1 - diff --git a/buildroot/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch b/buildroot/package/libhtp/0001-htp.pc.in-add-lz-to-Libs.private.patch similarity index 93% rename from buildroot/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch rename to buildroot/package/libhtp/0001-htp.pc.in-add-lz-to-Libs.private.patch index f79a9ebb3..b21ea6053 100644 --- a/buildroot/package/libhtp/0002-htp.pc.in-add-lz-to-Libs.private.patch +++ b/buildroot/package/libhtp/0001-htp.pc.in-add-lz-to-Libs.private.patch @@ -7,7 +7,7 @@ zlib is a mandatory dependency so add it to Libs.private otherwise static linking of packages linking with htp (e.g. suricata) will fail. Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] +[Upstream status: https://github.com/OISF/libhtp/pull/294] --- htp.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot/package/libhtp/libhtp.hash b/buildroot/package/libhtp/libhtp.hash index b3775c3ad..765acd5bf 100644 --- a/buildroot/package/libhtp/libhtp.hash +++ b/buildroot/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a6a6f3b3f1fb6e8b8a1dae02db8a0090c438f0d057102dd8e52208224868c4e4 libhtp-0.5.32.tar.gz -sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE +sha256 953651fdfe828805bb82dc1aa8b56187b0e2f80781727343e68ccf8afd6a9122 libhtp-0.5.33.tar.gz +sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/buildroot/package/libhtp/libhtp.mk b/buildroot/package/libhtp/libhtp.mk index 577b70095..b77d8715f 100644 --- a/buildroot/package/libhtp/libhtp.mk +++ b/buildroot/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.32 +LIBHTP_VERSION = 0.5.33 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libid3tag/0001-configure-automake-foreign.patch b/buildroot/package/libid3tag/0001-configure-automake-foreign.patch deleted file mode 100644 index 8521d559f..000000000 --- a/buildroot/package/libid3tag/0001-configure-automake-foreign.patch +++ /dev/null @@ -1,16 +0,0 @@ -configure: don't require GNU-specific files when running automake - -Signed-off-by: "Yann E. MORIN" - -diff -durN libid3tag-0.15.1b.orig/configure.ac libid3tag-0.15.1b/configure.ac ---- libid3tag-0.15.1b.orig/configure.ac 2004-01-24 00:22:46.000000000 +0100 -+++ libid3tag-0.15.1b/configure.ac 2018-11-25 15:31:04.184342212 +0100 -@@ -26,7 +26,7 @@ - - AC_CONFIG_SRCDIR([id3tag.h]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - - AM_CONFIG_HEADER([config.h]) - diff --git a/buildroot/package/libid3tag/libid3tag.hash b/buildroot/package/libid3tag/libid3tag.hash index 82ad59d9a..9aa1d0027 100644 --- a/buildroot/package/libid3tag/libid3tag.hash +++ b/buildroot/package/libid3tag/libid3tag.hash @@ -1,4 +1,7 @@ -# Locally computed: -sha256 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 libid3tag-0.15.1b.tar.gz +# From http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libi/libid3tag/libid3tag_0.15.1b-14.dsc +sha256 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 libid3tag_0.15.1b.orig.tar.gz +sha256 f174cafe02bef25a9ad8cb7f9ce80119147297a7036f50878e85ac0d7ae09c62 libid3tag_0.15.1b-14.debian.tar.xz + +# Hash for license files: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 7f12ad28dc075763e91b91bfa60fad04062380011ddad8f6bac21dd7b1f44367 COPYRIGHT diff --git a/buildroot/package/libid3tag/libid3tag.mk b/buildroot/package/libid3tag/libid3tag.mk index 3ec145725..5d7b219bb 100644 --- a/buildroot/package/libid3tag/libid3tag.mk +++ b/buildroot/package/libid3tag/libid3tag.mk @@ -5,11 +5,20 @@ ################################################################################ LIBID3TAG_VERSION = 0.15.1b -LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION) +LIBID3TAG_PATCH = libid3tag_$(LIBID3TAG_VERSION)-14.debian.tar.xz +LIBID3TAG_SOURCE = libid3tag_$(LIBID3TAG_VERSION).orig.tar.gz +LIBID3TAG_SITE = \ + http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libi/libid3tag LIBID3TAG_LICENSE = GPL-2.0+ LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT LIBID3TAG_INSTALL_STAGING = YES -LIBID3TAG_DEPENDENCIES = zlib +LIBID3TAG_DEPENDENCIES = host-gperf zlib + +# debian/patches/10_utf16.dpatch +LIBID3TAG_IGNORE_CVES += CVE-2004-2779 CVE-2017-11551 + +# debian/patches/11_unknown_encoding.dpatch +LIBID3TAG_IGNORE_CVES += CVE-2017-11550 # Force autoreconf to be able to use a more recent libtool script, that # is able to properly behave in the face of a missing C++ compiler. diff --git a/buildroot/package/libinput/libinput.hash b/buildroot/package/libinput/libinput.hash index ee6416e3b..0edbca508 100644 --- a/buildroot/package/libinput/libinput.hash +++ b/buildroot/package/libinput/libinput.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-March/041332.html -md5 76c5cb1a55f5098ed353ae7d4e054c50 libinput-1.15.4.tar.xz -sha1 43740a5fec3f6d474906173cc01ff3d73d935d2f libinput-1.15.4.tar.xz -sha256 9c8b6846d94e374ee4bdb32634e4ac4aa318afc31f9a58fcb545cd3095c745c1 libinput-1.15.4.tar.xz -sha512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 libinput-1.15.4.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-April/041400.html +md5 c9a1b15bb932eaf22f840efe4c3f84eb libinput-1.15.5.tar.xz +sha1 644b1c6936cfff8a4547da71fbcd7ebd28618426 libinput-1.15.5.tar.xz +sha256 a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97 libinput-1.15.5.tar.xz +sha512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a libinput-1.15.5.tar.xz # License files sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING diff --git a/buildroot/package/libinput/libinput.mk b/buildroot/package/libinput/libinput.mk index 5e2ee696b..bf58e7082 100644 --- a/buildroot/package/libinput/libinput.mk +++ b/buildroot/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.15.4 +LIBINPUT_VERSION = 1.15.5 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev diff --git a/buildroot/package/libmad/0006-configure-ac-automake-foreign.patch b/buildroot/package/libmad/0002-configure-ac-automake-foreign.patch similarity index 100% rename from buildroot/package/libmad/0006-configure-ac-automake-foreign.patch rename to buildroot/package/libmad/0002-configure-ac-automake-foreign.patch diff --git a/buildroot/package/libmad/0003-remove-deprecated-cflags.patch b/buildroot/package/libmad/0003-remove-deprecated-cflags.patch deleted file mode 100644 index e5040830f..000000000 --- a/buildroot/package/libmad/0003-remove-deprecated-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -libmad: remove deprecated cflags (-fforce-mem) - -fforce-mem has long been deprecated, and is completely removed from -gcc 4.3.x on. ---- - configure | 1 - - configure.ac | 1 - - 2 files changed, 2 deletions(-) - -Index: libmad-0.15.1b/configure.ac -=================================================================== ---- libmad-0.15.1b.orig/configure.ac -+++ libmad-0.15.1b/configure.ac -@@ -140,7 +140,6 @@ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" - optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" -Index: libmad-0.15.1b/configure -=================================================================== ---- libmad-0.15.1b.orig/configure -+++ libmad-0.15.1b/configure -@@ -19099,7 +19099,6 @@ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" - optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" diff --git a/buildroot/package/libmad/0004-thumb2-fixed-arm.patch b/buildroot/package/libmad/0004-thumb2-fixed-arm.patch deleted file mode 100644 index befda48d7..000000000 --- a/buildroot/package/libmad/0004-thumb2-fixed-arm.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fixes Thumb2-related build failure - -Patch below comes from the Debian libmad package. - -Signed-off-by: Thomas Petazzoni - -From: Dave Martin -Subject: "rsc" doesnt exist anymore in thumb2 - -diff --git a/fixed.h b/fixed.h -index 4b58abf..ba4bc26 100644 ---- a/fixed.h -+++ b/fixed.h -@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y) - : "+r" (lo), "+r" (hi) \ - : "%r" (x), "r" (y)) - -+#ifdef __thumb__ -+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero -+ operand. If needed this code can also support Thumb-1 -+ (simply append "s" to the end of the second two instructions). */ -+# define MAD_F_MLN(hi, lo) \ -+ asm ("rsbs %0, %0, #0\n\t" \ -+ "sbc %1, %1, %1\n\t" \ -+ "sub %1, %1, %2" \ -+ : "+&r" (lo), "=&r" (hi) \ -+ : "r" (hi) \ -+ : "cc") -+#else /* ! __thumb__ */ - # define MAD_F_MLN(hi, lo) \ - asm ("rsbs %0, %2, #0\n\t" \ - "rsc %1, %3, #0" \ -- : "=r" (lo), "=r" (hi) \ -+ : "=&r" (lo), "=r" (hi) \ - : "0" (lo), "1" (hi) \ - : "cc") -+#endif /* __thumb__ */ - - # define mad_f_scale64(hi, lo) \ - ({ mad_fixed_t __result; \ diff --git a/buildroot/package/libmad/0005-thumb2-imdct-arm.patch b/buildroot/package/libmad/0005-thumb2-imdct-arm.patch deleted file mode 100644 index 414b9c8fc..000000000 --- a/buildroot/package/libmad/0005-thumb2-imdct-arm.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fixes Thumb2 related build failure - -Patch below comes from the Debian libmad package. - -Signed-off-by: Thomas Petazzoni - -From: Konstantinos Margaritis -Subject: use "adr" instead of "add" to make code ready for thumb2 - ---- ./imdct_l_arm.S.orig 2010-02-25 13:25:23.000000000 +0100 -+++ ./imdct_l_arm.S 2010-02-25 13:27:26.000000000 +0100 -@@ -468,7 +468,7 @@ - - @---- - -- add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?) -+ adr r2, imdct36_long_karray - - - loop: diff --git a/buildroot/package/libmad/libmad.hash b/buildroot/package/libmad/libmad.hash index 8b7859395..2be1a8a3a 100644 --- a/buildroot/package/libmad/libmad.hash +++ b/buildroot/package/libmad/libmad.hash @@ -1,4 +1,6 @@ -# Locally computed: -sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad-0.15.1b.tar.gz -sha256 0e21f2c6b19337d0b237dacc04f7b90a56be7f359f4c9a2ee0b202d9af0cfa69 frame_length.diff +# From http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libm/libmad/libmad_0.15.1b-10.dsc +sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad_0.15.1b.orig.tar.gz +sha256 dfeabd5d2398bf902660edc31f87ad40600f0aa732b946f864d8ee6bbf56a99c libmad_0.15.1b-10.diff.gz + +# Hash for license file: sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/buildroot/package/libmad/libmad.mk b/buildroot/package/libmad/libmad.mk index b1c9cee5a..33134e26d 100644 --- a/buildroot/package/libmad/libmad.mk +++ b/buildroot/package/libmad/libmad.mk @@ -5,12 +5,27 @@ ################################################################################ LIBMAD_VERSION = 0.15.1b -LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION) +LIBMAD_PATCH = libmad_$(LIBMAD_VERSION)-10.diff.gz +LIBMAD_SOURCE = libmad_$(LIBMAD_VERSION).orig.tar.gz +LIBMAD_SITE = \ + http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libm/libmad LIBMAD_INSTALL_STAGING = YES LIBMAD_LICENSE = GPL-2.0+ LIBMAD_LICENSE_FILES = COPYING -LIBMAD_PATCH = \ - https://sources.debian.net/data/main/libm/libmad/0.15.1b-8/debian/patches/frame_length.diff + +define LIBMAD_APPLY_DEBIAN_PATCHES + if [ -d $(@D)/debian/patches ]; then \ + $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.patch; \ + fi +endef + +LIBMAD_POST_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES + +# debian/patches/md_size.diff +LIBMAD_IGNORE_CVES += CVE-2017-8372 CVE-2017-8373 + +# debian/patches/length-check.patch +LIBMAD_IGNORE_CVES += CVE-2017-8374 # Force autoreconf to be able to use a more recent libtool script, that # is able to properly behave in the face of a missing C++ compiler. diff --git a/buildroot/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash index 3becd790a..121e10c41 100644 --- a/buildroot/package/libopenssl/libopenssl.hash +++ b/buildroot/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1d.tar.gz.sha256 -sha256 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 openssl-1.1.1f.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1g.tar.gz.sha256 +sha256 ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz # License files -sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE +sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk index 4639c63fa..a300458f8 100644 --- a/buildroot/package/libopenssl/libopenssl.mk +++ b/buildroot/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1f +LIBOPENSSL_VERSION = 1.1.1g LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay diff --git a/buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch b/buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch new file mode 100644 index 000000000..af1303688 --- /dev/null +++ b/buildroot/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch @@ -0,0 +1,525 @@ +From 6a30b31d31fb175f808ccedec1564943b9e91e78 Mon Sep 17 00:00:00 2001 +From: Ondrej Mosnacek +Date: Thu, 23 Jan 2020 13:57:13 +0100 +Subject: [PATCH] libsepol: fix CIL_KEY_* build errors with -fno-common + +GCC 10 comes with -fno-common enabled by default - fix the CIL_KEY_* +global variables to be defined only once in cil.c and declared in the +header file correctly with the 'extern' keyword, so that other units +including the file don't generate duplicate definitions. + +Upstream: https://github.com/SELinuxProject/selinux/commit/a96e8c59ecac84096d870b42701a504791a8cc8c + +Signed-off-by: Ondrej Mosnacek +Signed-off-by: Matt Weber +--- + cil/src/cil.c | 161 +++++++++++++++++++++ + cil/src/cil_internal.h | 320 ++++++++++++++++++++--------------------- + 2 files changed, 321 insertions(+), 160 deletions(-) + +diff --git a/cil/src/cil.c b/cil/src/cil.c +index 2a7ec06..14bd443 100644 +--- a/cil/src/cil.c ++++ b/cil/src/cil.c +@@ -77,6 +77,167 @@ int cil_sym_sizes[CIL_SYM_ARRAY_NUM][CIL_SYM_NUM] = { + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1} + }; + ++char *CIL_KEY_CONS_T1; ++char *CIL_KEY_CONS_T2; ++char *CIL_KEY_CONS_T3; ++char *CIL_KEY_CONS_R1; ++char *CIL_KEY_CONS_R2; ++char *CIL_KEY_CONS_R3; ++char *CIL_KEY_CONS_U1; ++char *CIL_KEY_CONS_U2; ++char *CIL_KEY_CONS_U3; ++char *CIL_KEY_CONS_L1; ++char *CIL_KEY_CONS_L2; ++char *CIL_KEY_CONS_H1; ++char *CIL_KEY_CONS_H2; ++char *CIL_KEY_AND; ++char *CIL_KEY_OR; ++char *CIL_KEY_NOT; ++char *CIL_KEY_EQ; ++char *CIL_KEY_NEQ; ++char *CIL_KEY_CONS_DOM; ++char *CIL_KEY_CONS_DOMBY; ++char *CIL_KEY_CONS_INCOMP; ++char *CIL_KEY_CONDTRUE; ++char *CIL_KEY_CONDFALSE; ++char *CIL_KEY_SELF; ++char *CIL_KEY_OBJECT_R; ++char *CIL_KEY_STAR; ++char *CIL_KEY_TCP; ++char *CIL_KEY_UDP; ++char *CIL_KEY_DCCP; ++char *CIL_KEY_SCTP; ++char *CIL_KEY_AUDITALLOW; ++char *CIL_KEY_TUNABLEIF; ++char *CIL_KEY_ALLOW; ++char *CIL_KEY_DONTAUDIT; ++char *CIL_KEY_TYPETRANSITION; ++char *CIL_KEY_TYPECHANGE; ++char *CIL_KEY_CALL; ++char *CIL_KEY_TUNABLE; ++char *CIL_KEY_XOR; ++char *CIL_KEY_ALL; ++char *CIL_KEY_RANGE; ++char *CIL_KEY_GLOB; ++char *CIL_KEY_FILE; ++char *CIL_KEY_DIR; ++char *CIL_KEY_CHAR; ++char *CIL_KEY_BLOCK; ++char *CIL_KEY_SOCKET; ++char *CIL_KEY_PIPE; ++char *CIL_KEY_SYMLINK; ++char *CIL_KEY_ANY; ++char *CIL_KEY_XATTR; ++char *CIL_KEY_TASK; ++char *CIL_KEY_TRANS; ++char *CIL_KEY_TYPE; ++char *CIL_KEY_ROLE; ++char *CIL_KEY_USER; ++char *CIL_KEY_USERATTRIBUTE; ++char *CIL_KEY_USERATTRIBUTESET; ++char *CIL_KEY_SENSITIVITY; ++char *CIL_KEY_CATEGORY; ++char *CIL_KEY_CATSET; ++char *CIL_KEY_LEVEL; ++char *CIL_KEY_LEVELRANGE; ++char *CIL_KEY_CLASS; ++char *CIL_KEY_IPADDR; ++char *CIL_KEY_MAP_CLASS; ++char *CIL_KEY_CLASSPERMISSION; ++char *CIL_KEY_BOOL; ++char *CIL_KEY_STRING; ++char *CIL_KEY_NAME; ++char *CIL_KEY_SOURCE; ++char *CIL_KEY_TARGET; ++char *CIL_KEY_LOW; ++char *CIL_KEY_HIGH; ++char *CIL_KEY_LOW_HIGH; ++char *CIL_KEY_HANDLEUNKNOWN; ++char *CIL_KEY_HANDLEUNKNOWN_ALLOW; ++char *CIL_KEY_HANDLEUNKNOWN_DENY; ++char *CIL_KEY_HANDLEUNKNOWN_REJECT; ++char *CIL_KEY_MACRO; ++char *CIL_KEY_IN; ++char *CIL_KEY_MLS; ++char *CIL_KEY_DEFAULTRANGE; ++char *CIL_KEY_BLOCKINHERIT; ++char *CIL_KEY_BLOCKABSTRACT; ++char *CIL_KEY_CLASSORDER; ++char *CIL_KEY_CLASSMAPPING; ++char *CIL_KEY_CLASSPERMISSIONSET; ++char *CIL_KEY_COMMON; ++char *CIL_KEY_CLASSCOMMON; ++char *CIL_KEY_SID; ++char *CIL_KEY_SIDCONTEXT; ++char *CIL_KEY_SIDORDER; ++char *CIL_KEY_USERLEVEL; ++char *CIL_KEY_USERRANGE; ++char *CIL_KEY_USERBOUNDS; ++char *CIL_KEY_USERPREFIX; ++char *CIL_KEY_SELINUXUSER; ++char *CIL_KEY_SELINUXUSERDEFAULT; ++char *CIL_KEY_TYPEATTRIBUTE; ++char *CIL_KEY_TYPEATTRIBUTESET; ++char *CIL_KEY_EXPANDTYPEATTRIBUTE; ++char *CIL_KEY_TYPEALIAS; ++char *CIL_KEY_TYPEALIASACTUAL; ++char *CIL_KEY_TYPEBOUNDS; ++char *CIL_KEY_TYPEPERMISSIVE; ++char *CIL_KEY_RANGETRANSITION; ++char *CIL_KEY_USERROLE; ++char *CIL_KEY_ROLETYPE; ++char *CIL_KEY_ROLETRANSITION; ++char *CIL_KEY_ROLEALLOW; ++char *CIL_KEY_ROLEATTRIBUTE; ++char *CIL_KEY_ROLEATTRIBUTESET; ++char *CIL_KEY_ROLEBOUNDS; ++char *CIL_KEY_BOOLEANIF; ++char *CIL_KEY_NEVERALLOW; ++char *CIL_KEY_TYPEMEMBER; ++char *CIL_KEY_SENSALIAS; ++char *CIL_KEY_SENSALIASACTUAL; ++char *CIL_KEY_CATALIAS; ++char *CIL_KEY_CATALIASACTUAL; ++char *CIL_KEY_CATORDER; ++char *CIL_KEY_SENSITIVITYORDER; ++char *CIL_KEY_SENSCAT; ++char *CIL_KEY_CONSTRAIN; ++char *CIL_KEY_MLSCONSTRAIN; ++char *CIL_KEY_VALIDATETRANS; ++char *CIL_KEY_MLSVALIDATETRANS; ++char *CIL_KEY_CONTEXT; ++char *CIL_KEY_FILECON; ++char *CIL_KEY_IBPKEYCON; ++char *CIL_KEY_IBENDPORTCON; ++char *CIL_KEY_PORTCON; ++char *CIL_KEY_NODECON; ++char *CIL_KEY_GENFSCON; ++char *CIL_KEY_NETIFCON; ++char *CIL_KEY_PIRQCON; ++char *CIL_KEY_IOMEMCON; ++char *CIL_KEY_IOPORTCON; ++char *CIL_KEY_PCIDEVICECON; ++char *CIL_KEY_DEVICETREECON; ++char *CIL_KEY_FSUSE; ++char *CIL_KEY_POLICYCAP; ++char *CIL_KEY_OPTIONAL; ++char *CIL_KEY_DEFAULTUSER; ++char *CIL_KEY_DEFAULTROLE; ++char *CIL_KEY_DEFAULTTYPE; ++char *CIL_KEY_ROOT; ++char *CIL_KEY_NODE; ++char *CIL_KEY_PERM; ++char *CIL_KEY_ALLOWX; ++char *CIL_KEY_AUDITALLOWX; ++char *CIL_KEY_DONTAUDITX; ++char *CIL_KEY_NEVERALLOWX; ++char *CIL_KEY_PERMISSIONX; ++char *CIL_KEY_IOCTL; ++char *CIL_KEY_UNORDERED; ++char *CIL_KEY_SRC_INFO; ++char *CIL_KEY_SRC_CIL; ++char *CIL_KEY_SRC_HLL; ++ + static void cil_init_keys(void) + { + /* Initialize CIL Keys into strpool */ +diff --git a/cil/src/cil_internal.h b/cil/src/cil_internal.h +index 6ff3228..b07c068 100644 +--- a/cil/src/cil_internal.h ++++ b/cil/src/cil_internal.h +@@ -74,166 +74,166 @@ enum cil_pass { + /* + Keywords + */ +-char *CIL_KEY_CONS_T1; +-char *CIL_KEY_CONS_T2; +-char *CIL_KEY_CONS_T3; +-char *CIL_KEY_CONS_R1; +-char *CIL_KEY_CONS_R2; +-char *CIL_KEY_CONS_R3; +-char *CIL_KEY_CONS_U1; +-char *CIL_KEY_CONS_U2; +-char *CIL_KEY_CONS_U3; +-char *CIL_KEY_CONS_L1; +-char *CIL_KEY_CONS_L2; +-char *CIL_KEY_CONS_H1; +-char *CIL_KEY_CONS_H2; +-char *CIL_KEY_AND; +-char *CIL_KEY_OR; +-char *CIL_KEY_NOT; +-char *CIL_KEY_EQ; +-char *CIL_KEY_NEQ; +-char *CIL_KEY_CONS_DOM; +-char *CIL_KEY_CONS_DOMBY; +-char *CIL_KEY_CONS_INCOMP; +-char *CIL_KEY_CONDTRUE; +-char *CIL_KEY_CONDFALSE; +-char *CIL_KEY_SELF; +-char *CIL_KEY_OBJECT_R; +-char *CIL_KEY_STAR; +-char *CIL_KEY_TCP; +-char *CIL_KEY_UDP; +-char *CIL_KEY_DCCP; +-char *CIL_KEY_SCTP; +-char *CIL_KEY_AUDITALLOW; +-char *CIL_KEY_TUNABLEIF; +-char *CIL_KEY_ALLOW; +-char *CIL_KEY_DONTAUDIT; +-char *CIL_KEY_TYPETRANSITION; +-char *CIL_KEY_TYPECHANGE; +-char *CIL_KEY_CALL; +-char *CIL_KEY_TUNABLE; +-char *CIL_KEY_XOR; +-char *CIL_KEY_ALL; +-char *CIL_KEY_RANGE; +-char *CIL_KEY_GLOB; +-char *CIL_KEY_FILE; +-char *CIL_KEY_DIR; +-char *CIL_KEY_CHAR; +-char *CIL_KEY_BLOCK; +-char *CIL_KEY_SOCKET; +-char *CIL_KEY_PIPE; +-char *CIL_KEY_SYMLINK; +-char *CIL_KEY_ANY; +-char *CIL_KEY_XATTR; +-char *CIL_KEY_TASK; +-char *CIL_KEY_TRANS; +-char *CIL_KEY_TYPE; +-char *CIL_KEY_ROLE; +-char *CIL_KEY_USER; +-char *CIL_KEY_USERATTRIBUTE; +-char *CIL_KEY_USERATTRIBUTESET; +-char *CIL_KEY_SENSITIVITY; +-char *CIL_KEY_CATEGORY; +-char *CIL_KEY_CATSET; +-char *CIL_KEY_LEVEL; +-char *CIL_KEY_LEVELRANGE; +-char *CIL_KEY_CLASS; +-char *CIL_KEY_IPADDR; +-char *CIL_KEY_MAP_CLASS; +-char *CIL_KEY_CLASSPERMISSION; +-char *CIL_KEY_BOOL; +-char *CIL_KEY_STRING; +-char *CIL_KEY_NAME; +-char *CIL_KEY_SOURCE; +-char *CIL_KEY_TARGET; +-char *CIL_KEY_LOW; +-char *CIL_KEY_HIGH; +-char *CIL_KEY_LOW_HIGH; +-char *CIL_KEY_HANDLEUNKNOWN; +-char *CIL_KEY_HANDLEUNKNOWN_ALLOW; +-char *CIL_KEY_HANDLEUNKNOWN_DENY; +-char *CIL_KEY_HANDLEUNKNOWN_REJECT; +-char *CIL_KEY_MACRO; +-char *CIL_KEY_IN; +-char *CIL_KEY_MLS; +-char *CIL_KEY_DEFAULTRANGE; +-char *CIL_KEY_BLOCKINHERIT; +-char *CIL_KEY_BLOCKABSTRACT; +-char *CIL_KEY_CLASSORDER; +-char *CIL_KEY_CLASSMAPPING; +-char *CIL_KEY_CLASSPERMISSIONSET; +-char *CIL_KEY_COMMON; +-char *CIL_KEY_CLASSCOMMON; +-char *CIL_KEY_SID; +-char *CIL_KEY_SIDCONTEXT; +-char *CIL_KEY_SIDORDER; +-char *CIL_KEY_USERLEVEL; +-char *CIL_KEY_USERRANGE; +-char *CIL_KEY_USERBOUNDS; +-char *CIL_KEY_USERPREFIX; +-char *CIL_KEY_SELINUXUSER; +-char *CIL_KEY_SELINUXUSERDEFAULT; +-char *CIL_KEY_TYPEATTRIBUTE; +-char *CIL_KEY_TYPEATTRIBUTESET; +-char *CIL_KEY_EXPANDTYPEATTRIBUTE; +-char *CIL_KEY_TYPEALIAS; +-char *CIL_KEY_TYPEALIASACTUAL; +-char *CIL_KEY_TYPEBOUNDS; +-char *CIL_KEY_TYPEPERMISSIVE; +-char *CIL_KEY_RANGETRANSITION; +-char *CIL_KEY_USERROLE; +-char *CIL_KEY_ROLETYPE; +-char *CIL_KEY_ROLETRANSITION; +-char *CIL_KEY_ROLEALLOW; +-char *CIL_KEY_ROLEATTRIBUTE; +-char *CIL_KEY_ROLEATTRIBUTESET; +-char *CIL_KEY_ROLEBOUNDS; +-char *CIL_KEY_BOOLEANIF; +-char *CIL_KEY_NEVERALLOW; +-char *CIL_KEY_TYPEMEMBER; +-char *CIL_KEY_SENSALIAS; +-char *CIL_KEY_SENSALIASACTUAL; +-char *CIL_KEY_CATALIAS; +-char *CIL_KEY_CATALIASACTUAL; +-char *CIL_KEY_CATORDER; +-char *CIL_KEY_SENSITIVITYORDER; +-char *CIL_KEY_SENSCAT; +-char *CIL_KEY_CONSTRAIN; +-char *CIL_KEY_MLSCONSTRAIN; +-char *CIL_KEY_VALIDATETRANS; +-char *CIL_KEY_MLSVALIDATETRANS; +-char *CIL_KEY_CONTEXT; +-char *CIL_KEY_FILECON; +-char *CIL_KEY_IBPKEYCON; +-char *CIL_KEY_IBENDPORTCON; +-char *CIL_KEY_PORTCON; +-char *CIL_KEY_NODECON; +-char *CIL_KEY_GENFSCON; +-char *CIL_KEY_NETIFCON; +-char *CIL_KEY_PIRQCON; +-char *CIL_KEY_IOMEMCON; +-char *CIL_KEY_IOPORTCON; +-char *CIL_KEY_PCIDEVICECON; +-char *CIL_KEY_DEVICETREECON; +-char *CIL_KEY_FSUSE; +-char *CIL_KEY_POLICYCAP; +-char *CIL_KEY_OPTIONAL; +-char *CIL_KEY_DEFAULTUSER; +-char *CIL_KEY_DEFAULTROLE; +-char *CIL_KEY_DEFAULTTYPE; +-char *CIL_KEY_ROOT; +-char *CIL_KEY_NODE; +-char *CIL_KEY_PERM; +-char *CIL_KEY_ALLOWX; +-char *CIL_KEY_AUDITALLOWX; +-char *CIL_KEY_DONTAUDITX; +-char *CIL_KEY_NEVERALLOWX; +-char *CIL_KEY_PERMISSIONX; +-char *CIL_KEY_IOCTL; +-char *CIL_KEY_UNORDERED; +-char *CIL_KEY_SRC_INFO; +-char *CIL_KEY_SRC_CIL; +-char *CIL_KEY_SRC_HLL; ++extern char *CIL_KEY_CONS_T1; ++extern char *CIL_KEY_CONS_T2; ++extern char *CIL_KEY_CONS_T3; ++extern char *CIL_KEY_CONS_R1; ++extern char *CIL_KEY_CONS_R2; ++extern char *CIL_KEY_CONS_R3; ++extern char *CIL_KEY_CONS_U1; ++extern char *CIL_KEY_CONS_U2; ++extern char *CIL_KEY_CONS_U3; ++extern char *CIL_KEY_CONS_L1; ++extern char *CIL_KEY_CONS_L2; ++extern char *CIL_KEY_CONS_H1; ++extern char *CIL_KEY_CONS_H2; ++extern char *CIL_KEY_AND; ++extern char *CIL_KEY_OR; ++extern char *CIL_KEY_NOT; ++extern char *CIL_KEY_EQ; ++extern char *CIL_KEY_NEQ; ++extern char *CIL_KEY_CONS_DOM; ++extern char *CIL_KEY_CONS_DOMBY; ++extern char *CIL_KEY_CONS_INCOMP; ++extern char *CIL_KEY_CONDTRUE; ++extern char *CIL_KEY_CONDFALSE; ++extern char *CIL_KEY_SELF; ++extern char *CIL_KEY_OBJECT_R; ++extern char *CIL_KEY_STAR; ++extern char *CIL_KEY_TCP; ++extern char *CIL_KEY_UDP; ++extern char *CIL_KEY_DCCP; ++extern char *CIL_KEY_SCTP; ++extern char *CIL_KEY_AUDITALLOW; ++extern char *CIL_KEY_TUNABLEIF; ++extern char *CIL_KEY_ALLOW; ++extern char *CIL_KEY_DONTAUDIT; ++extern char *CIL_KEY_TYPETRANSITION; ++extern char *CIL_KEY_TYPECHANGE; ++extern char *CIL_KEY_CALL; ++extern char *CIL_KEY_TUNABLE; ++extern char *CIL_KEY_XOR; ++extern char *CIL_KEY_ALL; ++extern char *CIL_KEY_RANGE; ++extern char *CIL_KEY_GLOB; ++extern char *CIL_KEY_FILE; ++extern char *CIL_KEY_DIR; ++extern char *CIL_KEY_CHAR; ++extern char *CIL_KEY_BLOCK; ++extern char *CIL_KEY_SOCKET; ++extern char *CIL_KEY_PIPE; ++extern char *CIL_KEY_SYMLINK; ++extern char *CIL_KEY_ANY; ++extern char *CIL_KEY_XATTR; ++extern char *CIL_KEY_TASK; ++extern char *CIL_KEY_TRANS; ++extern char *CIL_KEY_TYPE; ++extern char *CIL_KEY_ROLE; ++extern char *CIL_KEY_USER; ++extern char *CIL_KEY_USERATTRIBUTE; ++extern char *CIL_KEY_USERATTRIBUTESET; ++extern char *CIL_KEY_SENSITIVITY; ++extern char *CIL_KEY_CATEGORY; ++extern char *CIL_KEY_CATSET; ++extern char *CIL_KEY_LEVEL; ++extern char *CIL_KEY_LEVELRANGE; ++extern char *CIL_KEY_CLASS; ++extern char *CIL_KEY_IPADDR; ++extern char *CIL_KEY_MAP_CLASS; ++extern char *CIL_KEY_CLASSPERMISSION; ++extern char *CIL_KEY_BOOL; ++extern char *CIL_KEY_STRING; ++extern char *CIL_KEY_NAME; ++extern char *CIL_KEY_SOURCE; ++extern char *CIL_KEY_TARGET; ++extern char *CIL_KEY_LOW; ++extern char *CIL_KEY_HIGH; ++extern char *CIL_KEY_LOW_HIGH; ++extern char *CIL_KEY_HANDLEUNKNOWN; ++extern char *CIL_KEY_HANDLEUNKNOWN_ALLOW; ++extern char *CIL_KEY_HANDLEUNKNOWN_DENY; ++extern char *CIL_KEY_HANDLEUNKNOWN_REJECT; ++extern char *CIL_KEY_MACRO; ++extern char *CIL_KEY_IN; ++extern char *CIL_KEY_MLS; ++extern char *CIL_KEY_DEFAULTRANGE; ++extern char *CIL_KEY_BLOCKINHERIT; ++extern char *CIL_KEY_BLOCKABSTRACT; ++extern char *CIL_KEY_CLASSORDER; ++extern char *CIL_KEY_CLASSMAPPING; ++extern char *CIL_KEY_CLASSPERMISSIONSET; ++extern char *CIL_KEY_COMMON; ++extern char *CIL_KEY_CLASSCOMMON; ++extern char *CIL_KEY_SID; ++extern char *CIL_KEY_SIDCONTEXT; ++extern char *CIL_KEY_SIDORDER; ++extern char *CIL_KEY_USERLEVEL; ++extern char *CIL_KEY_USERRANGE; ++extern char *CIL_KEY_USERBOUNDS; ++extern char *CIL_KEY_USERPREFIX; ++extern char *CIL_KEY_SELINUXUSER; ++extern char *CIL_KEY_SELINUXUSERDEFAULT; ++extern char *CIL_KEY_TYPEATTRIBUTE; ++extern char *CIL_KEY_TYPEATTRIBUTESET; ++extern char *CIL_KEY_EXPANDTYPEATTRIBUTE; ++extern char *CIL_KEY_TYPEALIAS; ++extern char *CIL_KEY_TYPEALIASACTUAL; ++extern char *CIL_KEY_TYPEBOUNDS; ++extern char *CIL_KEY_TYPEPERMISSIVE; ++extern char *CIL_KEY_RANGETRANSITION; ++extern char *CIL_KEY_USERROLE; ++extern char *CIL_KEY_ROLETYPE; ++extern char *CIL_KEY_ROLETRANSITION; ++extern char *CIL_KEY_ROLEALLOW; ++extern char *CIL_KEY_ROLEATTRIBUTE; ++extern char *CIL_KEY_ROLEATTRIBUTESET; ++extern char *CIL_KEY_ROLEBOUNDS; ++extern char *CIL_KEY_BOOLEANIF; ++extern char *CIL_KEY_NEVERALLOW; ++extern char *CIL_KEY_TYPEMEMBER; ++extern char *CIL_KEY_SENSALIAS; ++extern char *CIL_KEY_SENSALIASACTUAL; ++extern char *CIL_KEY_CATALIAS; ++extern char *CIL_KEY_CATALIASACTUAL; ++extern char *CIL_KEY_CATORDER; ++extern char *CIL_KEY_SENSITIVITYORDER; ++extern char *CIL_KEY_SENSCAT; ++extern char *CIL_KEY_CONSTRAIN; ++extern char *CIL_KEY_MLSCONSTRAIN; ++extern char *CIL_KEY_VALIDATETRANS; ++extern char *CIL_KEY_MLSVALIDATETRANS; ++extern char *CIL_KEY_CONTEXT; ++extern char *CIL_KEY_FILECON; ++extern char *CIL_KEY_IBPKEYCON; ++extern char *CIL_KEY_IBENDPORTCON; ++extern char *CIL_KEY_PORTCON; ++extern char *CIL_KEY_NODECON; ++extern char *CIL_KEY_GENFSCON; ++extern char *CIL_KEY_NETIFCON; ++extern char *CIL_KEY_PIRQCON; ++extern char *CIL_KEY_IOMEMCON; ++extern char *CIL_KEY_IOPORTCON; ++extern char *CIL_KEY_PCIDEVICECON; ++extern char *CIL_KEY_DEVICETREECON; ++extern char *CIL_KEY_FSUSE; ++extern char *CIL_KEY_POLICYCAP; ++extern char *CIL_KEY_OPTIONAL; ++extern char *CIL_KEY_DEFAULTUSER; ++extern char *CIL_KEY_DEFAULTROLE; ++extern char *CIL_KEY_DEFAULTTYPE; ++extern char *CIL_KEY_ROOT; ++extern char *CIL_KEY_NODE; ++extern char *CIL_KEY_PERM; ++extern char *CIL_KEY_ALLOWX; ++extern char *CIL_KEY_AUDITALLOWX; ++extern char *CIL_KEY_DONTAUDITX; ++extern char *CIL_KEY_NEVERALLOWX; ++extern char *CIL_KEY_PERMISSIONX; ++extern char *CIL_KEY_IOCTL; ++extern char *CIL_KEY_UNORDERED; ++extern char *CIL_KEY_SRC_INFO; ++extern char *CIL_KEY_SRC_CIL; ++extern char *CIL_KEY_SRC_HLL; + + /* + Symbol Table Array Indices +-- +2.17.1 + diff --git a/buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch b/buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch new file mode 100644 index 000000000..57ead4d7b --- /dev/null +++ b/buildroot/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch @@ -0,0 +1,63 @@ +From 5f5f0dce25d46af57ddabd8713e548480f2460ab Mon Sep 17 00:00:00 2001 +From: Ondrej Mosnacek +Date: Thu, 23 Jan 2020 13:57:14 +0100 +Subject: [PATCH] libsepol: remove leftovers of cil_mem_error_handler + +Commit 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function +pointer") replaced cil_mem_error_handler usage with inline contents of +the default handler. However, it left over the header declaration and +two callers. Convert these as well and remove the header declaration. + +This also fixes a build failure with -fno-common. + +Upstream: https://github.com/SELinuxProject/selinux/commit/3d32fc24d6aff360a538c63dad08ca5c957551b0 + +Fixes: 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function pointer") +Signed-off-by: Ondrej Mosnacek +Signed-off-by: Matt Weber +--- + cil/src/cil_mem.h | 1 - + cil/src/cil_strpool.c | 8 ++++---- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/cil/src/cil_mem.h b/cil/src/cil_mem.h +index 902ce13..794f02a 100644 +--- a/cil/src/cil_mem.h ++++ b/cil/src/cil_mem.h +@@ -36,7 +36,6 @@ void *cil_calloc(size_t num_elements, size_t element_size); + void *cil_realloc(void *ptr, size_t size); + char *cil_strdup(const char *str); + int cil_asprintf(char **strp, const char *fmt, ...); +-void (*cil_mem_error_handler)(void); + + #endif /* CIL_MEM_H_ */ + +diff --git a/cil/src/cil_strpool.c b/cil/src/cil_strpool.c +index 97d4c4b..2598bbf 100644 +--- a/cil/src/cil_strpool.c ++++ b/cil/src/cil_strpool.c +@@ -80,8 +80,8 @@ char *cil_strpool_add(const char *str) + int rc = hashtab_insert(cil_strpool_tab, (hashtab_key_t)strpool_ref->str, strpool_ref); + if (rc != SEPOL_OK) { + pthread_mutex_unlock(&cil_strpool_mutex); +- (*cil_mem_error_handler)(); +- pthread_mutex_lock(&cil_strpool_mutex); ++ cil_log(CIL_ERR, "Failed to allocate memory\n"); ++ exit(1); + } + } + +@@ -104,8 +104,8 @@ void cil_strpool_init(void) + cil_strpool_tab = hashtab_create(cil_strpool_hash, cil_strpool_compare, CIL_STRPOOL_TABLE_SIZE); + if (cil_strpool_tab == NULL) { + pthread_mutex_unlock(&cil_strpool_mutex); +- (*cil_mem_error_handler)(); +- return; ++ cil_log(CIL_ERR, "Failed to allocate memory\n"); ++ exit(1); + } + } + cil_strpool_readers++; +-- +2.17.1 + diff --git a/buildroot/package/libsepol/Config.in b/buildroot/package/libsepol/Config.in index 21d4d7865..21d9e9617 100644 --- a/buildroot/package/libsepol/Config.in +++ b/buildroot/package/libsepol/Config.in @@ -22,12 +22,12 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION Here's a handy table to help you choose: kernel version SElinux policy max version - <= 2.6.x 25 - > 2.6 <= 3.5 26 - > 3.5 <= 3.14 28 (27 and 28 were added at the same time) - > 3.14 <= 4.3 29 - > 4.3 <= 4.13 30 - > 4.13 31 + < 2.6.x 25 + >= 2.6 < 3.5 26 + >= 3.5 < 3.14 28 (27 and 28 were added at the same time) + >= 3.14 < 4.3 29 + >= 4.3 < 4.13 30 + >= 4.13 31 endif diff --git a/buildroot/package/libssh/0001-libssh.h-bump-to-version-0.9.4.patch b/buildroot/package/libssh/0001-libssh.h-bump-to-version-0.9.4.patch new file mode 100644 index 000000000..d6ec50509 --- /dev/null +++ b/buildroot/package/libssh/0001-libssh.h-bump-to-version-0.9.4.patch @@ -0,0 +1,29 @@ +From 8d8428cbbc2c00d078cfbc967e4e6fee7ff7bf0b Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 15 Apr 2020 11:57:29 +0200 +Subject: [PATCH] libssh.h: bump to version 0.9.4 + +In the released version of libssh the version bump was not done +properly. Therefore the current release 0.9.4 reports 0.9.3. + +Signed-off-by: Heiko Thiery +--- + include/libssh/libssh.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h +index 79030131..e2a8d991 100644 +--- a/include/libssh/libssh.h ++++ b/include/libssh/libssh.h +@@ -79,7 +79,7 @@ + /* libssh version */ + #define LIBSSH_VERSION_MAJOR 0 + #define LIBSSH_VERSION_MINOR 9 +-#define LIBSSH_VERSION_MICRO 3 ++#define LIBSSH_VERSION_MICRO 4 + + #define LIBSSH_VERSION_INT SSH_VERSION_INT(LIBSSH_VERSION_MAJOR, \ + LIBSSH_VERSION_MINOR, \ +-- +2.20.1 + diff --git a/buildroot/package/libssh/0002-channels-Avoid-returning-SSH_AGAIN-from-ssh_channel_.patch b/buildroot/package/libssh/0002-channels-Avoid-returning-SSH_AGAIN-from-ssh_channel_.patch new file mode 100644 index 000000000..9cc938947 --- /dev/null +++ b/buildroot/package/libssh/0002-channels-Avoid-returning-SSH_AGAIN-from-ssh_channel_.patch @@ -0,0 +1,45 @@ +From 6417f5a3cac8537ac6f6ff7fc1642dfaa0917fb4 Mon Sep 17 00:00:00 2001 +From: Jakub Jelen +Date: Thu, 16 Apr 2020 11:13:34 +0200 +Subject: [PATCH] channels: Avoid returning SSH_AGAIN from + ssh_channel_poll_timeout() + +This addresses a regression introduced in 3bad0607, partially fixed in 022409e9, +but the function was still able to return SSH_AGAIN, which was not expected by +callers. + +Based on discussion in [1] and [2] + +[1] https://gitlab.com/libssh/libssh-mirror/-/merge_requests/101 +[2] https://www.libssh.org/archive/libssh/2020-03/0000029.html + +Signed-off-by: Jakub Jelen +Reviewed-by: Anderson Toshiyuki Sasaki + +[Backport from upstream commit: +6417f5a3cac8537ac6f6ff7fc1642dfaa0917fb4] +Signed-off-by: Heiko Thiery +--- + src/channels.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/channels.c b/src/channels.c +index bcc1c207..9fe309d0 100644 +--- a/src/channels.c ++++ b/src/channels.c +@@ -3116,6 +3116,12 @@ int ssh_channel_poll_timeout(ssh_channel channel, int timeout, int is_stderr) + session->session_state == SSH_SESSION_STATE_ERROR) { + rc = SSH_ERROR; + goto out; ++ } else if (rc == SSH_AGAIN) { ++ /* If the above timeout expired, it is ok and we do not need to ++ * attempt to check the read buffer. The calling functions do not ++ * expect us to return SSH_AGAIN either here. */ ++ rc = SSH_OK; ++ goto out; + } + len = ssh_buffer_get_len(stdbuf); + if (len > 0) { +-- +2.20.1 + diff --git a/buildroot/package/libssh/libssh.hash b/buildroot/package/libssh/libssh.hash index ca296701b..62b860300 100644 --- a/buildroot/package/libssh/libssh.hash +++ b/buildroot/package/libssh/libssh.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature # https://www.libssh.org/files/0.9/libssh-0.9.3.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 2c8b5f894dced58b3d629f16f3afa6562c20b4bdc894639163cf657833688f0c libssh-0.9.3.tar.xz -sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING +sha256 150897a569852ac05aac831dc417a7ba8e610c86ca2e0154a99c6ade2486226b libssh-0.9.4.tar.xz +sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/buildroot/package/libssh/libssh.mk b/buildroot/package/libssh/libssh.mk index 52517a5dd..abc9aec9a 100644 --- a/buildroot/package/libssh/libssh.mk +++ b/buildroot/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.9 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).3 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 diff --git a/buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch b/buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch new file mode 100644 index 000000000..624bf082b --- /dev/null +++ b/buildroot/package/libv4l/0002-keytable-use-input_event-properly.patch @@ -0,0 +1,36 @@ +From a84fc5d02ffd7119b3e38b72339f5760991d14da Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Mon, 30 Mar 2020 14:24:34 -0700 +Subject: [PATCH] keytable: use input_event properly + +It does not use time_t under musl when time_t is 64-bit. The struct has +compatibility defines. Instead of using time_t directly, use those +defines. + +Fixes compilation under musl 1.2.0 under 32-bit OSes. + +Signed-off-by: Rosen Penev +Signed-off-by: Sean Young + +[Upstream: https://git.linuxtv.org/v4l-utils.git/patch/?id=38f4ce74275ae4625463f7eec78764715a0b6246] +Signed-off-by: Peter Seiderer +--- + utils/keytable/keytable.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c +index 6cb0217..318c064 100644 +--- a/utils/keytable/keytable.c ++++ b/utils/keytable/keytable.c +@@ -1533,7 +1533,7 @@ static void test_event(struct rc_device *rc_dev, int fd) + + for (i = 0; i < rd / sizeof(struct input_event); i++) { + printf(_("%ld.%06ld: event type %s(0x%02x)"), +- ev[i].time.tv_sec, ev[i].time.tv_usec, ++ ev[i].input_event_sec, ev[i].input_event_usec, + get_event_name(events_type, ev[i].type), ev[i].type); + + switch (ev[i].type) { +-- +2.26.2 + diff --git a/buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch b/buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch new file mode 100644 index 000000000..65126789a --- /dev/null +++ b/buildroot/package/libv4l/0003-keytable-add-compatibility-for-input_event_sec.patch @@ -0,0 +1,35 @@ +From 986345e5673b1e68db513a4f72e6e79c74512a3b Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Tue, 7 Apr 2020 18:13:44 -0700 +Subject: [PATCH] keytable: add compatibility for input_event_sec + +Linux 4.16 added support for this macro. When it is not available, +define it back to the previous value. + +Signed-off-by: Rosen Penev +Signed-off-by: Sean Young + +[Upstream: https://git.linuxtv.org/v4l-utils.git/patch/?id=8b7e6ce9367fe09ca9398b5f3cc75bba2598b162] +Signed-off-by: Peter Seiderer +--- + utils/keytable/keytable.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c +index 318c064..705867c 100644 +--- a/utils/keytable/keytable.c ++++ b/utils/keytable/keytable.c +@@ -62,6 +62,10 @@ struct input_keymap_entry_v2 { + u_int8_t scancode[32]; + }; + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif + + #define IR_PROTOCOLS_USER_DIR IR_KEYTABLE_USER_DIR "/protocols" + #define IR_PROTOCOLS_SYSTEM_DIR IR_KEYTABLE_SYSTEM_DIR "/protocols" +-- +2.26.2 + 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 new file mode 100644 index 000000000..c389f2ecf --- /dev/null +++ b/buildroot/package/libvncserver/0006-libvncclient-cursor-limit-width-height-input-values.patch @@ -0,0 +1,40 @@ +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.mk b/buildroot/package/libvncserver/libvncserver.mk index 5b8648fa6..890672d04 100644 --- a/buildroot/package/libvncserver/libvncserver.mk +++ b/buildroot/package/libvncserver/libvncserver.mk @@ -19,6 +19,9 @@ 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 \ diff --git a/buildroot/package/libwpe/libwpe.hash b/buildroot/package/libwpe/libwpe.hash index 0a616a31c..e138c06f2 100644 --- a/buildroot/package/libwpe/libwpe.hash +++ b/buildroot/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.4.0.1.tar.xz.sums -md5 1d4d38413ee0d0043f74d0445cab906f libwpe-1.4.0.1.tar.xz -sha1 a41480a0a85cfa11b3f87f801b7c37bc3410e060 libwpe-1.4.0.1.tar.xz -sha256 09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b libwpe-1.4.0.1.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.6.0.tar.xz.sums +md5 6e8a2c279dcc3617db5ec7ac4c03d628 libwpe-1.6.0.tar.xz +sha1 e8424d5e29f35861d85acdc5962d8b59b53bb1ad libwpe-1.6.0.tar.xz +sha256 3587c6b8a807f4bb76b268ba74ca82c6b395b90235db41ad8252224456193c90 libwpe-1.6.0.tar.xz # Hashes for license files: -sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING +sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/buildroot/package/libwpe/libwpe.mk b/buildroot/package/libwpe/libwpe.mk index 09518ce9b..fd4f3d0cb 100644 --- a/buildroot/package/libwpe/libwpe.mk +++ b/buildroot/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.4.0.1 +LIBWPE_VERSION = 1.6.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index fde769e6a..95e85a008 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -318,11 +318,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.218" if BR2_KERNEL_HEADERS_4_4 - default "4.9.218" if BR2_KERNEL_HEADERS_4_9 - default "4.14.175" if BR2_KERNEL_HEADERS_4_14 - default "4.19.114" if BR2_KERNEL_HEADERS_4_19 - default "5.4.31" if BR2_KERNEL_HEADERS_5_4 + default "4.4.223" if BR2_KERNEL_HEADERS_4_4 + default "4.9.223" if BR2_KERNEL_HEADERS_4_9 + default "4.14.180" if BR2_KERNEL_HEADERS_4_14 + default "4.19.122" if BR2_KERNEL_HEADERS_4_19 + default "5.4.40" 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/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0001-HACK-only-build-and-install-localedef.patch rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0001-HACK-only-build-and-install-localedef.patch diff --git a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch similarity index 100% rename from buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/0003-localedef-Use-initializer-for-flexible-array-member-.patch diff --git a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash similarity index 70% rename from buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash rename to buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash index 4283ea04b..6677d32db 100644 --- a/buildroot/package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/localedef.hash +++ b/buildroot/package/localedef/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 fe1ca8099bc2cda997d8a585f1a512e59df56c52c9c7363a4058da2725c8f4a9 glibc-2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91.tar.gz +sha256 4462f56696332efbc5b0c2f86d7aa75a2a02c3d44bc4345fa42b5bab1225de5c glibc-2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/localedef/localedef.mk b/buildroot/package/localedef/localedef.mk index 1093e106f..f6e26b566 100644 --- a/buildroot/package/localedef/localedef.mk +++ b/buildroot/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91 +LOCALEDEF_VERSION = 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/buildroot/package/lvm2/lvm2.mk b/buildroot/package/lvm2/lvm2.mk index 43370b03b..02c758ea0 100644 --- a/buildroot/package/lvm2/lvm2.mk +++ b/buildroot/package/lvm2/lvm2.mk @@ -31,6 +31,9 @@ LVM2_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) # package/readline is GPL-3.0+, so not license compatible LVM2_CONF_OPTS += --disable-readline +LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) +LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LVM2_CONF_OPTS += --enable-udev_rules endif @@ -44,8 +47,11 @@ endif ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),) LVM2_MAKE_OPTS = device-mapper -LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install_device-mapper -LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper +LVM2_INSTALL_STAGING_OPTS += install_device-mapper +LVM2_INSTALL_TARGET_OPTS += install_device-mapper +else +LVM2_INSTALL_STAGING_OPTS += install +LVM2_INSTALL_TARGET_OPTS += install endif ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) @@ -54,6 +60,10 @@ else LVM2_CONF_OPTS += --disable-applib endif +ifeq ($(BR2_INIT_SYSTEMD),y) +LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators +endif + ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no endif diff --git a/buildroot/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch b/buildroot/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch new file mode 100644 index 000000000..d19947f09 --- /dev/null +++ b/buildroot/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch @@ -0,0 +1,29 @@ +From 7e1b6aafeb9fe6558da7506b304c0efb5ea82281 Mon Sep 17 00:00:00 2001 +From: Ryan Coe +Date: Fri, 13 Dec 2019 17:13:26 -0800 +Subject: [PATCH] add sysroot path to mariadb_config + +Upstream: https://github.com/mariadb-corporation/mariadb-connector-c/commit/b787c0d69cc00af98cd4ee5bc205e1c7ddaf427a +Signed-off-by: Ryan Coe +--- + libmariadb/mariadb_config/mariadb_config.c.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in +index 703c9466a1d9214a85f3638d2e3b4ecfef0c7bd6..f5513333e670373f060a3c2574d1d42facfd0337 100644 +--- a/libmariadb/mariadb_config/mariadb_config.c.in ++++ b/libmariadb/mariadb_config/mariadb_config.c.in +@@ -5,8 +5,8 @@ + + static char *mariadb_progname; + +-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" +-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" ++#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" ++#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" + #define LIBS_SYS "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE + #define VERSION "@MARIADB_CLIENT_VERSION@" +-- +2.24.1 + diff --git a/buildroot/package/matchbox/matchbox.hash b/buildroot/package/matchbox/matchbox.hash index f00ed4e4f..fdb8f7d11 100644 --- a/buildroot/package/matchbox/matchbox.hash +++ b/buildroot/package/matchbox/matchbox.hash @@ -1,2 +1,6 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2.md5 -md5 3e158dcf57823b55c926d95b245500fb matchbox-window-manager-1.2.tar.bz2 +md5 3e158dcf57823b55c926d95b245500fb matchbox-window-manager-1.2.tar.bz2 + +# Locally computed +sha256 81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff matchbox-window-manager-1.2.tar.bz2 +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/matchbox/matchbox.mk b/buildroot/package/matchbox/matchbox.mk index c0a2778b6..4d30a42ca 100644 --- a/buildroot/package/matchbox/matchbox.mk +++ b/buildroot/package/matchbox/matchbox.mk @@ -10,7 +10,7 @@ MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-win MATCHBOX_LICENSE = GPL-2.0+ MATCHBOX_LICENSE_FILES = COPYING -MATCHBOX_DEPENDENCIES = matchbox-lib +MATCHBOX_DEPENDENCIES = expat matchbox-lib MATCHBOX_CONF_OPTS = \ --enable-expat \ --disable-gconf \ diff --git a/buildroot/package/mbedtls/mbedtls.hash b/buildroot/package/mbedtls/mbedtls.hash index 92e7d35a6..17ac18bb2 100644 --- a/buildroot/package/mbedtls/mbedtls.hash +++ b/buildroot/package/mbedtls/mbedtls.hash @@ -1,5 +1,5 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.5-and-2.7.14-released -sha1 c36962183e05467aa1dadafcaacf90216a737866 mbedtls-2.16.5-apache.tgz -sha256 65b4c6cec83e048fd1c675e9a29a394ea30ad0371d37b5742453f74084e7b04d mbedtls-2.16.5-apache.tgz +# 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 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/buildroot/package/mbedtls/mbedtls.mk b/buildroot/package/mbedtls/mbedtls.mk index 5d0dd8733..50121fa6c 100644 --- a/buildroot/package/mbedtls/mbedtls.mk +++ b/buildroot/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.16.5 +MBEDTLS_VERSION = 2.16.6 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ diff --git a/buildroot/package/mc/mc.mk b/buildroot/package/mc/mc.mk index 24f6ac36a..47091be2a 100644 --- a/buildroot/package/mc/mc.mk +++ b/buildroot/package/mc/mc.mk @@ -11,6 +11,13 @@ MC_LICENSE = GPL-3.0+ MC_LICENSE_FILES = COPYING MC_DEPENDENCIES = libglib2 host-pkgconf +ifeq ($(BR2_PACKAGE_GPM),y) +MC_CONF_OPTS += --with-gpm-mouse +MC_DEPENDENCIES += gpm +else +MC_CONF_OPTS += --without-gpm-mouse +endif + ifeq ($(BR2_PACKAGE_LIBSSH2),y) MC_CONF_OPTS += --enable-vfs-sftp MC_DEPENDENCIES += libssh2 diff --git a/buildroot/package/mesa3d-headers/dri.pc b/buildroot/package/mesa3d-headers/dri.pc new file mode 100644 index 000000000..bd9a33b6c --- /dev/null +++ b/buildroot/package/mesa3d-headers/dri.pc @@ -0,0 +1,10 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +dridriverdir=/usr/lib/dri + +Name: dri +Description: Direct Rendering Infrastructure +Version: @VERSION@ +Cflags: -I${includedir} diff --git a/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk index 7d428f232..6af6e8843 100644 --- a/buildroot/package/mesa3d-headers/mesa3d-headers.mk +++ b/buildroot/package/mesa3d-headers/mesa3d-headers.mk @@ -34,13 +34,8 @@ ifeq ($(BR2_PACKAGE_XORG7),y) # Not using $(SED) because we do not want to work in-place, and $(SED) # contains -i. define MESA3D_HEADERS_BUILD_DRI_PC - sed -e 's:@\(exec_\)\?prefix@:/usr:' \ - -e 's:@libdir@:$${exec_prefix}/lib:' \ - -e 's:@includedir@:$${prefix}/include:' \ - -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \ - -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ - -e 's:@DRI_PC_REQ_PRIV@::' \ - $(@D)/src/mesa/drivers/dri/dri.pc.in \ + sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ + package/mesa3d-headers/dri.pc \ >$(@D)/src/mesa/drivers/dri/dri.pc endef 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 new file mode 100644 index 000000000..7bb00f3fb --- /dev/null +++ b/buildroot/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -0,0 +1,38 @@ +From 3a4962ede0d12bac66b38e0843f6e2ea75b03d50 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 + +Allow the user to always call pkg-config with --static thanks to a +pkg_config_static property. This will allow to fix static build failures +with libglib2: + +FAILED: gio/gio +/home/naourr/work/instance-0/output-1/host/bin/arm-linux-gcc -o gio/gio 'gio/6ae6c9e@@gio@exe/gio-tool.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-cat.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-copy.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-info.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-list.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-mime.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-mkdir.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-monitor.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-mount.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-move.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-open.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-rename.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-remove.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-save.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-set.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-trash.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-tree.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group gio/libgio-2.0.a glib/libglib-2.0.a gobject/libgobject-2.0.a gmodule/libgmodule-2.0.a -pthread /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libz.a /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmount.a /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpcre.a -lm /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libffi.a -Wl,--end-group '-Wl,-rpath,$ORIGIN/:$ORIGIN/../glib:$ORIGIN/../gobject:$ORIGIN/../gmodule' -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/gio -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/glib -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/gobject -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/gmodule +/home/naourr/work/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmount.a(la-fs.o): in function `__mnt_fs_set_source_ptr': +fs.c:(.text+0x5ec): undefined reference to `blkid_parse_tag_string' + +Fixes: + - http://autobuild.buildroot.org/results/0d36952def63cb69628697fa6408aeb6ce10cb5b + +Signed-off-by: Fabrice Fontaine +--- + mesonbuild/dependencies/base.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +index a83e3d6c..913bff6b 100644 +--- a/mesonbuild/dependencies/base.py ++++ b/mesonbuild/dependencies/base.py +@@ -840,7 +840,7 @@ 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): + 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 + diff --git a/buildroot/package/meson/cross-compilation.conf.in b/buildroot/package/meson/cross-compilation.conf.in index 369e225b3..d80c472de 100644 --- a/buildroot/package/meson/cross-compilation.conf.in +++ b/buildroot/package/meson/cross-compilation.conf.in @@ -18,6 +18,7 @@ cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] sys_root = '@STAGING_DIR@' pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' [host_machine] system = 'linux' diff --git a/buildroot/package/midori/Config.in b/buildroot/package/midori/Config.in index 64139ce49..089f36ced 100644 --- a/buildroot/package/midori/Config.in +++ b/buildroot/package/midori/Config.in @@ -1,7 +1,7 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6" +comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_MIDORI @@ -9,7 +9,7 @@ config BR2_PACKAGE_MIDORI depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2 depends on BR2_PACKAGE_LIBGTK3 depends on BR2_INSTALL_LIBSTDCPP # webkitgtk - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS # GCR can only be used with the X11 backend diff --git a/buildroot/package/msgpack/msgpack.hash b/buildroot/package/msgpack/msgpack.hash index 6b3a7ef13..3829a7022 100644 --- a/buildroot/package/msgpack/msgpack.hash +++ b/buildroot/package/msgpack/msgpack.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39 msgpack-3.2.0.tar.gz +sha256 464f46744a6be778626d11452c4db3c2d09461080c6db42e358e21af19d542f6 msgpack-3.2.1.tar.gz sha256 664550b43996452a5a2c7471bb0ff77185a58c69ccafa60f983dc4c162e1ee22 COPYING sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/buildroot/package/msgpack/msgpack.mk b/buildroot/package/msgpack/msgpack.mk index 1e13464ca..81670dedd 100644 --- a/buildroot/package/msgpack/msgpack.mk +++ b/buildroot/package/msgpack/msgpack.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSGPACK_VERSION = 3.2.0 +MSGPACK_VERSION = 3.2.1 MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION)) MSGPACK_LICENSE = BSL-1.0 MSGPACK_LICENSE_FILES = COPYING LICENSE_1_0.txt diff --git a/buildroot/package/netsnmp/netsnmp.mk b/buildroot/package/netsnmp/netsnmp.mk index ed573c51e..904279d1f 100644 --- a/buildroot/package/netsnmp/netsnmp.mk +++ b/buildroot/package/netsnmp/netsnmp.mk @@ -30,7 +30,6 @@ NETSNMP_CONF_OPTS = \ --with-sys-location="Unknown" \ --with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \ --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \ - --with-out-transports="Unix" \ --disable-manuals NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install diff --git a/buildroot/package/nginx/nginx.hash b/buildroot/package/nginx/nginx.hash index 8c5b80f80..3ec7ff244 100644 --- a/buildroot/package/nginx/nginx.hash +++ b/buildroot/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 b62756842807e5693b794e5d0ae289bd8ae5b098e66538b2a91eb80f25c591ff nginx-1.17.7.tar.gz +sha256 7dd65d405c753c41b7fdab9415cfb4bdbaf093ec6d9f7432072d52cb7bcbb689 nginx-1.17.9.tar.gz # License files, locally calculated sha256 28ad30e2f64bd89ac1287b4606906bb99ed04d9f4e13fb6564a0be9c8a23f509 LICENSE diff --git a/buildroot/package/nginx/nginx.mk b/buildroot/package/nginx/nginx.mk index 5c828d3bb..9bbb3fc20 100644 --- a/buildroot/package/nginx/nginx.mk +++ b/buildroot/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.17.7 +NGINX_VERSION = 1.17.9 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE diff --git a/buildroot/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch b/buildroot/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch new file mode 100644 index 000000000..97f4e2489 --- /dev/null +++ b/buildroot/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch @@ -0,0 +1,57 @@ +From f480ac538eb69086d4b7db855c2a457d5d6420d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Feb 2020 14:05:12 +0100 +Subject: [PATCH] CMake/Utils/PrecompiledHeader.cmake: Add -c argument to build + precompiled headers + +Add "-c" argument when building precompiled headers to fix build with +RELRO. + +More information on a similar issue with domoticz can be found here: +https://patchwork.ozlabs.org/patch/1187328: + +"The problem AFAICS is that if no -c or similar option is given, GCC +decides what needs to be done based on the rest of the arguments. If the +rest of the arguments include a -Wl,... option, it decides that linking +needs to be done. If the rest of the arguments are just header files, it +decides to create a precompiled header." + +Fixes: + - http://autobuild.buildroot.org/results/8fabf8d270b9257c3a9db6a2f17f1c08ec9428d3 + +Signed-off-by: Fabrice Fontaine +[Upstream: https://github.com/OGRECave/ogre/commit/de4d5c920e23e1e2b21dc5c8192ef74ba6210cca] +--- + CMake/Utils/PrecompiledHeader.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake +index a02d99acd..bfb0059db 100644 +--- a/CMake/Utils/PrecompiledHeader.cmake ++++ b/CMake/Utils/PrecompiledHeader.cmake +@@ -133,11 +133,11 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) + STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1}) + + SET(${out_command} +- ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} ++ ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input} + ) + ELSE(CMAKE_CXX_COMPILER_ARG1) + SET(${out_command} +- ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} ++ ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input} + ) + ENDIF(CMAKE_CXX_COMPILER_ARG1) + ELSE(CMAKE_COMPILER_IS_GNUCXX) +@@ -291,7 +291,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) + set_target_properties(${_targetName}_pch_dephelp PROPERTIES INCLUDE_DIRECTORIES "${DIRINC}") + + #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}") +- #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}") ++ #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}") + + ADD_CUSTOM_COMMAND( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_name}" +-- +2.24.1 + diff --git a/buildroot/package/openjdk/Config.in b/buildroot/package/openjdk/Config.in index 61294ec49..df769bbb3 100644 --- a/buildroot/package/openjdk/Config.in +++ b/buildroot/package/openjdk/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS default y if BR2_m68k default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_sh - default y if BR2_sparc || BR2_sparc64 config BR2_PACKAGE_OPENJDK bool "openjdk" diff --git a/buildroot/package/openjdk/openjdk.mk b/buildroot/package/openjdk/openjdk.mk index 030a20522..1f906517f 100644 --- a/buildroot/package/openjdk/openjdk.mk +++ b/buildroot/package/openjdk/openjdk.mk @@ -46,6 +46,13 @@ OPENJDK_JVM_VARIANT = zero OPENJDK_DEPENDENCIES += libffi endif +# OpenJDK installs a file named 'modules' in jre/lib, which gets installed as +# /usr/lib/modules. However, with a merged /usr, this conflicts with the +# directory named 'modules' installed by the kernel. If OpenJDK gets built +# after the kernel, this manifests itself with: "cp: cannot overwrite +# directory '/usr/lib/modules with non-directory." +OPENJDK_INSTALL_BASE = /usr/lib/jvm + # OpenJDK ignores some variables unless passed via the environment. # These variables are PATH, LD, CC, CXX, and CPP. # OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as @@ -75,6 +82,7 @@ OPENJDK_CONF_OPTS = \ --with-devkit=$(HOST_DIR) \ --with-extra-cflags="$(TARGET_CFLAGS)" \ --with-extra-cxxflags="$(TARGET_CXXFLAGS)" \ + --with-extra-ldflags="-Wl,-rpath,$(OPENJDK_INSTALL_BASE)/lib,-rpath,$(OPENJDK_INSTALL_BASE)/lib/$(OPENJDK_JVM_VARIANT)" \ --with-giflib=system \ --with-jobs=$(PARALLEL_JOBS) \ --with-jvm-variants=$(OPENJDK_JVM_VARIANT) \ @@ -114,8 +122,10 @@ endef # Calling make install always builds and installs the JDK instead of the JRE, # which makes manual installation necessary. define OPENJDK_INSTALL_TARGET_CMDS - cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/ + mkdir -p $(TARGET_DIR)$(OPENJDK_INSTALL_BASE) + cp -dpfr $(@D)/build/linux-*-release/images/jre/* \ + $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/ + cd $(TARGET_DIR)/usr/bin && ln -snf ../..$(OPENJDK_INSTALL_BASE)/bin/* . endef $(eval $(generic-package)) diff --git a/buildroot/package/openldap/openldap.hash b/buildroot/package/openldap/openldap.hash index 9ea1e7a55..7f159cb6d 100644 --- a/buildroot/package/openldap/openldap.hash +++ b/buildroot/package/openldap/openldap.hash @@ -1,7 +1,7 @@ -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.48.md5 -md5 0729a0711fe096831dedc159e0bbe73f openldap-2.4.48.tgz -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.48.sha1 -sha1 c1984e80f6db038b317bf931866adb38e5537dcd openldap-2.4.48.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.49.md5 +md5 2a47a6bb4319357ea7b032c45283e79e openldap-2.4.49.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.49.sha1 +sha1 f0caeca122e6f90e6ac5cc8ba36fe9cec13826da openldap-2.4.49.tgz # Locally computed -sha256 d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d openldap-2.4.48.tgz +sha256 e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e openldap-2.4.49.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/openldap/openldap.mk b/buildroot/package/openldap/openldap.mk index 4417bb659..a5f606749 100644 --- a/buildroot/package/openldap/openldap.mk +++ b/buildroot/package/openldap/openldap.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.48 +OPENLDAP_VERSION = 2.4.49 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz -OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release +OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License OPENLDAP_LICENSE_FILES = LICENSE OPENLDAP_INSTALL_STAGING = YES diff --git a/buildroot/package/openvpn/openvpn.hash b/buildroot/package/openvpn/openvpn.hash index d219c0f18..b9b0a4d8d 100644 --- a/buildroot/package/openvpn/openvpn.hash +++ b/buildroot/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 fb8ca66bb7807fff595fbdf2a0afd085c02a6aa47715c9aa3171002f9f1a3f91 openvpn-2.4.8.tar.xz +sha256 641f3add8694b2ccc39fd4fd92554e4f089ad16a8db6d2b473ec284839a5ebe2 openvpn-2.4.9.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/buildroot/package/openvpn/openvpn.mk b/buildroot/package/openvpn/openvpn.mk index 64f459eee..6a64e780c 100644 --- a/buildroot/package/openvpn/openvpn.mk +++ b/buildroot/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.8 +OPENVPN_VERSION = 2.4.9 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl diff --git a/buildroot/package/p7zip/0001-CVE-2016-9296.patch b/buildroot/package/p7zip/0001-CVE-2016-9296.patch new file mode 100644 index 000000000..6e6fc9f58 --- /dev/null +++ b/buildroot/package/p7zip/0001-CVE-2016-9296.patch @@ -0,0 +1,25 @@ +From: Robert Luberda +Date: Sat, 19 Nov 2016 08:48:08 +0100 +Subject: Fix nullptr dereference (CVE-2016-9296) + +Patch taken from https://sourceforge.net/p/p7zip/bugs/185/ + +Signed-off-by: André Hentschel +--- + CPP/7zip/Archive/7z/7zIn.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp +index b0c6b98..7c6dde2 100644 +--- a/CPP/7zip/Archive/7z/7zIn.cpp ++++ b/CPP/7zip/Archive/7z/7zIn.cpp +@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams( + if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) + ThrowIncorrect(); + } +- HeadersSize += folders.PackPositions[folders.NumPackStreams]; ++ if (folders.PackPositions) ++ HeadersSize += folders.PackPositions[folders.NumPackStreams]; + return S_OK; + } + diff --git a/buildroot/package/p7zip/0002-CVE-2017-17969.patch b/buildroot/package/p7zip/0002-CVE-2017-17969.patch new file mode 100644 index 000000000..9198127cb --- /dev/null +++ b/buildroot/package/p7zip/0002-CVE-2017-17969.patch @@ -0,0 +1,37 @@ +From: =?utf-8?q?Antoine_Beaupr=C3=A9?= +Date: Fri, 2 Feb 2018 11:11:41 +0100 +Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp + +Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch +Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7 +Bug: https://sourceforge.net/p/p7zip/bugs/204/ +Bug-Debian: https://bugs.debian.org/888297 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969 +Reviewed-by: Salvatore Bonaccorso +Last-Update: 2018-02-01 +Applied-Upstream: 18.00-beta + +Signed-off-by: André Hentschel +--- + CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp +index 80b7e67..ca37764 100644 +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } +- ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; ++ + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; + diff --git a/buildroot/package/p7zip/0003-CVE-2018-5996.patch b/buildroot/package/p7zip/0003-CVE-2018-5996.patch new file mode 100644 index 000000000..dc3e90ad3 --- /dev/null +++ b/buildroot/package/p7zip/0003-CVE-2018-5996.patch @@ -0,0 +1,223 @@ +From: Robert Luberda +Date: Sun, 28 Jan 2018 23:47:40 +0100 +Subject: CVE-2018-5996 + +Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by +applying a few changes from 7Zip 18.00-beta. + +Bug-Debian: https://bugs.debian.org/#888314 + +Signed-off-by: André Hentschel +--- + CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++---- + CPP/7zip/Compress/Rar1Decoder.h | 1 + + CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++- + CPP/7zip/Compress/Rar2Decoder.h | 1 + + CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++--- + CPP/7zip/Compress/Rar3Decoder.h | 2 ++ + 6 files changed, 42 insertions(+), 8 deletions(-) + +diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp +index 1aaedcc..68030c7 100644 +--- a/CPP/7zip/Compress/Rar1Decoder.cpp ++++ b/CPP/7zip/Compress/Rar1Decoder.cpp +@@ -29,7 +29,7 @@ public: + }; + */ + +-CDecoder::CDecoder(): m_IsSolid(false) { } ++CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { } + + void CDecoder::InitStructures() + { +@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + InitData(); + if (!m_IsSolid) + { ++ _errorMode = false; + InitStructures(); + InitHuff(); + } ++ ++ if (_errorMode) ++ return S_FALSE; ++ + if (m_UnpackSize > 0) + { + GetFlagsBuf(); +@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream + const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) + { + try { return CodeReal(inStream, outStream, inSize, outSize, progress); } +- catch(const CInBufferException &e) { return e.ErrorCode; } +- catch(const CLzOutWindowException &e) { return e.ErrorCode; } +- catch(...) { return S_FALSE; } ++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } ++ catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; } ++ catch(...) { _errorMode = true; return S_FALSE; } + } + + STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) +diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h +index 630f089..01b606b 100644 +--- a/CPP/7zip/Compress/Rar1Decoder.h ++++ b/CPP/7zip/Compress/Rar1Decoder.h +@@ -39,6 +39,7 @@ public: + + Int64 m_UnpackSize; + bool m_IsSolid; ++ bool _errorMode; + + UInt32 ReadBits(int numBits); + HRESULT CopyBlock(UInt32 distance, UInt32 len); +diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp +index b3f2b4b..0580c8d 100644 +--- a/CPP/7zip/Compress/Rar2Decoder.cpp ++++ b/CPP/7zip/Compress/Rar2Decoder.cpp +@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; + static const UInt32 kWindowReservSize = (1 << 22) + 256; + + CDecoder::CDecoder(): +- m_IsSolid(false) ++ m_IsSolid(false), ++ m_TablesOK(false) + { + } + +@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB + + bool CDecoder::ReadTables(void) + { ++ m_TablesOK = false; ++ + Byte levelLevels[kLevelTableSize]; + Byte newLevels[kMaxTableSize]; + m_AudioMode = (ReadBits(1) == 1); +@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void) + } + + memcpy(m_LastLevels, newLevels, kMaxTableSize); ++ m_TablesOK = true; ++ + return true; + } + +@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + return S_FALSE; + } + ++ if (!m_TablesOK) ++ return S_FALSE; ++ + UInt64 startPos = m_OutWindowStream.GetProcessedSize(); + while (pos < unPackSize) + { +diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h +index 3a0535c..0e9005f 100644 +--- a/CPP/7zip/Compress/Rar2Decoder.h ++++ b/CPP/7zip/Compress/Rar2Decoder.h +@@ -139,6 +139,7 @@ class CDecoder : + + UInt64 m_PackSize; + bool m_IsSolid; ++ bool m_TablesOK; + + void InitStructures(); + UInt32 ReadBits(unsigned numBits); +diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp +index 3bf2513..6cb8a6a 100644 +--- a/CPP/7zip/Compress/Rar3Decoder.cpp ++++ b/CPP/7zip/Compress/Rar3Decoder.cpp +@@ -92,7 +92,8 @@ CDecoder::CDecoder(): + _writtenFileSize(0), + _vmData(0), + _vmCode(0), +- m_IsSolid(false) ++ m_IsSolid(false), ++ _errorMode(false) + { + Ppmd7_Construct(&_ppmd); + } +@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) + return InitPPM(); + } + ++ TablesRead = false; ++ TablesOK = false; ++ + _lzMode = true; + PrevAlignBits = 0; + PrevAlignCount = 0; +@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) + } + } + } ++ if (InputEofError()) ++ return S_FALSE; ++ + TablesRead = true; + + // original code has check here: +@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) + RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); + + memcpy(m_LastLevels, newLevels, kTablesSizesSum); ++ ++ TablesOK = true; ++ + return S_OK; + } + +@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) + PpmEscChar = 2; + PpmError = true; + InitFilters(); ++ _errorMode = false; + } ++ ++ if (_errorMode) ++ return S_FALSE; ++ + if (!m_IsSolid || !TablesRead) + { + bool keepDecompressing; +@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) + bool keepDecompressing; + if (_lzMode) + { ++ if (!TablesOK) ++ return S_FALSE; + RINOK(DecodeLZ(keepDecompressing)) + } + else +@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream + _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1; + return CodeReal(progress); + } +- catch(const CInBufferException &e) { return e.ErrorCode; } +- catch(...) { return S_FALSE; } ++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } ++ catch(...) { _errorMode = true; return S_FALSE; } + // CNewException is possible here. But probably CNewException is caused + // by error in data stream. + } +diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h +index c130cec..2f72d7d 100644 +--- a/CPP/7zip/Compress/Rar3Decoder.h ++++ b/CPP/7zip/Compress/Rar3Decoder.h +@@ -192,6 +192,7 @@ class CDecoder: + UInt32 _lastFilter; + + bool m_IsSolid; ++ bool _errorMode; + + bool _lzMode; + bool _unsupportedFilter; +@@ -200,6 +201,7 @@ class CDecoder: + UInt32 PrevAlignCount; + + bool TablesRead; ++ bool TablesOK; + + CPpmd7 _ppmd; + int PpmEscChar; diff --git a/buildroot/package/p7zip/p7zip.mk b/buildroot/package/p7zip/p7zip.mk index ff0dd01e0..59cd9b7e9 100644 --- a/buildroot/package/p7zip/p7zip.mk +++ b/buildroot/package/p7zip/p7zip.mk @@ -10,6 +10,13 @@ P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSIO P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction P7ZIP_LICENSE_FILES = DOC/License.txt +# 0001-CVE-2016-9296.patch +P7ZIP_IGNORE_CVES += CVE-2016-9296 +# 0002-CVE-2017-17969.patch +P7ZIP_IGNORE_CVES += CVE-2017-17969 +# 0003-CVE-2018-5996.patch +P7ZIP_IGNORE_CVES += CVE-2018-5996 + # p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and # CXXFLAGS, so we can't pass them. Instead, it accepts ALLFLAGS_C # and ALLFLAGS_CPP as variables to pass the CFLAGS and CXXFLAGS. 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 new file mode 100644 index 000000000..7989f045b --- /dev/null +++ b/buildroot/package/paho-mqtt-c/0001-src-CMakeLists.txt-fix-build-on-uclibc-or-musl.patch @@ -0,0 +1,45 @@ +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 new file mode 100644 index 000000000..ee4c2307e --- /dev/null +++ b/buildroot/package/paho-mqtt-c/0002-Revert-Enable-CXX-language-to-support-using-Generate.patch @@ -0,0 +1,46 @@ +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 97b15d132..8f6ca6148 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,4 +1,5 @@ # Locally computed: -sha256 7b4eed66ae3df3613629139c0df28b16abfa4e0927bd17360027d936784aa55e paho-mqtt-c-1.3.1.tar.gz +sha256 c426334c2ffc9f7a230e3de5162bdbc1762f8f60ffe27460e553edb74c7e0681 paho-mqtt-c-1.3.2.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 -sha256 44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5 epl-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 8772d73be..c7ecf412c 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,12 +4,17 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.1 +PAHO_MQTT_C_VERSION = 1.3.2 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) -PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3-Clause -PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10 +PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause +PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE PAHO_MQTT_C_INSTALL_STAGING = YES +PAHO_MQTT_C_CONF_OPTS = \ + -DPAHO_ENABLE_TESTING=FALSE \ + -DPAHO_ENABLE_CPACK=FALSE \ + -DPAHO_HIGH_PERFORMANCE=TRUE + ifeq ($(BR2_PACKAGE_OPENSSL),y) PAHO_MQTT_C_DEPENDENCIES += openssl PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=TRUE diff --git a/buildroot/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch b/buildroot/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch deleted file mode 100644 index 559c64db8..000000000 --- a/buildroot/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f150702d5ab72878d45b722b6d7d4194db92c44a Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 9 Mar 2020 15:36:48 +0100 -Subject: [PATCH] Check for sys/auxv.h before using it. - -Fixes aarch64 compile wiht uclibc-ng (does not provide -sys/auxv.h header file). - -Signed-off-by: Peter Seiderer -Upstream: https://github.com/php/php-src/commit/f73528f0e0d59ac744ccb4a94a3a9d7b9f0fba1b ---- - configure.ac | 1 + - ext/standard/crc32.c | 9 +++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5219a5f2..caf62302 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -440,6 +440,7 @@ resolv.h \ - strings.h \ - syslog.h \ - sysexits.h \ -+sys/auxv.h \ - sys/ioctl.h \ - sys/file.h \ - sys/mman.h \ -diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c -index c3ca5903..e59ab45f 100644 ---- a/ext/standard/crc32.c -+++ b/ext/standard/crc32.c -@@ -17,10 +17,15 @@ - */ - - #include "php.h" -+#ifdef PHP_WIN32 -+#include "config.w32.h" -+#else -+#include -+#endif - #include "basic_functions.h" - #include "crc32.h" - --#if defined(__aarch64__) -+#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) - # include - # if defined(__linux__) - # include -@@ -85,7 +90,7 @@ PHP_NAMED_FUNCTION(php_if_crc32) - - crc = crcinit^0xFFFFFFFF; - --#if defined(__aarch64__) -+#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) - if (has_crc32_insn()) { - crc = crc32_aarch64(crc, p, nr); - RETURN_LONG(crc^0xFFFFFFFF); --- -2.25.1 - diff --git a/buildroot/package/php/Config.ext b/buildroot/package/php/Config.ext index 193bc1bd0..66ee935cf 100644 --- a/buildroot/package/php/Config.ext +++ b/buildroot/package/php/Config.ext @@ -256,6 +256,7 @@ config BR2_PACKAGE_PHP_EXT_GD select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_ZLIB help GD support diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index 4584524f1..a0b8fd468 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 1873c4cefdd3df9a78dcffb2198bba5c2f0464f55c9c960720c84df483fca74c php-7.4.4.tar.xz +sha256 d059fd7f55bdc4d2eada15a00a2976697010d3631ef6f83149cc5289e1f23c2c php-7.4.5.tar.xz # License file sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index f62204c2a..4d2f1b8f6 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.4 +PHP_VERSION = 7.4.5 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -113,7 +113,7 @@ PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \ - $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \ + $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--with-zip) \ $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \ $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \ $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \ @@ -327,12 +327,10 @@ endif ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y) PHP_CONF_OPTS += \ - --with-gd \ - --with-jpeg-dir=$(STAGING_DIR)/usr \ - --with-png-dir=$(STAGING_DIR)/usr \ - --with-zlib-dir=$(STAGING_DIR)/usr \ - --with-freetype-dir=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += jpeg libpng freetype + --enable-gd \ + --with-jpeg \ + --with-freetype +PHP_DEPENDENCIES += jpeg libpng freetype zlib endif ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) diff --git a/buildroot/package/pkg-meson.mk b/buildroot/package/pkg-meson.mk index 835098b85..97129d808 100644 --- a/buildroot/package/pkg-meson.mk +++ b/buildroot/package/pkg-meson.mk @@ -76,6 +76,7 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ + -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ -e "/^\[binaries\]$$$$/s:$$$$:$$(foreach x,$$($(2)_MESON_EXTRA_BINARIES),\n$$(x)):" \ package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf @@ -192,6 +193,7 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ + -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > $(HOST_DIR)/etc/meson/cross-compilation.conf.in sed -e 's%@PKG_TARGET_CFLAGS@%%g' \ diff --git a/buildroot/package/polkit/0001-make-netgroup-support-optional.patch b/buildroot/package/polkit/0001-make-netgroup-support-optional.patch index f96738c91..86916aba3 100644 --- a/buildroot/package/polkit/0001-make-netgroup-support-optional.patch +++ b/buildroot/package/polkit/0001-make-netgroup-support-optional.patch @@ -1,4 +1,4 @@ -From 21aa2747e8f0048759aab184b07dd6389666d5e6 Mon Sep 17 00:00:00 2001 +From 1b854ef4bb15032091a33fed587e5ba6f3e582eb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 22 May 2019 13:18:55 -0700 Subject: [PATCH] make netgroup support optional @@ -17,20 +17,174 @@ Fixes bug 50145. Signed-off-by: A. Wilcox Signed-off-by: Khem Raj Signed-off-by: Adam Duskett +[Thomas: add introspection.m4.] +Signed-off-by: Thomas Petazzoni --- - configure.ac | 2 +- - src/polkit/polkitidentity.c | 16 ++++++++++++++++ - src/polkit/polkitunixnetgroup.c | 3 +++ - .../polkitbackendinteractiveauthority.c | 14 ++++++++------ - src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ - test/polkit/polkitidentitytest.c | 9 ++++++++- - test/polkit/polkitunixnetgrouptest.c | 3 +++ - .../test-polkitbackendjsauthority.c | 2 ++ - 8 files changed, 43 insertions(+), 8 deletions(-) + buildutil/introspection.m4 | 142 ++++++++++++++++++ + configure.ac | 2 +- + src/polkit/polkitidentity.c | 16 ++ + src/polkit/polkitunixnetgroup.c | 3 + + .../polkitbackendinteractiveauthority.c | 14 +- + .../polkitbackendjsauthority.cpp | 2 + + test/polkit/polkitidentitytest.c | 9 +- + test/polkit/polkitunixnetgrouptest.c | 3 + + .../test-polkitbackendjsauthority.c | 2 + + 9 files changed, 185 insertions(+), 8 deletions(-) + create mode 100644 buildutil/introspection.m4 +diff --git a/buildutil/introspection.m4 b/buildutil/introspection.m4 +new file mode 100644 +index 0000000..b0ccd68 +--- /dev/null ++++ b/buildutil/introspection.m4 +@@ -0,0 +1,142 @@ ++dnl -*- mode: autoconf -*- ++dnl Copyright 2009 Johan Dahlin ++dnl ++dnl This file is free software; the author(s) gives unlimited ++dnl permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++ ++# serial 1 ++ ++dnl This is a copy of AS_AC_EXPAND ++dnl ++dnl (C) 2003, 2004, 2005 Thomas Vander Stichele ++dnl Copying and distribution of this file, with or without modification, ++dnl are permitted in any medium without royalty provided the copyright ++dnl notice and this notice are preserved. ++m4_define([_GOBJECT_INTROSPECTION_AS_AC_EXPAND], ++[ ++ EXP_VAR=[$1] ++ FROM_VAR=[$2] ++ ++ dnl first expand prefix and exec_prefix if necessary ++ prefix_save=$prefix ++ exec_prefix_save=$exec_prefix ++ ++ dnl if no prefix given, then use /usr/local, the default prefix ++ if test "x$prefix" = "xNONE"; then ++ prefix="$ac_default_prefix" ++ fi ++ dnl if no exec_prefix given, then use prefix ++ if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=$prefix ++ fi ++ ++ full_var="$FROM_VAR" ++ dnl loop until it doesn't change anymore ++ while true; do ++ new_full_var="`eval echo $full_var`" ++ if test "x$new_full_var" = "x$full_var"; then break; fi ++ full_var=$new_full_var ++ done ++ ++ dnl clean up ++ full_var=$new_full_var ++ AC_SUBST([$1], "$full_var") ++ ++ dnl restore prefix and exec_prefix ++ prefix=$prefix_save ++ exec_prefix=$exec_prefix_save ++]) ++ ++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first ++ ++ dnl enable/disable introspection ++ m4_if([$2], [require], ++ [dnl ++ enable_introspection=yes ++ ],[dnl ++ AC_ARG_ENABLE(introspection, ++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], ++ [Enable introspection for this build]),, ++ [enable_introspection=auto]) ++ ])dnl ++ ++ AC_MSG_CHECKING([for gobject-introspection]) ++ ++ dnl presence/version checking ++ AS_CASE([$enable_introspection], ++ [no], [dnl ++ found_introspection="no (disabled, use --enable-introspection to enable)" ++ ],dnl ++ [yes],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0],, ++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], ++ found_introspection=yes, ++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) ++ ],dnl ++ [auto],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) ++ dnl Canonicalize enable_introspection ++ enable_introspection=$found_introspection ++ ],dnl ++ [dnl ++ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) ++ ])dnl ++ ++ AC_MSG_RESULT([$found_introspection]) ++ ++ dnl expand datadir/libdir so we can pass them to pkg-config ++ dnl and get paths relative to our target directories ++ _GOBJECT_INTROSPECTION_AS_AC_EXPAND(_GI_EXP_DATADIR, "$datadir") ++ _GOBJECT_INTROSPECTION_AS_AC_EXPAND(_GI_EXP_LIBDIR, "$libdir") ++ ++ INTROSPECTION_SCANNER= ++ INTROSPECTION_COMPILER= ++ INTROSPECTION_GENERATE= ++ INTROSPECTION_GIRDIR= ++ INTROSPECTION_TYPELIBDIR= ++ if test "x$found_introspection" = "xyes"; then ++ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --define-variable=datadir="${_GI_EXP_DATADIR}" --variable=girdir gobject-introspection-1.0` ++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --define-variable=libdir="${_GI_EXP_LIBDIR}" --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection ++ fi ++ AC_SUBST(INTROSPECTION_SCANNER) ++ AC_SUBST(INTROSPECTION_COMPILER) ++ AC_SUBST(INTROSPECTION_GENERATE) ++ AC_SUBST(INTROSPECTION_GIRDIR) ++ AC_SUBST(INTROSPECTION_TYPELIBDIR) ++ AC_SUBST(INTROSPECTION_CFLAGS) ++ AC_SUBST(INTROSPECTION_LIBS) ++ AC_SUBST(INTROSPECTION_MAKEFILE) ++ ++ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ++]) ++ ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) ++]) ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) ++ ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ++]) +diff --git a/configure.ac b/configure.ac +index 5cedb4e..87aa0ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP +@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) AC_SUBST(EXPAT_LIBS) @@ -39,9 +193,11 @@ Signed-off-by: Adam Duskett if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" +diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c +index 3aa1f7f..10e9c17 100644 --- a/src/polkit/polkitidentity.c +++ b/src/polkit/polkitidentity.c -@@ -182,7 +182,15 @@ polkit_identity_from_string (const gcha +@@ -182,7 +182,15 @@ polkit_identity_from_string (const gchar *str, } else if (g_str_has_prefix (str, "unix-netgroup:")) { @@ -57,7 +213,7 @@ Signed-off-by: Adam Duskett } if (identity == NULL && (error != NULL && *error == NULL)) -@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVaria +@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVariant *variant, GVariant *v; const char *name; @@ -71,7 +227,7 @@ Signed-off-by: Adam Duskett v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); if (v == NULL) { -@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVaria +@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVariant *variant, name = g_variant_get_string (v, NULL); ret = polkit_unix_netgroup_new (name); g_variant_unref (v); @@ -79,9 +235,11 @@ Signed-off-by: Adam Duskett } else { +diff --git a/src/polkit/polkitunixnetgroup.c b/src/polkit/polkitunixnetgroup.c +index 8a2b369..83f8d4a 100644 --- a/src/polkit/polkitunixnetgroup.c +++ b/src/polkit/polkitunixnetgroup.c -@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUni +@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUnixNetgroup *group, PolkitIdentity * polkit_unix_netgroup_new (const gchar *name) { @@ -91,9 +249,11 @@ Signed-off-by: Adam Duskett g_return_val_if_fail (name != NULL, NULL); return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, "name", name, +diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c +index 056d9a8..36c2f3d 100644 --- a/src/polkitbackend/polkitbackendinteractiveauthority.c +++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity +@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity *group, GList *ret; ret = NULL; @@ -126,7 +286,7 @@ Signed-off-by: Adam Duskett PolkitIdentity *user; GError *error = NULL; -@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity +@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity *group, out: endnetgrent (); @@ -134,9 +294,11 @@ Signed-off-by: Adam Duskett return ret; } +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 9b752d1..09b2878 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext +@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, JS::CallArgs args = JS::CallArgsFromVp (argc, vp); @@ -144,7 +306,7 @@ Signed-off-by: Adam Duskett JS::RootedString usrstr (authority->priv->cx); usrstr = args[0].toString(); user = JS_EncodeStringToUTF8 (cx, usrstr); -@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext +@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, JS_free (cx, netgroup); JS_free (cx, user); @@ -152,6 +314,8 @@ Signed-off-by: Adam Duskett ret = true; +diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c +index e91967b..e829aaa 100644 --- a/test/polkit/polkitidentitytest.c +++ b/test/polkit/polkitidentitytest.c @@ -19,6 +19,7 @@ @@ -162,7 +326,7 @@ Signed-off-by: Adam Duskett #include "glib.h" #include #include -@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_tes +@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_test_data [] = { {"unix-group:root", "unix-group:jane", FALSE}, {"unix-group:jane", "unix-group:jane", TRUE}, @@ -193,6 +357,8 @@ Signed-off-by: Adam Duskett add_comparison_tests (); +diff --git a/test/polkit/polkitunixnetgrouptest.c b/test/polkit/polkitunixnetgrouptest.c +index 3701ba1..e3352eb 100644 --- a/test/polkit/polkitunixnetgrouptest.c +++ b/test/polkit/polkitunixnetgrouptest.c @@ -19,6 +19,7 @@ @@ -213,6 +379,8 @@ Signed-off-by: Adam Duskett +#endif return g_test_run (); } +diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c +index 71aad23..fdd28f3 100644 --- a/test/polkitbackend/test-polkitbackendjsauthority.c +++ b/test/polkitbackend/test-polkitbackendjsauthority.c @@ -137,12 +137,14 @@ test_get_admin_identities (void) @@ -230,3 +398,6 @@ Signed-off-by: Adam Duskett }; guint n; +-- +2.25.1 + diff --git a/buildroot/package/polkit/0002-jsauthority-memleak.patch b/buildroot/package/polkit/0002-jsauthority-memleak.patch new file mode 100644 index 000000000..4f0733185 --- /dev/null +++ b/buildroot/package/polkit/0002-jsauthority-memleak.patch @@ -0,0 +1,28 @@ +From 28e3a6653d8c3777b07e0128a0d97d46e586e311 Mon Sep 17 00:00:00 2001 +From: Jan Rybar +Date: Tue, 8 Oct 2019 13:28:18 +0000 +Subject: [PATCH] jsauthority: Fix two minor memory leaks + +(cherry picked from commit 28e3a6653d8c3777b07e0128a0d97d46e586e311) +Signed-off-by: Jan Rybar +Signed-off-by: Adam Duskett +--- + src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 9b752d1..e97b8aa 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -567,6 +567,8 @@ polkit_backend_js_authority_finalize (GObject *object) + g_strfreev (authority->priv->rules_dirs); + + delete authority->priv->ac; ++ delete authority->priv->js_global; ++ delete authority->priv->js_polkit; + + JS_DestroyContext (authority->priv->cx); + /* JS_ShutDown (); */ +-- +2.24.1 + diff --git a/buildroot/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch b/buildroot/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch new file mode 100644 index 000000000..fb41df3af --- /dev/null +++ b/buildroot/package/polkit/0003-polkit-0.116-pkttyagent-sigttou-bg-job.patch @@ -0,0 +1,34 @@ +From 76aae4fce586b400f5fe08df31497db19d624609 Mon Sep 17 00:00:00 2001 +From: Jan Rybar +Date: Thu, 1 Aug 2019 06:46:10 +0000 +Subject: [PATCH] pkttyagent: process stopped by SIGTTOU if run in background + job + + +(cherry picked from commit 76aae4fce586b400f5fe08df31497db19d624609) +Signed-off-by: Jan Rybar +Signed-off-by: Adam Duskett +--- + src/programs/pkttyagent.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/programs/pkttyagent.c b/src/programs/pkttyagent.c +index 3c8d502..13879a2 100644 +--- a/src/programs/pkttyagent.c ++++ b/src/programs/pkttyagent.c +@@ -264,6 +264,12 @@ main (int argc, char *argv[]) + + memset (&sa, 0, sizeof (sa)); + sa.sa_handler = &tty_handler; ++/* If tty_handler() resets terminal while pkttyagent is run in background job, ++ the process gets stopped by SIGTTOU. This impacts systemctl, hence it must ++ be blocked for a while and then the process gets killed anyway. ++ */ ++ sigemptyset(&sa.sa_mask); ++ sigaddset(&sa.sa_mask, SIGTTOU); + sigaction (SIGTERM, &sa, &savesigterm); + sigaction (SIGINT, &sa, &savesigint); + sigaction (SIGTSTP, &sa, &savesigtstp); +-- +2.24.1 + diff --git a/buildroot/package/polkit/polkit.mk b/buildroot/package/polkit/polkit.mk index 4e7cda943..ee0b3674d 100644 --- a/buildroot/package/polkit/polkit.mk +++ b/buildroot/package/polkit/polkit.mk @@ -8,7 +8,7 @@ POLKIT_VERSION = 0.116 POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING - +POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES POLKIT_DEPENDENCIES = \ @@ -43,4 +43,10 @@ define POLKIT_PERMISSIONS /usr/bin/pkexec f 4755 root root - - - - - endef +define POLKIT_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(POLKIT_PKGDIR)/polkit.service \ + $(TARGET_DIR)/usr/lib/systemd/system/polkit.service + +endef + $(eval $(autotools-package)) diff --git a/buildroot/package/polkit/polkit.service b/buildroot/package/polkit/polkit.service new file mode 100644 index 000000000..a69b28cd9 --- /dev/null +++ b/buildroot/package/polkit/polkit.service @@ -0,0 +1,12 @@ +[Unit] + +Description=Authorization Manager +Documentation=man:polkit(8) + +[Service] +Type=dbus +BusName=org.freedesktop.PolicyKit1 +ExecStart=/usr/lib/polkit-1/polkitd --no-debug + +[Install] +WantedBy=multi-user.target diff --git a/buildroot/package/python-attrs/python-attrs.hash b/buildroot/package/python-attrs/python-attrs.hash index f8c38ee4e..384159575 100644 --- a/buildroot/package/python-attrs/python-attrs.hash +++ b/buildroot/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 5b2db50fcc31be34d32798183c9bd062 attrs-19.3.0.tar.gz -sha256 f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 attrs-19.3.0.tar.gz -# Locally computer sha256 -sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE +md5 5b2db50fcc31be34d32798183c9bd062 attrs-19.3.0.tar.gz +sha256 f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 attrs-19.3.0.tar.gz +# Locally computed sha256 +sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/buildroot/package/python-crossbar/Config.in b/buildroot/package/python-crossbar/Config.in index 526d9871b..2b9077ae8 100644 --- a/buildroot/package/python-crossbar/Config.in +++ b/buildroot/package/python-crossbar/Config.in @@ -39,6 +39,7 @@ config BR2_PACKAGE_PYTHON_CROSSBAR select BR2_PACKAGE_PYTHON_U_MSGPACK select BR2_PACKAGE_PYTHON_UBJSON select BR2_PACKAGE_PYTHON_WATCHDOG + select BR2_PACKAGE_PYTHON_WERKZEUG select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE help Crossbar.io is an open-source WAMP application router that diff --git a/buildroot/package/python-dpkt/Config.in b/buildroot/package/python-dpkt/Config.in index d8e3388d7..9bd7a98d2 100644 --- a/buildroot/package/python-dpkt/Config.in +++ b/buildroot/package/python-dpkt/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_DPKT bool "python-dpkt" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_ZLIB + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime help Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols. diff --git a/buildroot/package/python-flask/Config.in b/buildroot/package/python-flask/Config.in index 6f77913ed..0e5b64ce5 100644 --- a/buildroot/package/python-flask/Config.in +++ b/buildroot/package/python-flask/Config.in @@ -4,10 +4,13 @@ config BR2_PACKAGE_PYTHON_FLASK select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 help Flask is a microframework for Python based on Werkzeug, Jinja 2 and good intentions. - http://flask.pocoo.org/ + https://palletsprojects.com/p/flask diff --git a/buildroot/package/python-flask/python-flask.hash b/buildroot/package/python-flask/python-flask.hash index 24f68c660..c6ccd633f 100644 --- a/buildroot/package/python-flask/python-flask.hash +++ b/buildroot/package/python-flask/python-flask.hash @@ -1,6 +1,7 @@ -# md5, sha256 from https://pypi.org/pypi/flask/json -md5 0e3ed44ece1c489ed835d1b7047e349c Flask-1.1.1.tar.gz -sha256 13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52 Flask-1.1.1.tar.gz -# Locally computed sha256 checksums +# From https://pypi.org/project/Flask/#copy-hash-modal-911ffb67-fe84-4e25-a1a9-f4c745a0a980 +md5 0da4145d172993cd28a6c619630cc19c Flask-1.1.2.tar.gz +sha256 4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060 Flask-1.1.2.tar.gz + +# License files sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst sha256 0ef3ae025f4a398761079f0d687ff3d66f4fef3a32ac2607318e909c0cba9150 docs/license.rst diff --git a/buildroot/package/python-flask/python-flask.mk b/buildroot/package/python-flask/python-flask.mk index 0cd1a1801..cc39bf7e4 100644 --- a/buildroot/package/python-flask/python-flask.mk +++ b/buildroot/package/python-flask/python-flask.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 1.1.1 +PYTHON_FLASK_VERSION = 1.1.2 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/2e/80/3726a729de758513fd3dbc64e93098eb009c49305a97c6751de55b20b694 +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/4e/0b/cb02268c90e67545a0e3a37ea1ca3d45de3aca43ceb7dbf1712fb5127d5d PYTHON_FLASK_SETUP_TYPE = setuptools PYTHON_FLASK_LICENSE = BSD-3-Clause PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst diff --git a/buildroot/package/python-future/Config.in b/buildroot/package/python-future/Config.in index 29303f334..8a3fd38f3 100644 --- a/buildroot/package/python-future/Config.in +++ b/buildroot/package/python-future/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FUTURE bool "python-future" - depends on BR2_PACKAGE_PYTHON help Easy, clean, reliable Python 2/3 compatibility. diff --git a/buildroot/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch b/buildroot/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch new file mode 100644 index 000000000..2a344c2f5 --- /dev/null +++ b/buildroot/package/python-iptables/0001-Add-separate-mechanism-to-load-libc.patch @@ -0,0 +1,90 @@ +From e3557528d7cdcdc2c579212be8837bc9b54635a4 Mon Sep 17 00:00:00 2001 +From: Frank Vanbever +Date: Thu, 20 Feb 2020 12:14:08 +0100 +Subject: [PATCH] Add separate mechanism to load libc + +ctypes.util.find_library() always returns None for systems which do not have the +tools installed to determine the location of a given shared library (i.e. +ldconfig, gcc, objdump). If find_libary() fails attempt to load known libc by +SONAME. + +Upstream: https://github.com/ldx/python-iptables/commit/e3557528d7cdcdc2c579212be8837bc9b54635a4 + +Signed-off-by: Frank Vanbever +--- + iptc/ip4tc.py | 4 ++-- + iptc/util.py | 16 ++++++++++++++++ + iptc/xtables.py | 4 ++-- + 3 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/iptc/ip4tc.py b/iptc/ip4tc.py +index 4c5d690..4ddd2dc 100644 +--- a/iptc/ip4tc.py ++++ b/iptc/ip4tc.py +@@ -9,7 +9,7 @@ import socket + import struct + import weakref + +-from .util import find_library, load_kernel ++from .util import find_library, load_kernel, find_libc + from .xtables import (XT_INV_PROTO, NFPROTO_IPV4, XTablesError, xtables, + xt_align, xt_counters, xt_entry_target, xt_entry_match) + +@@ -26,7 +26,7 @@ if not hasattr(socket, 'IPPROTO_SCTP'): + + _IFNAMSIZ = 16 + +-_libc = ct.CDLL("libc.so.6") ++_libc = find_libc() + _get_errno_loc = _libc.__errno_location + _get_errno_loc.restype = ct.POINTER(ct.c_int) + _malloc = _libc.malloc +diff --git a/iptc/util.py b/iptc/util.py +index ae5fb9b..e6b1649 100644 +--- a/iptc/util.py ++++ b/iptc/util.py +@@ -109,3 +109,19 @@ def find_library(*names): + major = int(m.group(1)) + return lib, major + return None, None ++ ++ ++def find_libc(): ++ lib = ctypes.util.find_library('c') ++ if lib is not None: ++ return ctypes.CDLL(lib, mode=ctypes.RTLD_GLOBAL) ++ ++ libnames = ['libc.so.6', 'libc.so.0', 'libc.so'] ++ for name in libnames: ++ try: ++ lib = ctypes.CDLL(name, mode=ctypes.RTLD_GLOBAL) ++ return lib ++ except: ++ pass ++ ++ return None +diff --git a/iptc/xtables.py b/iptc/xtables.py +index 93bc080..cf21029 100644 +--- a/iptc/xtables.py ++++ b/iptc/xtables.py +@@ -6,7 +6,7 @@ import sys + import weakref + + from . import version +-from .util import find_library ++from .util import find_library, find_libc + from .errors import * + + XT_INV_PROTO = 0x40 # invert the sense of PROTO +@@ -792,7 +792,7 @@ class xtables_target(ct.Union): + ("v12", _xtables_target_v12)] + + +-_libc, _ = find_library("c") ++_libc = find_libc() + _optind = ct.c_long.in_dll(_libc, "optind") + _optarg = ct.c_char_p.in_dll(_libc, "optarg") + +-- +2.20.1 + diff --git a/buildroot/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch b/buildroot/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch new file mode 100644 index 000000000..41d49fc1e --- /dev/null +++ b/buildroot/package/python-iptables/0002-Add-.so-as-additional-shared-object-suffix.patch @@ -0,0 +1,57 @@ +From 899d25c511c6ce779b7153e9ae2e41055b30b9c5 Mon Sep 17 00:00:00 2001 +From: Frank Vanbever +Date: Mon, 9 Mar 2020 12:36:47 +0100 +Subject: [PATCH] Add '.so' as additional shared object suffix + +EXT_SUFFIX includes a platform information tag starting from Python 3.5 [0] +For example: + + >>> sysconfig.get_config_var("EXT_SUFFIX") + '.cpython-38-aarch64-linux-gnu.so' + +This suffix only applies to cpython extensions i.e. not to the iptables shared +objects. + +Adding '.so' as an additional suffix for shared objects fixes the issue. + +Fixes: Issue #301 + +Signed-off-by: Frank Vanbever + +Backported from: 899d25c511c6ce779b7153e9ae2e41055b30b9c5 + +[0]: https://docs.python.org/3/whatsnew/3.5.html#build-and-c-api-changes +--- + iptc/util.py | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/iptc/util.py b/iptc/util.py +index e6b1649..04fe905 100644 +--- a/iptc/util.py ++++ b/iptc/util.py +@@ -80,12 +80,19 @@ def _do_find_library(name): + + + def _find_library(*names): ++ exts = [] + if version_info >= (3, 3): +- ext = get_config_var("EXT_SUFFIX") ++ exts.append(get_config_var("EXT_SUFFIX")) + else: +- ext = get_config_var('SO') ++ exts.append(get_config_var('SO')) ++ ++ if version_info >= (3, 5): ++ exts.append('.so') ++ + for name in names: +- libnames = [name, "lib" + name, name + ext, "lib" + name + ext] ++ libnames = [name, "lib" + name] ++ for ext in exts: ++ libnames += [name + ext, "lib" + name + ext] + libdir = os.environ.get('IPTABLES_LIBDIR', None) + if libdir is not None: + libdirs = libdir.split(':') +-- +2.20.1 + diff --git a/buildroot/package/python-iptables/Config.in b/buildroot/package/python-iptables/Config.in index e55359963..a35577bad 100644 --- a/buildroot/package/python-iptables/Config.in +++ b/buildroot/package/python-iptables/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PYTHON_IPTABLES bool "python-iptables" + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_IPTABLES # runtime dependency help Python bindings for iptables. https://github.com/ldx/python-iptables + +comment "python-iptables needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/buildroot/package/python-jedi/python-jedi.hash b/buildroot/package/python-jedi/python-jedi.hash index 1fc3a3da5..77af6e79f 100644 --- a/buildroot/package/python-jedi/python-jedi.hash +++ b/buildroot/package/python-jedi/python-jedi.hash @@ -1,6 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/jedi/json -md5 ba88266caac41988ffb4fd6041a3c354 jedi-0.15.1.tar.gz -sha256 ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e jedi-0.15.1.tar.gz +md5 ba88266caac41988ffb4fd6041a3c354 jedi-0.15.1.tar.gz +sha256 ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e jedi-0.15.1.tar.gz # Locally computed sha256 checksums -sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt -sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE +sha256 78e60cd0b8f28694f30195482c33d76908d846b0d15278deb7332aa22ba8e412 LICENSE.txt +sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE +sha256 b41b78f562a2e65b75cab44354335f6f435d4ef73065509600ac910cf4e22fe0 jedi/third_party/typeshed/LICENSE diff --git a/buildroot/package/python-jedi/python-jedi.mk b/buildroot/package/python-jedi/python-jedi.mk index e11146def..4e756a709 100644 --- a/buildroot/package/python-jedi/python-jedi.mk +++ b/buildroot/package/python-jedi/python-jedi.mk @@ -8,7 +8,8 @@ PYTHON_JEDI_VERSION = 0.15.1 PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/85/03/cd5a6e44a5753b4d539288d9d1f9645caac889c17dd2950292a8818f86b2 PYTHON_JEDI_SETUP_TYPE = setuptools -PYTHON_JEDI_LICENSE = MIT, BSD-3-Clause (flask theme) -PYTHON_JEDI_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE +PYTHON_JEDI_LICENSE = MIT, BSD-3-Clause (flask theme), Apache-2.0 (typeshed) +PYTHON_JEDI_LICENSE_FILES = \ + LICENSE.txt docs/_themes/flask/LICENSE jedi/third_party/typeshed/LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch b/buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch new file mode 100644 index 000000000..ee980e22e --- /dev/null +++ b/buildroot/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch @@ -0,0 +1,53 @@ +From 9144d0fc5d5249cc4d81287ee79091806e6dde52 Mon Sep 17 00:00:00 2001 +From: Gareth Simpson +Date: Fri, 1 May 2020 19:31:21 +0100 +Subject: [PATCH] Fix for issue 348 - incomplete tags with punctuation after as + part of the tag name are a source of XSS + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/trentm/python-markdown2/commit/9144d0fc5d5249cc4d81287ee79091806e6dde52] +--- + lib/markdown2.py | 2 +- + test/tm-cases/issue348_incomplete_tag.html | 1 + + test/tm-cases/issue348_incomplete_tag.opts | 1 + + test/tm-cases/issue348_incomplete_tag.text | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 test/tm-cases/issue348_incomplete_tag.html + create mode 100644 test/tm-cases/issue348_incomplete_tag.opts + create mode 100644 test/tm-cases/issue348_incomplete_tag.text + +diff --git a/lib/markdown2.py b/lib/markdown2.py +index 3a5d5d9..636bf07 100755 +--- a/lib/markdown2.py ++++ b/lib/markdown2.py +@@ -2164,7 +2164,7 @@ def _encode_amps_and_angles(self, text): + text = self._naked_gt_re.sub('>', text) + return text + +- _incomplete_tags_re = re.compile("<(/?\w+[\s/]+?)") ++ _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") + + def _encode_incomplete_tags(self, text): + if self.safe_mode not in ("replace", "escape"): +diff --git a/test/tm-cases/issue348_incomplete_tag.html b/test/tm-cases/issue348_incomplete_tag.html +new file mode 100644 +index 0000000..46059cc +--- /dev/null ++++ b/test/tm-cases/issue348_incomplete_tag.html +@@ -0,0 +1 @@ ++

    <lol@/ //id="pwn"//onclick="alert(1)"//abc

    +diff --git a/test/tm-cases/issue348_incomplete_tag.opts b/test/tm-cases/issue348_incomplete_tag.opts +new file mode 100644 +index 0000000..ad487c0 +--- /dev/null ++++ b/test/tm-cases/issue348_incomplete_tag.opts +@@ -0,0 +1 @@ ++{"safe_mode": "escape"} +diff --git a/test/tm-cases/issue348_incomplete_tag.text b/test/tm-cases/issue348_incomplete_tag.text +new file mode 100644 +index 0000000..bb4a0de +--- /dev/null ++++ b/test/tm-cases/issue348_incomplete_tag.text +@@ -0,0 +1 @@ ++ +Date: Sat, 2 May 2020 21:22:36 +0100 +Subject: [PATCH] Better fix for issue 348 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/trentm/python-markdown2/commit/0c0543846fa54281e2269b0bff841a0b9ffe23fe] +--- + lib/markdown2.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/markdown2.py b/lib/markdown2.py +index 636bf07..be86502 100755 +--- a/lib/markdown2.py ++++ b/lib/markdown2.py +@@ -2164,11 +2164,14 @@ def _encode_amps_and_angles(self, text): + text = self._naked_gt_re.sub('>', text) + return text + +- _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") ++ _incomplete_tags_re = re.compile("<(/?\w+?(?!\w).+?[\s/]+?)") + + def _encode_incomplete_tags(self, text): + if self.safe_mode not in ("replace", "escape"): + return text ++ ++ if text.endswith(">"): ++ return text # this is not an incomplete tag, this is a link in the form + + return self._incomplete_tags_re.sub("<\\1", text) + diff --git a/buildroot/package/python-markdown2/python-markdown2.mk b/buildroot/package/python-markdown2/python-markdown2.mk index d8b946e14..f508c17a2 100644 --- a/buildroot/package/python-markdown2/python-markdown2.mk +++ b/buildroot/package/python-markdown2/python-markdown2.mk @@ -11,4 +11,8 @@ PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt +# 0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch +# 0002-Better-fix-for-issue-348.patch +PYTHON_MARKDOWN2_IGNORE_CVES += CVE-2020-11888 + $(eval $(python-package)) diff --git a/buildroot/package/python/python.hash b/buildroot/package/python/python.hash index aa809b9a6..f5e51d963 100644 --- a/buildroot/package/python/python.hash +++ b/buildroot/package/python/python.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-2717/ -md5 b3b6d2c92f42a60667814358ab9f0cfd Python-2.7.17.tar.xz +# From https://www.python.org/downloads/release/python-2718/ +md5 fd6cc8ec0a78c44036f825e739f36e5a Python-2.7.18.tar.xz # Locally calculated -sha256 4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41 Python-2.7.17.tar.xz -sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE +sha256 b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 Python-2.7.18.tar.xz +sha256 de4d1f2d2ad5ad0cfd1657a106476b31cb5db5ef9d1ff842b237c0c81f0c8a23 LICENSE diff --git a/buildroot/package/python/python.mk b/buildroot/package/python/python.mk index 1c393b255..532c372de 100644 --- a/buildroot/package/python/python.mk +++ b/buildroot/package/python/python.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).17 +PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).18 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_LICENSE = Python-2.0, others diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk index d12237300..2656037ef 100644 --- a/buildroot/package/python3/python3.mk +++ b/buildroot/package/python3/python3.mk @@ -146,6 +146,10 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) PYTHON3_CONF_ENV += ac_cv_func_wcsftime=no endif +ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) +PYTHON3_DEPENDENCIES += gettext +endif + PYTHON3_CONF_OPTS += \ --without-ensurepip \ --without-cxx-main \ diff --git a/buildroot/package/qemu/Config.in.host b/buildroot/package/qemu/Config.in.host index ea9281c5f..5ed160159 100644 --- a/buildroot/package/qemu/Config.in.host +++ b/buildroot/package/qemu/Config.in.host @@ -11,6 +11,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_mips default y if BR2_mipsel default y if BR2_nios2 + default y if BR2_or1k default y if BR2_powerpc default y if BR2_powerpc64 default y if BR2_powerpc64le diff --git a/buildroot/package/qemu/qemu.mk b/buildroot/package/qemu/qemu.mk index b2249ed4e..0bb29f936 100644 --- a/buildroot/package/qemu/qemu.mk +++ b/buildroot/package/qemu/qemu.mk @@ -199,6 +199,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman host-p # mips64 mips64 # mips64el mips64el # nios2 nios2 +# or1k or1k # powerpc ppc # powerpc64 ppc64 # powerpc64le ppc64 (system) / ppc64le (usermode) @@ -303,6 +304,13 @@ define HOST_QEMU_CONFIGURE_CMDS --extra-cflags="$(HOST_QEMU_CFLAGS)" \ --extra-ldflags="$(HOST_LDFLAGS)" \ --python=$(HOST_DIR)/bin/python3 \ + --disable-bzip2 \ + --disable-curl \ + --disable-libssh \ + --disable-sdl \ + --disable-vnc-jpeg \ + --disable-vnc-png \ + --disable-vnc-sasl \ $(HOST_QEMU_OPTS) endef diff --git a/buildroot/package/qpdf/qpdf.mk b/buildroot/package/qpdf/qpdf.mk index ac703d716..fd31140b0 100644 --- a/buildroot/package/qpdf/qpdf.mk +++ b/buildroot/package/qpdf/qpdf.mk @@ -11,7 +11,7 @@ QPDF_LICENSE = Apache-2.0 or Artistic-2.0 QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 QPDF_DEPENDENCIES = host-pkgconf zlib jpeg -QPDF_CONF_OPTS = --without-random +QPDF_CONF_OPTS = --with-random=/dev/urandom ifeq ($(BR2_PACKAGE_GNUTLS),y) QPDF_CONF_OPTS += --enable-crypto-gnutls diff --git a/buildroot/package/qt5/qt5.mk b/buildroot/package/qt5/qt5.mk index 7805b575f..28de0e5b7 100644 --- a/buildroot/package/qt5/qt5.mk +++ b/buildroot/package/qt5/qt5.mk @@ -5,7 +5,7 @@ ################################################################################ QT5_VERSION_MAJOR = 5.12 -QT5_VERSION = $(QT5_VERSION_MAJOR).7 +QT5_VERSION = $(QT5_VERSION_MAJOR).8 QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules diff --git a/buildroot/package/qt5/qt53d/qt53d.hash b/buildroot/package/qt5/qt53d/qt53d.hash index 1ccc9f00e..5e7db55a5 100644 --- a/buildroot/package/qt5/qt53d/qt53d.hash +++ b/buildroot/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qt3d-everywhere-src-5.12.7.tar.xz.sha256 -sha256 2030de3dc93fd4062f677f61938229af9cd7aa4c3d2932cdda2ccb663d681126 qt3d-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qt3d-everywhere-src-5.12.8.tar.xz.sha256 +sha256 066d360df173c024264c957546b8265ac14e44ef8007a181e1d723399f7c1257 qt3d-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/buildroot/package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch b/buildroot/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from buildroot/package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to buildroot/package/qt5/qt5base/5.12.8/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/buildroot/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch b/buildroot/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch similarity index 100% rename from buildroot/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch rename to buildroot/package/qt5/qt5base/5.12.8/0002-double-conversion-enable-for-microblaze.patch diff --git a/buildroot/package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch b/buildroot/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch similarity index 100% rename from buildroot/package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch rename to buildroot/package/qt5/qt5base/5.12.8/0003-double-conversion-enable-for-nios2.patch diff --git a/buildroot/package/qt5/qt5base/5.12.7/qt5base.hash b/buildroot/package/qt5/qt5base/5.12.8/qt5base.hash similarity index 80% rename from buildroot/package/qt5/qt5base/5.12.7/qt5base.hash rename to buildroot/package/qt5/qt5base/5.12.8/qt5base.hash index 0697464cb..70b90f09f 100644 --- a/buildroot/package/qt5/qt5base/5.12.7/qt5base.hash +++ b/buildroot/package/qt5/qt5base/5.12.8/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d qtbase-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtbase-everywhere-src-5.12.8.tar.xz.sha256 +sha256 19592fbd0a524a17c35e413988fe494251103619ef7dd49aecdf3170973aabd8 qtbase-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash index 2c7046a87..19f9b8450 100644 --- a/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b63a513a2ee11548b122e0fd640b1fa22d3eb83cdc51ddfdf3b97c2ecd0d0c50 qtcanvas3d-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtcanvas3d-everywhere-src-5.12.8.tar.xz.sha256 +sha256 a30deda1021266b3be4d016474fbf4df6b40356ff870c026320204f2364d12cc qtcanvas3d-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5charts/qt5charts.hash b/buildroot/package/qt5/qt5charts/qt5charts.hash index fb077b95a..0010d1b9f 100644 --- a/buildroot/package/qt5/qt5charts/qt5charts.hash +++ b/buildroot/package/qt5/qt5charts/qt5charts.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcharts-everywhere-src-5.12.7.tar.xz.sha256 -sha256 434065526d0b1d8921e96cc1827b1a3579e073b930fe536455c4c1da2f15cf5f qtcharts-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtcharts-everywhere-src-5.12.8.tar.xz.sha256 +sha256 ded463b3f99bf5cc5fe39ed2d70183948c6e955430ce0b21eb235b5c13bc9d16 qtcharts-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash b/buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash similarity index 74% rename from buildroot/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash rename to buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash index 9af3a57c1..9a00e5605 100644 --- a/buildroot/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash +++ b/buildroot/package/qt5/qt5connectivity/5.12.8/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz.sha256 -sha256 647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a qtconnectivity-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtconnectivity-everywhere-src-5.12.8.tar.xz.sha256 +sha256 dd4d7b291e5ad88d9e9c34e9c5419923498f5264bd3deb9a5da556943f2931e3 qtconnectivity-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5declarative/5.12.7/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/buildroot/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch similarity index 100% rename from buildroot/package/qt5/qt5declarative/5.12.7/0001-qsgtexture-fix-debug-build-with-uclibc.patch rename to buildroot/package/qt5/qt5declarative/5.12.8/0001-qsgtexture-fix-debug-build-with-uclibc.patch diff --git a/buildroot/package/qt5/qt5declarative/qt5declarative.hash b/buildroot/package/qt5/qt5declarative/qt5declarative.hash index 71e9cb211..2d4f8ebc2 100644 --- a/buildroot/package/qt5/qt5declarative/qt5declarative.hash +++ b/buildroot/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtdeclarative-everywhere-src-5.12.7.tar.xz.sha256 -sha256 5cdc05a035f240ab73b6b37dd3831c1350cd80e5799da47929974085f6eae9bd qtdeclarative-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtdeclarative-everywhere-src-5.12.8.tar.xz.sha256 +sha256 7e1059be9f3faab6fd3d40b58666798963bb9d9c5442d5d16e6870c51327160b qtdeclarative-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 8e327de29..23a28c434 100644 --- a/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtgraphicaleffects-everywhere-src-5.12.7.tar.xz.sha256 -sha256 02f0328420c623da8f9ae949fec01e99ba84213dd2ad559cb00c204502bbcace qtgraphicaleffects-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtgraphicaleffects-everywhere-src-5.12.8.tar.xz.sha256 +sha256 660acc87a084d2e404c2c5ddc0317f0d8a7b5292c889c9f37134e32ed7a33954 qtgraphicaleffects-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash index de977f15b..238afd467 100644 --- a/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz.sha256 -sha256 9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b qtimageformats-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtimageformats-everywhere-src-5.12.8.tar.xz.sha256 +sha256 e176463c49762152131c93d6b02f1b1ff72fcd0aae3092c9fa05e57464d043b0 qtimageformats-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/buildroot/package/qt5/qt5location/qt5location.hash b/buildroot/package/qt5/qt5location/qt5location.hash index 80bcfaf0a..727570a29 100644 --- a/buildroot/package/qt5/qt5location/qt5location.hash +++ b/buildroot/package/qt5/qt5location/qt5location.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtlocation-everywhere-src-5.12.7.tar.xz.sha256 -sha256 d1e905b80befda3c9aaad92ea984e6dbf722568b5c91e8d15b027bc5bc22781f qtlocation-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtlocation-everywhere-src-5.12.8.tar.xz.sha256 +sha256 ffe3c5183744743b476230b644c71a931e5822c5107b02607000e0e1f1a34b0a qtlocation-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash index 016ec44ce..aab49b6f0 100644 --- a/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz.sha256 -sha256 28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d qtmultimedia-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtmultimedia-everywhere-src-5.12.8.tar.xz.sha256 +sha256 26fc117f6ad012ac140353ade4371c234d6d73492f834f93b0b200b8b5552fe2 qtmultimedia-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 9ae6ac76d..e8ef55145 100644 --- a/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz.sha256 -sha256 1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5 qtquickcontrols-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtquickcontrols-everywhere-src-5.12.8.tar.xz.sha256 +sha256 5d93b4107d4b14115a4d1692b533790b43d15cdf81325036ca15044592c81d38 qtquickcontrols-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/buildroot/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash b/buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash similarity index 65% rename from buildroot/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash rename to buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash index 689a7e528..9241a366f 100644 --- a/buildroot/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash +++ b/buildroot/package/qt5/qt5quickcontrols2/5.12.8/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256 -sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtquickcontrols2-everywhere-src-5.12.8.tar.xz.sha256 +sha256 a0c5646b27290cfdea6f26c58b9ddd6f177b39ac2e6d27cd7e19d8b560dc4920 qtquickcontrols2-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/buildroot/package/qt5/qt5script/qt5script.hash b/buildroot/package/qt5/qt5script/qt5script.hash index bddcceb81..88656c26d 100644 --- a/buildroot/package/qt5/qt5script/qt5script.hash +++ b/buildroot/package/qt5/qt5script/qt5script.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscript-everywhere-src-5.12.7.tar.xz.sha256 -sha256 ca1dbc66d4125a678638dd0c9c030b72fdfc4ec2c229b9316a8bc80a86104019 qtscript-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtscript-everywhere-src-5.12.8.tar.xz.sha256 +sha256 c8c13582bab8562792fab29f574768ef9fb2cdd232c102228cc511dbfc4b1097 qtscript-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5scxml/qt5scxml.hash b/buildroot/package/qt5/qt5scxml/qt5scxml.hash index 83ba0da83..eb177f7cd 100644 --- a/buildroot/package/qt5/qt5scxml/qt5scxml.hash +++ b/buildroot/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscxml-everywhere-src-5.12.7.tar.xz.sha256 -sha256 afa950bc95f881c90eea564511f3e9918d53fddf0823afb641d20dc6f794fbb6 qtscxml-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtscxml-everywhere-src-5.12.8.tar.xz.sha256 +sha256 c07020b510b20c0424a5bc58bd83337bd1c44d5fd996aa8179ad1113eb015ad2 qtscxml-everywhere-src-5.12.8.tar.xz # Hashes for license files: diff --git a/buildroot/package/qt5/qt5sensors/qt5sensors.hash b/buildroot/package/qt5/qt5sensors/qt5sensors.hash index 1e298d167..a2fe83cb7 100644 --- a/buildroot/package/qt5/qt5sensors/qt5sensors.hash +++ b/buildroot/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsensors-everywhere-src-5.12.7.tar.xz.sha256 -sha256 2b9aea9f4e2f681b4067f2b9d97c5073c135e41d26601c71f18f199bc980e740 qtsensors-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtsensors-everywhere-src-5.12.8.tar.xz.sha256 +sha256 48f3c25e32a6b19a203188d7e52ad257b3ac23781ee80bea933d721e270d297a qtsensors-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash b/buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash similarity index 70% rename from buildroot/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash rename to buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash index fa3ccc147..2f6b5c45c 100644 --- a/buildroot/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash +++ b/buildroot/package/qt5/qt5serialbus/5.12.8/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz.sha256 -sha256 82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae qtserialbus-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtserialbus-everywhere-src-5.12.8.tar.xz.sha256 +sha256 77d09c99c6a15f3de442fc734d5af7452af273f5c002fc79fdaf527071abcc9c qtserialbus-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/buildroot/package/qt5/qt5serialport/5.12.7/qt5serialport.hash b/buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash similarity index 74% rename from buildroot/package/qt5/qt5serialport/5.12.7/qt5serialport.hash rename to buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash index 43136542d..00d599d46 100644 --- a/buildroot/package/qt5/qt5serialport/5.12.7/qt5serialport.hash +++ b/buildroot/package/qt5/qt5serialport/5.12.8/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz.sha256 -sha256 224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f qtserialport-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtserialport-everywhere-src-5.12.8.tar.xz.sha256 +sha256 66d989498a84313ce843095082396f279ee43e7828aef967b1b447fce68056ea qtserialport-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5svg/qt5svg.hash b/buildroot/package/qt5/qt5svg/qt5svg.hash index 5a3447953..a3af0a464 100644 --- a/buildroot/package/qt5/qt5svg/qt5svg.hash +++ b/buildroot/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsvg-everywhere-src-5.12.7.tar.xz.sha256 -sha256 4bf60916d4e398d9609f1b3a17fc7345a0e13c7c1cc407298df20da4c7c67bb8 qtsvg-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtsvg-everywhere-src-5.12.8.tar.xz.sha256 +sha256 af2aad75a48c2e4ad70aa298decceb5afc41d499aec119ad72635363a2dfbb5d qtsvg-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5tools/qt5tools.hash b/buildroot/package/qt5/qt5tools/qt5tools.hash index 5fb75d9fa..12531a637 100644 --- a/buildroot/package/qt5/qt5tools/qt5tools.hash +++ b/buildroot/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qttools-everywhere-src-5.12.7.tar.xz.sha256 -sha256 860a97114d518f83c0a9ab3742071da16bb018e6eb387179d5764a8dcca03948 qttools-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qttools-everywhere-src-5.12.8.tar.xz.sha256 +sha256 21347e8e2422689d63a08195e27c637983c0d4261d5205ce6b493a2adfe826b4 qttools-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash b/buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash similarity index 78% rename from buildroot/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash rename to buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash index 668f971be..2a502b499 100644 --- a/buildroot/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash +++ b/buildroot/package/qt5/qt5virtualkeyboard/5.12.8/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz.sha256 -sha256 aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtvirtualkeyboard-everywhere-src-5.12.8.tar.xz.sha256 +sha256 06c08200007f58cdcc0ceddd161e5d92a6f3e326d5e7c122dcc9ef9fed853c88 qtvirtualkeyboard-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/buildroot/package/qt5/qt5wayland/qt5wayland.hash b/buildroot/package/qt5/qt5wayland/qt5wayland.hash index 43ca77a39..0eadb6d30 100644 --- a/buildroot/package/qt5/qt5wayland/qt5wayland.hash +++ b/buildroot/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwayland-everywhere-src-5.12.7.tar.xz.sha256 -sha256 fc1ab8e25461580e37090e4f82422411dee71a3de48a54be1f4b6569e00f66c5 qtwayland-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwayland-everywhere-src-5.12.8.tar.xz.sha256 +sha256 16dddccf0618be00f8396e6b5257e62a57022819d2db581b975258c716b9824a qtwayland-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash index c863a6ea6..1ea8d273e 100644 --- a/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz.sha256 -sha256 b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75 qtwebchannel-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebchannel-everywhere-src-5.12.8.tar.xz.sha256 +sha256 8c45904dd03842c509f689d4227b025b7598b6dedd6905c01f7e562f2b18fbe9 qtwebchannel-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch b/buildroot/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch similarity index 100% rename from buildroot/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch rename to buildroot/package/qt5/qt5webengine/5.12.8/0001-pkg_config-Fixes-when-use_sysroot-false.patch diff --git a/buildroot/package/qt5/qt5webengine/5.12.7/qt5webengine.hash b/buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash similarity index 99% rename from buildroot/package/qt5/qt5webengine/5.12.7/qt5webengine.hash rename to buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash index 8308ef492..03d70d207 100644 --- a/buildroot/package/qt5/qt5webengine/5.12.7/qt5webengine.hash +++ b/buildroot/package/qt5/qt5webengine/5.12.8/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebengine-everywhere-src-5.12.7.tar.xz.sha256 -sha256 83b754dca3dafeb21be6c7cb5ea99f11f5dbe9055bc1680f5bd7159224bb46fa qtwebengine-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebengine-everywhere-src-5.12.8.tar.xz.sha256 +sha256 cc7d1467055ca0c6b39a7d3d8f18d7f963070b456ff644bbf2ded555b8e45e94 qtwebengine-everywhere-src-5.12.8.tar.xz # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium diff --git a/buildroot/package/qt5/qt5websockets/qt5websockets.hash b/buildroot/package/qt5/qt5websockets/qt5websockets.hash index 3bb6297f3..5373c2af7 100644 --- a/buildroot/package/qt5/qt5websockets/qt5websockets.hash +++ b/buildroot/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz.sha256 -sha256 6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17 qtwebsockets-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebsockets-everywhere-src-5.12.8.tar.xz.sha256 +sha256 aa4fe8ac7cffb86745aa4441c4dcaa8965b77a629755b430dac5a98d04be8465 qtwebsockets-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5webview/qt5webview.hash b/buildroot/package/qt5/qt5webview/qt5webview.hash index d9d340479..1a8adfb4b 100644 --- a/buildroot/package/qt5/qt5webview/qt5webview.hash +++ b/buildroot/package/qt5/qt5webview/qt5webview.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/archive/qt/5.6/5.6.3/submodules/qtwebview-opensource-src-5.6.3.tar.xz.sha256 sha256 768a456e89f0fd7cbf39ac6b282e078a098e7426651c0b3d453b10c5c44bd81c qtwebview-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebview-everywhere-src-5.12.7.tar.xz.sha256 -sha256 d3f82d2ceab59dc4dee3b6f54f4b70869c199d63f4534b299d900cdacc9b7be7 qtwebview-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtwebview-everywhere-src-5.12.8.tar.xz.sha256 +sha256 f6492f01c3c0b2b44ffdd9e7d55d11d39e960ea0080cd29555d0a1be43366de4 qtwebview-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/buildroot/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash b/buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash similarity index 74% rename from buildroot/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash rename to buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash index 06cdb9c87..bdfec234b 100644 --- a/buildroot/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash +++ b/buildroot/package/qt5/qt5x11extras/5.12.8/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtx11extras-everywhere-src-5.12.7.tar.xz.sha256 -sha256 23895f4b1e84f3783526b9e17680df38c587601d4dfa6ff1b81ace432c480b96 qtx11extras-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtx11extras-everywhere-src-5.12.8.tar.xz.sha256 +sha256 e17f41267aaea2bb182f4d7cb4f6a1a3c4865107b0c5dd715b504f4d648a0ab9 qtx11extras-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 0366baa0b..0a5d4b799 100644 --- a/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtxmlpatterns-everywhere-src-5.12.7.tar.xz.sha256 -sha256 9002014129a1f2a44700df333a7776e23bdfd689e7a619c3540fd9f6819b417b qtxmlpatterns-everywhere-src-5.12.7.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.8/submodules/qtxmlpatterns-everywhere-src-5.12.8.tar.xz.sha256 +sha256 10bee783e4a9fcee312cd03c7d288e5811dd9d0fe9aec828baabcd05dd47144e qtxmlpatterns-everywhere-src-5.12.8.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash index 8948c41ea..f2ae8b5b5 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.7.tar.asc -sha256 79b6f9ebc357373f885153e2d5d26dc6def9f4511ee4bcbe8a8e2622acc42143 samba-4.11.7.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +# https://download.samba.org/pub/samba/stable/samba-4.11.8.tar.asc +sha256 bb140caa37d2bbbb1f15f849aa86b1d5f787729443099139936f0ea06a5100ca samba-4.11.8.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk index 582b30bcd..9ec4c1eab 100644 --- a/buildroot/package/samba4/samba4.mk +++ b/buildroot/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.11.7 +SAMBA4_VERSION = 4.11.8 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/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch b/buildroot/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch new file mode 100644 index 000000000..a5fc487aa --- /dev/null +++ b/buildroot/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch @@ -0,0 +1,49 @@ +From e1cdcfd94172a0b1ba4c9df70f4d69a41c687404 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 26 Jan 2020 18:35:13 +0000 +Subject: [PATCH] squashfs-tools: fix build failure against gcc-10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +cc ... -o mksquashfs +ld: read_fs.o:(.bss+0x0): + multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here +ld: read_fs.o:(.bss+0x8): + multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Reported-by: Toralf Förster +Bug: https://bugs.gentoo.org/706456 +Signed-off-by: Sergei Trofimovich + +[Upstream: https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5.patch] +Signed-off-by: Peter Seiderer +--- + squashfs-tools/mksquashfs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h +index 1beefef..b650306 100644 +--- a/squashfs-tools/mksquashfs.h ++++ b/squashfs-tools/mksquashfs.h +@@ -143,7 +143,7 @@ struct append_file { + #endif + + extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; +-struct cache *bwriter_buffer, *fwriter_buffer; ++extern struct cache *bwriter_buffer, *fwriter_buffer; + extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, + *to_frag, *locked_fragment, *to_process_frag; + extern struct append_file **file_mapping; +-- +2.26.2 + diff --git a/buildroot/package/squid/squid.hash b/buildroot/package/squid/squid.hash index 765e67cf3..3c8ab64d3 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.10.tar.xz.asc -md5 af7ac6e70f9bd03ae4fcec0c9b99c38a squid-4.10.tar.xz -sha1 b8b267771550bb8c7f2b2968b305118090e7217a squid-4.10.tar.xz +# 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 # Locally calculated -sha256 98f0100afd8a42ea5f6b81eb98b0e4b36d7a54beab1c73d2f1705ab49b025f1f squid-4.10.tar.xz +sha256 4ed947612410263f57ad0e39bfd087e60fb714f028d7d3b0e469943efd34287d squid-4.11.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk index aeaec425e..d281eee3e 100644 --- a/buildroot/package/squid/squid.mk +++ b/buildroot/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 4.10 +SQUID_VERSION = 4.11 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ diff --git a/buildroot/package/strongswan/strongswan.mk b/buildroot/package/strongswan/strongswan.mk index 021a59cec..7f1752ce5 100644 --- a/buildroot/package/strongswan/strongswan.mk +++ b/buildroot/package/strongswan/strongswan.mk @@ -43,6 +43,11 @@ STRONGSWAN_CONF_OPTS += \ --with-imcvdir=/usr/lib/ipsec/imcvs \ --with-dev-headers=/usr/include +# strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch +STRONGSWAN_IGNORE_CVES += CVE-2018-16151 CVE-2018-16152 +# strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch +STRONGSWAN_IGNORE_CVES += CVE-2018-17540 + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) STRONGSWAN_CONF_ENV += LIBS='-latomic' endif diff --git a/buildroot/package/suricata/0001-configure.ac-fix-static-build-with-pcap.patch b/buildroot/package/suricata/0001-configure.ac-fix-static-build-with-pcap.patch deleted file mode 100644 index 331255062..000000000 --- a/buildroot/package/suricata/0001-configure.ac-fix-static-build-with-pcap.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2660123b0c16d7f6a49747711be676c4119561c9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 24 Apr 2019 20:35:20 +0200 -Subject: [PATCH] configure.ac: fix static build with pcap - -pcap can depends on nl-3 so use pkg-config to find these dependencies -otherwise all AC_CHECK_LIB calls will fail when building statically - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet] ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index ee59c9d8e..5ec341231 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1331,6 +1331,7 @@ - AC_CHECK_HEADERS([pcap.h pcap/pcap.h pcap/bpf.h]) - - LIBPCAP="" -+ PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[]) - AC_CHECK_LIB(${PCAP_LIB_NAME}, pcap_open_live,, LIBPCAP="no") - if test "$LIBPCAP" = "no"; then - echo --- -2.20.1 - diff --git a/buildroot/package/suricata/0003-python-ensure-proper-shabang-on-python-scripts.patch b/buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch similarity index 100% rename from buildroot/package/suricata/0003-python-ensure-proper-shabang-on-python-scripts.patch rename to buildroot/package/suricata/0001-python-ensure-proper-shabang-on-python-scripts.patch diff --git a/buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch b/buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch new file mode 100644 index 000000000..5c13ac7be --- /dev/null +++ b/buildroot/package/suricata/0002-configure.ac-fix-cross-compilation-with-lua.patch @@ -0,0 +1,33 @@ +From 8db38c21b525327305778fcaa232b2a797ffcb82 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 7 May 2020 19:05:23 +0200 +Subject: [PATCH] configure.ac: fix cross-compilation with lua + +lua integer size is detected through AC_RUN_IFELSE since +https://github.com/OISF/suricata/commit/2abcd5d27f29ca37ae31108cc0ea0143fa25d0a1 + +This breaks cross-compilation and is needed only for rust so disable it +if rust is not wanted + +Signed-off-by: Fabrice Fontaine +[Upstream status: not submitted yet] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 127848234..f5f33d42d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2225,7 +2225,7 @@ return 0; + AM_CONDITIONAL([HAVE_LUA], [test "x$enable_lua" != "xno"]) + + # If Lua is enabled, test the integer size. +- if test "x$enable_lua" = "xyes"; then ++ if test "x$enable_lua" = "xyes" && test "x$enable_rust" = "xyes"; then + TMPLIBS="$LIBS" + LIBS="" + +-- +2.26.2 + diff --git a/buildroot/package/suricata/0002-configure.ac-fix-disable-geoip.patch b/buildroot/package/suricata/0002-configure.ac-fix-disable-geoip.patch deleted file mode 100644 index 7dae57a87..000000000 --- a/buildroot/package/suricata/0002-configure.ac-fix-disable-geoip.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4e8b006cdd30e43f3ab11296710170488fd5b5de Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 6 Oct 2019 09:53:23 +0200 -Subject: [PATCH] configure.ac: fix --disable-geoip - -$enableval should be used to know if the user has passed --enable-geoip -or --disable-geoip - -Fixes: - - http://autobuild.buildroot.org/results/a7a34f760ae5fe0922fdb720b8234dbcd85ed222 - -Signed-off-by: Fabrice Fontaine -Upstream status: https://github.com/OISF/suricata/pull/4278 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3df576d54..fa671024d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2143,7 +2143,7 @@ - # libmaxminddb - AC_ARG_ENABLE(geoip, - AS_HELP_STRING([--enable-geoip],[Enable GeoIP support]), -- [ enable_geoip="yes"], -+ [ enable_geoip="$enableval"], - [ enable_geoip="no"]) - AC_ARG_ENABLE(libgeoip, - AS_HELP_STRING([--disable-libgeoip], [Disable libgeoip support]), --- -2.23.0 - diff --git a/buildroot/package/suricata/0004-stream-reject-broken-ACK-packets.patch b/buildroot/package/suricata/0004-stream-reject-broken-ACK-packets.patch deleted file mode 100644 index 9670d7315..000000000 --- a/buildroot/package/suricata/0004-stream-reject-broken-ACK-packets.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1c63d3905852f746ccde7e2585600b2199cefb4b Mon Sep 17 00:00:00 2001 -From: Victor Julien -Date: Thu, 21 Nov 2019 16:10:21 +0100 -Subject: [PATCH] stream: reject broken ACK packets - -Fix evasion posibility by rejecting packets with a broken ACK field. -These packets have a non-0 ACK field, but do not have a ACK flag set. - -Bug #3324. - -Reported-by: Nicolas Adba -(cherry picked from commit fa692df37a796c3330c81988d15ef1a219afc006) -[Retrieved from: -https://github.com/OISF/suricata/commit/1c63d3905852f746ccde7e2585600b2199cefb4b] -Signed-off-by: Fabrice Fontaine ---- - src/stream-tcp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/stream-tcp.c b/src/stream-tcp.c -index 35e489acba..8653d670c6 100644 ---- a/src/stream-tcp.c -+++ b/src/stream-tcp.c -@@ -4759,6 +4759,7 @@ int StreamTcpPacket (ThreadVars *tv, Packet *p, StreamTcpThread *stt, - /* broken TCP http://ask.wireshark.org/questions/3183/acknowledgment-number-broken-tcp-the-acknowledge-field-is-nonzero-while-the-ack-flag-is-not-set */ - if (!(p->tcph->th_flags & TH_ACK) && TCP_GET_ACK(p) != 0) { - StreamTcpSetEvent(p, STREAM_PKT_BROKEN_ACK); -+ goto error; - } - - /* If we are on IPS mode, and got a drop action triggered from -@@ -6883,7 +6884,7 @@ static int StreamTcpTest10 (void) - - tcph.th_win = htons(5480); - tcph.th_seq = htonl(10); -- tcph.th_ack = htonl(11); -+ tcph.th_ack = 0; - tcph.th_flags = TH_SYN; - p->tcph = &tcph; - diff --git a/buildroot/package/suricata/suricata.hash b/buildroot/package/suricata/suricata.hash index dc52999a9..05e3593c3 100644 --- a/buildroot/package/suricata/suricata.hash +++ b/buildroot/package/suricata/suricata.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b suricata-4.1.5.tar.gz +sha256 c8a83a05f57cedc0ef81d833ddcfdbbfdcdb6f459a91b1b15dc2d5671f1aecbb suricata-4.1.8.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/suricata/suricata.mk b/buildroot/package/suricata/suricata.mk index 48a6205ee..8dd23bf2f 100644 --- a/buildroot/package/suricata/suricata.mk +++ b/buildroot/package/suricata/suricata.mk @@ -4,16 +4,13 @@ # ################################################################################ -SURICATA_VERSION = 4.1.5 +SURICATA_VERSION = 4.1.8 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE -# We're patching configure.ac +# We're patching python/Makefile.am SURICATA_AUTORECONF = YES -# 0004-stream-reject-broken-ACK-packets.patch -SURICATA_IGNORE_CVES += CVE-2019-18792 - SURICATA_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_JANSSON),jansson) \ diff --git a/buildroot/package/tzdata/tzdata.hash b/buildroot/package/tzdata/tzdata.hash index e2338f13f..8f0a9050f 100644 --- a/buildroot/package/tzdata/tzdata.hash +++ b/buildroot/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2019-September/000057.html -sha512 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 tzdata2019c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2020-April/000058.html +sha512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d tzdata2020a.tar.gz # Locally computed: -sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/buildroot/package/tzdata/tzdata.mk b/buildroot/package/tzdata/tzdata.mk index b656bc7f7..114d60195 100644 --- a/buildroot/package/tzdata/tzdata.mk +++ b/buildroot/package/tzdata/tzdata.mk @@ -4,14 +4,14 @@ # ################################################################################ -TZDATA_VERSION = 2019c +TZDATA_VERSION = 2020a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 TZDATA_DEPENDENCIES = host-tzdata HOST_TZDATA_DEPENDENCIES = host-zic TZDATA_LICENSE = Public domain -HOST_TZDATA_LICENSE_FILES = LICENSE +TZDATA_LICENSE_FILES = LICENSE # Take care when re-ordering this list since this might break zone # dependencies @@ -38,9 +38,6 @@ define TZDATA_SET_LOCALTIME endef endif -# No need to extract for target, we're using the host-installed files -TZDATA_EXTRACT_CMDS = - define TZDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo cp -a $(HOST_DIR)/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo diff --git a/buildroot/package/util-linux/0003-blkdiscard-use-O_EXCL-add-force.patch b/buildroot/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch similarity index 100% rename from buildroot/package/util-linux/0003-blkdiscard-use-O_EXCL-add-force.patch rename to buildroot/package/util-linux/0001-blkdiscard-use-O_EXCL-add-force.patch diff --git a/buildroot/package/util-linux/0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch b/buildroot/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch similarity index 100% rename from buildroot/package/util-linux/0004-libfdisk-add-fdisk_set_disklabel_id_from_string.patch rename to buildroot/package/util-linux/0002-libfdisk-add-fdisk_set_disklabel_id_from_string.patch diff --git a/buildroot/package/util-linux/0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch b/buildroot/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch similarity index 100% rename from buildroot/package/util-linux/0005-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch rename to buildroot/package/util-linux/0003-sfdisk-add-disk-id-to-change-disk-UUID-ID.patch diff --git a/buildroot/package/util-linux/0006-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch b/buildroot/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch similarity index 100% rename from buildroot/package/util-linux/0006-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch rename to buildroot/package/util-linux/0004-kill-include-sys-types.h-before-checking-SYS_pidfd_s.patch diff --git a/buildroot/package/util-linux/0007-include-cleanup-pidfd-inckudes.patch b/buildroot/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch similarity index 100% rename from buildroot/package/util-linux/0007-include-cleanup-pidfd-inckudes.patch rename to buildroot/package/util-linux/0005-include-cleanup-pidfd-inckudes.patch diff --git a/buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch b/buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch new file mode 100644 index 000000000..d592a9dc1 --- /dev/null +++ b/buildroot/package/util-linux/0006-libfdisk-script-accept-sector-size-ignore-unknown-headers.patch @@ -0,0 +1,138 @@ +From d8c68b52cc939a16f04ec976648a37f5f5de718c Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 4 Feb 2020 15:11:19 +0100 +Subject: libfdisk: (script) accept sector-size, ignore unknown headers + +- add sector-size between supported headers (already in --dump output) + +- report unknown headers by -ENOTSUP + +- ignore ENOTSUP in sfdisk (but print warning) and in fdisk_script_read_file() + +Addresses: https://github.com/karelzak/util-linux/issues/949 +Signed-off-by: Karel Zak + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=d8c68b52cc939a16f04ec976648a37f5f5de718c] +--- + disk-utils/sfdisk.c | 6 +++++- + libfdisk/src/script.c | 49 ++++++++++++++++++++++++++----------------------- + 2 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c +index 0db797b2d..e08862aa8 100644 +--- a/disk-utils/sfdisk.c ++++ b/disk-utils/sfdisk.c +@@ -1823,7 +1823,11 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) + } + + rc = fdisk_script_read_line(dp, stdin, buf, sizeof(buf)); +- if (rc < 0) { ++ if (rc == -ENOTSUP) { ++ buf[sizeof(buf) - 1] = '\0'; ++ fdisk_warnx(sf->cxt, _("Unknown script header '%s' -- ignore."), buf); ++ continue; ++ } else if (rc < 0) { + DBG(PARSE, ul_debug("script parsing failed, trying sfdisk specific commands")); + buf[sizeof(buf) - 1] = '\0'; + rc = loop_control_commands(sf, dp, buf); +diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c +index a21771b6a..d3e67fa9c 100644 +--- a/libfdisk/src/script.c ++++ b/libfdisk/src/script.c +@@ -805,8 +805,12 @@ static inline int is_header_line(const char *s) + /* parses ": value", note modifies @s*/ + static int parse_line_header(struct fdisk_script *dp, char *s) + { +- int rc = -EINVAL; ++ size_t i; + char *name, *value; ++ static const char *supported[] = { ++ "label", "unit", "label-id", "device", "grain", ++ "first-lba", "last-lba", "table-length", "sector-size" ++ }; + + DBG(SCRIPT, ul_debugobj(dp, " parse header '%s'", s)); + +@@ -816,7 +820,7 @@ static int parse_line_header(struct fdisk_script *dp, char *s) + name = s; + value = strchr(s, ':'); + if (!value) +- goto done; ++ return -EINVAL; + *value = '\0'; + value++; + +@@ -825,32 +829,30 @@ static int parse_line_header(struct fdisk_script *dp, char *s) + ltrim_whitespace((unsigned char *) value); + rtrim_whitespace((unsigned char *) value); + ++ if (!*name || !*value) ++ return -EINVAL; ++ ++ /* check header name */ ++ for (i = 0; i < ARRAY_SIZE(supported); i++) { ++ if (strcmp(name, supported[i]) == 0) ++ break; ++ } ++ if (i == ARRAY_SIZE(supported)) ++ return -ENOTSUP; ++ ++ /* header specific actions */ + if (strcmp(name, "label") == 0) { + if (dp->cxt && !fdisk_get_label(dp->cxt, value)) +- goto done; /* unknown label name */ ++ return -EINVAL; /* unknown label name */ + dp->force_label = 1; ++ + } else if (strcmp(name, "unit") == 0) { + if (strcmp(value, "sectors") != 0) +- goto done; /* only "sectors" supported */ +- } else if (strcmp(name, "label-id") == 0 +- || strcmp(name, "device") == 0 +- || strcmp(name, "grain") == 0 +- || strcmp(name, "first-lba") == 0 +- || strcmp(name, "last-lba") == 0 +- || strcmp(name, "table-length") == 0) { +- ; /* whatever is possible */ +- } else +- goto done; /* unknown header */ ++ return -EINVAL; /* only "sectors" supported */ + +- if (*name && *value) +- rc = fdisk_script_set_header(dp, name, value); +-done: +- if (rc) +- DBG(SCRIPT, ul_debugobj(dp, "header parse error: " +- "[rc=%d, name='%s', value='%s']", +- rc, name, value)); +- return rc; ++ } + ++ return fdisk_script_set_header(dp, name, value); + } + + /* returns zero terminated string with next token and @str is updated */ +@@ -1363,7 +1365,8 @@ int fdisk_script_set_fgets(struct fdisk_script *dp, + * + * Reads next line into dump. + * +- * Returns: 0 on success, <0 on error, 1 when nothing to read. ++ * Returns: 0 on success, <0 on error, 1 when nothing to read. For unknown headers ++ * returns -ENOTSUP, it's usually safe to ignore this error. + */ + int fdisk_script_read_line(struct fdisk_script *dp, FILE *f, char *buf, size_t bufsz) + { +@@ -1428,7 +1431,7 @@ int fdisk_script_read_file(struct fdisk_script *dp, FILE *f) + + while (!feof(f)) { + rc = fdisk_script_read_line(dp, f, buf, sizeof(buf)); +- if (rc) ++ if (rc && rc != -ENOTSUP) + break; + } + +-- +cgit 1.2-0.3.lf.el7 + diff --git a/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch b/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch index 677508655..cd839b737 100644 --- a/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch +++ b/buildroot/package/vlc/0006-Don-t-assume-strerror_l-is-available.patch @@ -11,7 +11,7 @@ Fix compile error Code for #else condition was taken from http://patches.osdyson.org/patch/series/view/vlc/2.2.0~rc2-1+dyson2/dyson.patch -[Bernd: rebased for vlc-3.0.6] +[Bernd: rebased for vlc-3.0.6 & 3.0.9.2] Signed-off-by: Bernd Kuhls --- configure.ac | 2 +- @@ -26,8 +26,8 @@ index dfb4c1c329..bfe43512a2 100644 need_libc=false dnl Check for usual libc functions --AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale]) -+AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale]) +-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale]) ++AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale strerror_l stricmp strnicmp strptime uselocale]) AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf]) AC_REPLACE_FUNCS([gettimeofday]) AC_CHECK_FUNC(fdatasync,, diff --git a/buildroot/package/vlc/vlc.hash b/buildroot/package/vlc/vlc.hash index d1d3e45b0..9eb8ec9dc 100644 --- a/buildroot/package/vlc/vlc.hash +++ b/buildroot/package/vlc/vlc.hash @@ -1,9 +1,9 @@ -# From http://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz.sha256 -sha256 e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6 vlc-3.0.8.tar.xz -# From http://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz.sha1 -sha1 424a9795e051c198e7fa28107b15809ee6820d43 vlc-3.0.8.tar.xz -# From http://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz.md5 -md5 744442ec0c145453ea1d257914c8072e vlc-3.0.8.tar.xz +# 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 # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/vlc/vlc.mk b/buildroot/package/vlc/vlc.mk index 4b1cd68d8..76650eef7 100644 --- a/buildroot/package/vlc/vlc.mk +++ b/buildroot/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.8 +VLC_VERSION = 3.0.9.2 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ @@ -567,4 +567,11 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) VLC_DEPENDENCIES += zlib endif +ifeq ($(BR2_PACKAGE_GNUTLS),y) +VLC_CONF_OPTS += --enable-gnutls +VLC_DEPENDENCIES += gnutls +else +VLC_CONF_OPTS += --disable-gnutls +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/vnstat/vnstat.hash b/buildroot/package/vnstat/vnstat.hash index 94b4adc40..6934c569b 100644 --- a/buildroot/package/vnstat/vnstat.hash +++ b/buildroot/package/vnstat/vnstat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a0955999abd56d5463d257ffdccc9b1e9ad9ea504de81e64ba4c197f1245abaa vnstat-2.4.tar.gz +sha256 89276e0a7281943edb554b874078278ad947dc312938a2451e03eb80679f7ff7 vnstat-2.6.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/vnstat/vnstat.mk b/buildroot/package/vnstat/vnstat.mk index f0ef1cc69..be1b75a6b 100644 --- a/buildroot/package/vnstat/vnstat.mk +++ b/buildroot/package/vnstat/vnstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -VNSTAT_VERSION = 2.4 +VNSTAT_VERSION = 2.6 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPL-2.0 VNSTAT_LICENSE_FILES = COPYING diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash index 0dfbe9313..a76cc925a 100644 --- a/buildroot/package/webkitgtk/webkitgtk.hash +++ b/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.26.4.tar.xz.sums -md5 60f881729f3b71244b7f6e58790073e0 webkitgtk-2.26.4.tar.xz -sha1 72f209c08ecc8ad4f0f6b767d4fa1be7a652df33 webkitgtk-2.26.4.tar.xz -sha256 4386900713dfadf9741177210b32623cab22562a79ffd0d446b66569934b113f webkitgtk-2.26.4.tar.xz +# 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 # 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 cdb655655..2abb083fc 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.26.4 +WEBKITGTK_VERSION = 2.28.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES diff --git a/buildroot/package/wget/wget.mk b/buildroot/package/wget/wget.mk index 7b9c3e75d..ed3f1fdff 100644 --- a/buildroot/package/wget/wget.mk +++ b/buildroot/package/wget/wget.mk @@ -21,6 +21,10 @@ else WGET_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +WGET_DEPENDENCIES += libiconv +endif + ifeq ($(BR2_PACKAGE_LIBIDN2),y) WGET_CONF_OPTS += --with-libidn WGET_DEPENDENCIES += libidn2 diff --git a/buildroot/package/wireguard-linux-compat/Config.in b/buildroot/package/wireguard-linux-compat/Config.in index 4ee214be6..5a323a35e 100644 --- a/buildroot/package/wireguard-linux-compat/Config.in +++ b/buildroot/package/wireguard-linux-compat/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT depends on BR2_LINUX_KERNEL # kernel module requires 3.10+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + # kernel module in upstream linux since 5.6 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 help WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be @@ -20,4 +22,5 @@ config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT https://www.wireguard.com comment "wireguard-linux-compat needs a toolchain w/ headers >= 3.10" - depends on BR2_LINUX_KERNEL && !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 diff --git a/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash b/buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash index a9675b518..d308f47a1 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/005237.html -sha256 7dfb4a8315e1d6ae406ff32d01c496175df558dd65968a19e5222d02c7cfb77a wireguard-linux-compat-1.0.20200401.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2020-April/005296.html +sha256 cf166348fbb67419528e73049ce001d29131aea367fa6aef9d3e223f7251e116 wireguard-linux-compat-1.0.20200413.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 d5a2341d7..27f5981ae 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.20200401 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200413 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 8b8261840..d4d0c9e48 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.2.txt -sha1 9cc54a56e9c2ed77e1bc436d9ae2f7bba68d26f8 wireshark-3.2.2.tar.xz -sha256 5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79 wireshark-3.2.2.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.3.txt +sha1 4656856a40b294f183900ba47651b0fc8e3950fd wireshark-3.2.3.tar.xz +sha256 f007e4b88c86d95e33af03e057ecc03635f54466d02371bc26489eabb274faba wireshark-3.2.3.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index ead6b164e..c262891dc 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.2.2 +WIRESHARK_VERSION = 3.2.3 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 fbeed390e..1380934af 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.4.1.tar.xz.sums -md5 c6362491a4a38ddac42b66f140e1cff2 wpebackend-fdo-1.4.1.tar.xz -sha1 9217c8a5511bc53544b42cb23390256580ac4b0c wpebackend-fdo-1.4.1.tar.xz -sha256 6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d wpebackend-fdo-1.4.1.tar.xz +# 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 # Hashes for license files: -sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING +sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk b/buildroot/package/wpebackend-fdo/wpebackend-fdo.mk index 4a7c569d9..99e10c5a0 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.4.1 +WPEBACKEND_FDO_VERSION = 1.6.0 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/0001-Fix-build-with-musl.patch b/buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch index a436adf6c..705c67c7f 100644 --- a/buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch +++ b/buildroot/package/wpewebkit/0001-Fix-build-with-musl.patch @@ -9,7 +9,7 @@ https://github.com/WebPlatformForEmbedded/meta-wpe/blob/master/recipes-wpe/wpewe Signed-off-by: Fabrice Fontaine --- Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++----- - Source/WTF/wtf/Platform.h | 2 +- + Source/WTF/wtf/PlatformHave.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h @@ -63,8 +63,8 @@ index bf0bdc7a51a..78d2ec81838 100644 #if CPU(X86) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index e2a3388993f..95fe7c593cf 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/PlatformHave.h ++++ b/Source/WTF/wtf/PlatformHave.h @@ -683,7 +683,7 @@ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 #endif diff --git a/buildroot/package/wpewebkit/wpewebkit.hash b/buildroot/package/wpewebkit/wpewebkit.hash index fd7826491..8c660d300 100644 --- a/buildroot/package/wpewebkit/wpewebkit.hash +++ b/buildroot/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.26.4.tar.xz.sums -md5 4cd2883ec9da38a0ffe413bb75239874 wpewebkit-2.26.4.tar.xz -sha1 337f78ee237fe98c7e6e728d8fc0508069b007be wpewebkit-2.26.4.tar.xz -sha256 0c292182864b63b725491f1a69b55c03e0e75f6db0875389caff31fe9c0d3ae9 wpewebkit-2.26.4.tar.xz +# 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 # 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 6591c7a0d..a6124d352 100644 --- a/buildroot/package/wpewebkit/wpewebkit.mk +++ b/buildroot/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.26.4 +WPEWEBKIT_VERSION = 2.28.2 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES diff --git a/buildroot/package/zic/zic.hash b/buildroot/package/zic/zic.hash index cb6300e85..677bb0f05 100644 --- a/buildroot/package/zic/zic.hash +++ b/buildroot/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2019-September/000057.html -sha512 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b tzcode2019c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2020-April/000058.html +sha512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2 tzcode2020a.tar.gz # Locally computed: -sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE +sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/buildroot/package/zic/zic.mk b/buildroot/package/zic/zic.mk index baa647915..98f3bca58 100644 --- a/buildroot/package/zic/zic.mk +++ b/buildroot/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2019c +ZIC_VERSION = 2020a ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 diff --git a/buildroot/support/gnuconfig/README.buildroot b/buildroot/support/gnuconfig/README.buildroot index 7ba2a332a..7e7d49830 100644 --- a/buildroot/support/gnuconfig/README.buildroot +++ b/buildroot/support/gnuconfig/README.buildroot @@ -24,4 +24,4 @@ Currently no patches are needed, but they may be needed again in the future. The current Buildroot version is based on the Git commit -dafd8e767ec87b90aac62f0fcedd11944c84b50a of the config.git repository. +104ee6463c4bfaac3f3029d9be9bdd6e93879323 of the config.git repository. diff --git a/buildroot/support/testing/tests/package/test_python_django.py b/buildroot/support/testing/tests/package/test_python_django.py index 6b31833a0..0b7d35bb6 100644 --- a/buildroot/support/testing/tests/package/test_python_django.py +++ b/buildroot/support/testing/tests/package/test_python_django.py @@ -6,18 +6,20 @@ class TestPythonDjango(TestPythonPackageBase): sample_scripts = ["tests/package/sample_python_django.py"] def run_sample_scripts(self): + timeout = 35 * self.emulator.timeout_multiplier + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" - self.assertRunOk(cmd, timeout=30) + self.assertRunOk(cmd, timeout=timeout) cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py migrate" - output, exit_code = self.emulator.run(cmd, timeout=30) + output, exit_code = self.emulator.run(cmd, timeout=timeout) self.assertIn("Operations to perform:", output[0]) self.assertEqual(exit_code, 0) cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " # give some time to setup the server - cmd += "sleep 30" - self.assertRunOk(cmd, timeout=35) + cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) + self.assertRunOk(cmd, timeout=timeout) cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" self.assertRunOk(cmd) diff --git a/buildroot/toolchain/toolchain-buildroot/Config.in b/buildroot/toolchain/toolchain-buildroot/Config.in index a980f766a..8c33b2b4d 100644 --- a/buildroot/toolchain/toolchain-buildroot/Config.in +++ b/buildroot/toolchain/toolchain-buildroot/Config.in @@ -86,6 +86,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL BR2_mips64el || BR2_or1k || BR2_powerpc || BR2_powerpc64 || \ BR2_powerpc64le || BR2_RISCV_64 || BR2_sh || BR2_x86_64 depends on !BR2_powerpc_SPE # not supported, build breaks + depends on !(BR2_powerpc64 || BR2_powerpc64le) || BR2_POWERPC_CPU_HAS_ALTIVEC # sh2 nommu is supported by musl, but we don't have support # for it in Buildroot. depends on BR2_USE_MMU