From 4fa3329d59c5a0ecf5de8dd63aee105764691d7e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 28 Dec 2020 23:48:23 +0100 Subject: [PATCH] Update buildroot to 2020.11.1 (#1135) Signed-off-by: Stefan Agner --- buildroot/CHANGES | 29 ++++ buildroot/DEVELOPERS | 6 - buildroot/Makefile | 4 +- buildroot/board/beaglebone/readme.txt | 12 +- .../rootfs_overlay/etc/qt5/eglfs_kms_cfg.json | 15 ++ .../board/boundarydevices/common/readme.txt | 6 + .../arm-trusted-firmware.mk | 8 ++ buildroot/configs/beaglebone_qt5_defconfig | 5 +- buildroot/configs/chromebook_elm_defconfig | 3 + buildroot/configs/nitrogen6x_defconfig | 1 - buildroot/docs/manual/manual.html | 6 +- buildroot/docs/manual/manual.pdf | Bin 579400 -> 579407 bytes buildroot/docs/manual/manual.text | 6 +- buildroot/linux/Config.in | 2 +- buildroot/linux/linux.hash | 12 +- ...eLists.txt-respect-BUILD_TESTING-OFF.patch | 104 ++++++++++++++ .../ca-certificates/ca-certificates.hash | 6 +- .../ca-certificates/ca-certificates.mk | 4 +- buildroot/package/cryptopp/cryptopp.hash | 6 +- buildroot/package/cryptopp/cryptopp.mk | 2 +- buildroot/package/dhcpcd/dhcpcd.mk | 25 +++- .../dtv-scan-tables/dtv-scan-tables.mk | 2 +- buildroot/package/flare-engine/Config.in | 1 + .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 1 + .../package/ghostscript/ghostscript.hash | 4 +- buildroot/package/ghostscript/ghostscript.mk | 2 +- buildroot/package/go/go.hash | 2 +- buildroot/package/go/go.mk | 10 +- buildroot/package/haproxy/haproxy.hash | 4 +- buildroot/package/haproxy/haproxy.mk | 2 +- .../package/imagemagick/imagemagick.hash | 4 +- buildroot/package/imagemagick/imagemagick.mk | 2 +- buildroot/package/jasper/jasper.hash | 2 +- buildroot/package/jasper/jasper.mk | 2 +- ...don-t-override-LDFLAGS-with-CPPFLAGS.patch | 44 ++++++ buildroot/package/kismet/kismet.mk | 2 + ...ix-build-with-disabled-proxy-support.patch | 46 ------ buildroot/package/libcurl/libcurl.hash | 4 +- buildroot/package/libcurl/libcurl.mk | 2 +- ...01-fix-compile-time-atomic-detection.patch | 2 +- buildroot/package/libhtp/libhtp.hash | 2 +- buildroot/package/libhtp/libhtp.mk | 2 +- ...building-manpages-if-we-re-not-going.patch | 4 +- ...Fv2-ABI-on-some-ppc64-big-endian-sys.patch | 4 +- buildroot/package/libopenssl/libopenssl.hash | 4 +- buildroot/package/libopenssl/libopenssl.mk | 2 +- buildroot/package/libressl/libressl.hash | 2 +- buildroot/package/libressl/libressl.mk | 2 +- buildroot/package/libuv/libuv.hash | 2 +- buildroot/package/libuv/libuv.mk | 2 +- .../package/linux-headers/Config.in.host | 12 +- buildroot/package/lua/5.4.1/lua.hash | 6 - .../lua/{5.4.1 => 5.4.2}/0001-root-path.patch | 2 +- .../0002-shared-libs-for-lua.patch | 0 .../lua/{5.4.1 => 5.4.2}/0011-linenoise.patch | 0 buildroot/package/lua/5.4.2/lua.hash | 6 + buildroot/package/lua/lua.mk | 4 +- buildroot/package/mbedtls/mbedtls.hash | 4 +- buildroot/package/mbedtls/mbedtls.mk | 2 +- buildroot/package/mongodb/mongodb.hash | 2 +- buildroot/package/mongodb/mongodb.mk | 2 +- ...n-is-closed-after-a-connection-error.patch | 48 +++++++ buildroot/package/mutt/mutt.mk | 12 +- buildroot/package/ncurses/ncurses.mk | 3 + ...x-Fix-a-memory-leak-in-an-error-path.patch | 37 +++++ buildroot/package/nodejs/nodejs.hash | 4 +- buildroot/package/nodejs/nodejs.mk | 2 +- buildroot/package/opencv3/opencv3.mk | 3 + .../openldap/0001-fix_cross_strip.patch | 2 +- .../package/openldap/0002-fix-bignum.patch | 4 +- buildroot/package/openldap/openldap.hash | 10 +- buildroot/package/openldap/openldap.mk | 2 +- buildroot/package/opkg-utils/opkg-utils.mk | 2 + .../package/paho-mqtt-c/paho-mqtt-c.hash | 2 +- buildroot/package/paho-mqtt-c/paho-mqtt-c.mk | 2 +- buildroot/package/pkg-cmake.mk | 14 +- buildroot/package/pkg-golang.mk | 4 +- buildroot/package/pkg-meson.mk | 2 + buildroot/package/python-crc16/Config.in | 1 - .../package/python-lxml/python-lxml.hash | 2 +- buildroot/package/python-lxml/python-lxml.mk | 4 +- buildroot/package/python-pyparsing/Config.in | 2 +- .../package/python-pyqt5/python-pyqt5.mk | 2 +- ...r-obscure-EGLNativeDisplayType-types.patch | 63 +++++++++ ...c-mount.c-fix-build-with-kernel-4.14.patch | 43 ++++++ buildroot/package/rauc/rauc.hash | 4 +- buildroot/package/rauc/rauc.mk | 2 +- ...-pkg-config-to-find-netfilter_conntr.patch | 62 +++++++++ .../shadowsocks-libev/shadowsocks-libev.mk | 2 + buildroot/package/sqlcipher/sqlcipher.hash | 2 +- buildroot/package/sqlcipher/sqlcipher.mk | 2 +- buildroot/package/suricata/suricata.hash | 2 +- buildroot/package/suricata/suricata.mk | 2 +- .../package/ti-sgx-demos/ti-sgx-demos.mk | 4 +- buildroot/package/ti-sgx-km/ti-sgx-km.mk | 2 +- buildroot/package/ti-sgx-um/ti-sgx-um.mk | 2 +- ...able-build-for-different-c-libraries.patch | 39 ++++++ ...0001-add-nios2-tls-macros-from-glibc.patch | 84 +++++++++++ .../uclibc-ng-test/uclibc-ng-test.hash | 3 + buildroot/package/unbound/unbound.hash | 6 +- buildroot/package/unbound/unbound.mk | 2 +- buildroot/package/uvw/uvw.hash | 2 +- buildroot/package/uvw/uvw.mk | 2 +- buildroot/package/webkitgtk/webkitgtk.hash | 8 +- buildroot/package/webkitgtk/webkitgtk.mk | 2 +- buildroot/package/wireshark/wireshark.hash | 6 +- buildroot/package/wireshark/wireshark.mk | 2 +- buildroot/package/wpewebkit/wpewebkit.hash | 8 +- buildroot/package/wpewebkit/wpewebkit.mk | 2 +- ...Info-and-SetDeviceIndicators-heap-ov.patch | 100 ------------- ...heck-SetMap-request-length-carefully.patch | 131 ------------------ .../xserver_xorg-server.hash | 6 +- .../xserver_xorg-server.mk | 2 +- ...ared-memory-segments-to-current-user.patch | 25 ++++ buildroot/package/x11vnc/x11vnc.mk | 2 + buildroot/package/xen/xen.hash | 26 +--- buildroot/package/xen/xen.mk | 39 +----- buildroot/support/misc/Vagrantfile | 2 +- 118 files changed, 822 insertions(+), 499 deletions(-) create mode 100644 buildroot/board/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json create mode 100644 buildroot/package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch create mode 100644 buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch delete mode 100644 buildroot/package/libcurl/0001-libssh2-fix-build-with-disabled-proxy-support.patch delete mode 100644 buildroot/package/lua/5.4.1/lua.hash rename buildroot/package/lua/{5.4.1 => 5.4.2}/0001-root-path.patch (95%) rename buildroot/package/lua/{5.4.1 => 5.4.2}/0002-shared-libs-for-lua.patch (100%) rename buildroot/package/lua/{5.4.1 => 5.4.2}/0011-linenoise.patch (100%) create mode 100644 buildroot/package/lua/5.4.2/lua.hash create mode 100644 buildroot/package/mutt/0001-Ensure-IMAP-connection-is-closed-after-a-connection-error.patch create mode 100644 buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch create mode 100644 buildroot/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch create mode 100644 buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch create mode 100644 buildroot/package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch create mode 100644 buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch create mode 100644 buildroot/package/uclibc-ng-test/0001-add-nios2-tls-macros-from-glibc.patch create mode 100644 buildroot/package/uclibc-ng-test/uclibc-ng-test.hash delete mode 100644 buildroot/package/x11r7/xserver_xorg-server/0007-Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch delete mode 100644 buildroot/package/x11r7/xserver_xorg-server/0008-Check-SetMap-request-length-carefully.patch create mode 100644 buildroot/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 3894193d3..a33ad56a7 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,32 @@ +2020.11.1, released December 27th, 2020 + + Important / security related fixes. + + Infrastructure: + - cmake: fix host ccache handling for CMake 3.19 + - meson: Forcibly disable binary stripping for + target builds, enable for host builds + - golang: Fix HOST / TARGET directories for per-package builds + + Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues + + Updated/fixed packages: apitrace, arm-trusted-firmware, + ca-certificates, cryptopp, dhcpcd, dtv-scan-tables, + flare-engine, ghostscript, go, haproxy, imagemagick, + imx-gpu-viv, jasper, kismet, libcurl, libglib2, libhtp, + libopenssl, libressl, libuv, libuvw, lua, mbedtls, mongodb, + mutt, ncurses, netsnmp, nodejs, opencv3, openldap, opkg-utils, + paho-mqtt-c, python-crc16, python-lxml, python-pyparsing, + python-pyqt5, qt5base, rauc, shadowsocks-libev, sqlcipher, + suricata, ti-sgx-demos, tinycbor, uclibc-ng-test, unbound, + webkitgtk, wpewebkit, wireshark, x11vnc, xen, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13316: beaglebone_qt5_defconfig: PowerVR fails to start + #13416: dhcpcd start warning message: no such user dhcpcd + 2020.11, released December 2nd, 2020 Various fixes. diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 9ab1e125f..ca256e00d 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -1960,9 +1960,6 @@ F: package/openjpeg/ N: Olivier Singla F: package/shellinabox/ -N: Owen Walpole -F: package/parprouted/ - N: Parnell Springmeyer F: package/scrypt/ @@ -2496,9 +2493,6 @@ N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ -N: Thomas Davis -F: package/civetweb/ - N: Thomas De Schampheleire F: docs/manual/ F: package/cereal/ diff --git a/buildroot/Makefile b/buildroot/Makefile index 34237a212..06f1ef6ae 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2020.11 +export BR2_VERSION := 2020.11.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1606948000 +BR2_VERSION_EPOCH = 1609079000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/board/beaglebone/readme.txt b/buildroot/board/beaglebone/readme.txt index e6647dad2..231e977a8 100644 --- a/buildroot/board/beaglebone/readme.txt +++ b/buildroot/board/beaglebone/readme.txt @@ -7,7 +7,7 @@ Description This configuration will build a complete image for the beaglebone and the TI AM335x-EVM, the board type is identified by the on-board EEPROM. The configuration is based on the -ti-processor-sdk-02.00.00.00. Device tree blobs for beaglebone +ti-processor-sdk-06.01.00.08. Device tree blobs for beaglebone variants and the evm-sk are built too. For Qt5 support support use the beaglebone_qt5_defconfig. @@ -43,10 +43,20 @@ output/images/ To copy the image file to the sdcard use dd: $ dd if=output/images/sdcard.img of=/dev/XXX + +Running Qt5 hellowindow opengl demo: +=================== +# export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json +# export QT_QPA_PLATFORM=eglfs +# export QT_QPA_EGLFS_INTEGRATION=none +# /usr/lib/qt/examples/opengl/hellowindow/hellowindow + + Tested hardware =============== am335x-evm (rev. 1.1A) beagleboneblack (rev. A5A) beaglebone (rev. A6) +2020, Adam Duskett 2016, Lothar Felten diff --git a/buildroot/board/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json b/buildroot/board/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json new file mode 100644 index 000000000..76f5e7d37 --- /dev/null +++ b/buildroot/board/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json @@ -0,0 +1,15 @@ +{ + "device": "/dev/dri/card0", + "hwcursor": false, + "pbuffers": true, + "outputs": [ + { + "name": "VGA1", + "mode": "off" + }, + { + "name": "HDMI1", + "mode": "1024x768" + } + ] +} diff --git a/buildroot/board/boundarydevices/common/readme.txt b/buildroot/board/boundarydevices/common/readme.txt index d1bb3fa59..307cfb554 100644 --- a/buildroot/board/boundarydevices/common/readme.txt +++ b/buildroot/board/boundarydevices/common/readme.txt @@ -40,3 +40,9 @@ Where 'sdX' is the device node of the uSD partition. To upgrade u-boot, cancel autoboot and type: > run upgradeu + +See Boundary Devices's buildroot-external-boundary project +for additional and advanced defconfigs using Qt5, gstreamer, +NXP proprietary packages with demo applications: + +https://github.com/boundarydevices/buildroot-external-boundary diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk index a3553e36c..0597cecf7 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -100,6 +100,14 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += MV_DDR_PATH=$(MV_DDR_MARVELL_DIR) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += mv-ddr-marvell endif +ifeq ($(BR2_SSP_REGULAR),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=default +else ifeq ($(BR2_SSP_STRONG),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=strong +else ifeq ($(BR2_SSP_ALL),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=all +endif + ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) diff --git a/buildroot/configs/beaglebone_qt5_defconfig b/buildroot/configs/beaglebone_qt5_defconfig index 5f7b911e5..6e0371a7d 100644 --- a/buildroot/configs/beaglebone_qt5_defconfig +++ b/buildroot/configs/beaglebone_qt5_defconfig @@ -20,11 +20,8 @@ BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_EGLFS=y -BR2_PACKAGE_QT5BASE_DEFAULT_QPA="wayland" +BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5QUICKCONTROLS=y -BR2_PACKAGE_QT5WAYLAND=y -BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y -BR2_PACKAGE_WESTON=y BR2_PACKAGE_TI_SGX_DEMOS=y BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y diff --git a/buildroot/configs/chromebook_elm_defconfig b/buildroot/configs/chromebook_elm_defconfig index 05e82ffc3..4f82370fb 100644 --- a/buildroot/configs/chromebook_elm_defconfig +++ b/buildroot/configs/chromebook_elm_defconfig @@ -9,6 +9,9 @@ BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches/" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +# Linux headers same as kernel (5.9 series) +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y + # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y diff --git a/buildroot/configs/nitrogen6x_defconfig b/buildroot/configs/nitrogen6x_defconfig index 5353b38fd..13c14e6d2 100644 --- a/buildroot/configs/nitrogen6x_defconfig +++ b/buildroot/configs/nitrogen6x_defconfig @@ -11,7 +11,6 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y # filesystem BR2_TARGET_ROOTFS_EXT2=y diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index d01120cc3..9cba6a44a 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. Details about packages
8.9. Graphing the dependencies between packages
8.10. Graphing the build duration
8.11. Graphing the filesystem size contribution of packages
8.12. Top-level parallel build
8.13. Integration with Eclipse
8.14. 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. Using SELinux in Buildroot
10.1. Enabling SELinux support
10.2. SELinux policy tweaking
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The documentation
16.4. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. Infrastructure for packages with specific build systems
18.6. Infrastructure for autotools-based packages
18.7. Infrastructure for CMake-based packages
18.8. Infrastructure for Python packages
18.9. Infrastructure for LuaRocks-based packages
18.10. Infrastructure for Perl/CPAN packages
18.11. Infrastructure for virtual packages
18.12. Infrastructure for packages using kconfig for configuration files
18.13. Infrastructure for rebar-based packages
18.14. Infrastructure for Waf-based packages
18.15. Infrastructure for Meson-based packages
18.16. Integration of Cargo-based packages
18.17. Infrastructure for Go packages
18.18. Infrastructure for QMake-based packages
18.19. Infrastructure for packages building kernel modules
18.20. Infrastructure for asciidoc documents
18.21. Infrastructure specific to the Linux kernel package
18.22. Hooks available in the various build steps
18.23. Gettext integration and interaction with packages
18.24. Tips and tricks
18.25. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Integrating patches found on the Web
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the run-tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
27. Migrating from older Buildroot versions
27.1. Migrating to 2016.11
27.2. Migrating to 2017.08

List of Examples

18.1. Config script: divine package
18.2. Config script: imagemagick package:

Buildroot 2020.11 manual generated on 2020-12-02 -22:28:59 UTC from git revision 9624a001f9

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. Details about packages
8.9. Graphing the dependencies between packages
8.10. Graphing the build duration
8.11. Graphing the filesystem size contribution of packages
8.12. Top-level parallel build
8.13. Integration with Eclipse
8.14. 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. Using SELinux in Buildroot
10.1. Enabling SELinux support
10.2. SELinux policy tweaking
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The documentation
16.4. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. Infrastructure for packages with specific build systems
18.6. Infrastructure for autotools-based packages
18.7. Infrastructure for CMake-based packages
18.8. Infrastructure for Python packages
18.9. Infrastructure for LuaRocks-based packages
18.10. Infrastructure for Perl/CPAN packages
18.11. Infrastructure for virtual packages
18.12. Infrastructure for packages using kconfig for configuration files
18.13. Infrastructure for rebar-based packages
18.14. Infrastructure for Waf-based packages
18.15. Infrastructure for Meson-based packages
18.16. Integration of Cargo-based packages
18.17. Infrastructure for Go packages
18.18. Infrastructure for QMake-based packages
18.19. Infrastructure for packages building kernel modules
18.20. Infrastructure for asciidoc documents
18.21. Infrastructure specific to the Linux kernel package
18.22. Hooks available in the various build steps
18.23. Gettext integration and interaction with packages
18.24. Tips and tricks
18.25. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Integrating patches found on the Web
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the run-tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
27. Migrating from older Buildroot versions
27.1. Migrating to 2016.11
27.2. Migrating to 2017.08

List of Examples

18.1. Config script: divine package
18.2. Config script: imagemagick package:

Buildroot 2020.11.1 manual generated on 2020-12-27 +14:25:12 UTC from git revision 804a9e1865

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 diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index 56f54f84fbc7d1e049213bf037f498f2fcbdd5e5..8cce6a6dbe033cc89bece6dce0c93861fd1dc0e3 100644 GIT binary patch delta 11086 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 xTgaXYO^Oxwp1ng zw@rp1R}9B_Uxl&itbb{nhSeX-K_Y(-)_~iSwZ!*I z6U^N;%5M&)OUv=A?p8rY!Xir@$W14Z$b#JKE;G`Fx4EOgR`~LQK4R4!b$tok-?jz5 z*{kZj&RaO){%^^)Y4of+PtVOoQm46Vx6SdQVoeJC#!F~{qgC246lqT=Cw43A01kCcQM3dn+HX02oL5Y1c-h%ILejm_mhzvSqO^TNdY(`8m%vVa6%TV99 zNN_8+U}@^~PdxfZZ}Z*Go3AqmNR^p9nN6^Gif$(9@bs5s`y|0^LYr-~&v>EtPo?)h z{dQz3eeweZAp+VeRF3Q}o#*O?I~7_l%G8v0zGxv#N#keyGgXweL>+T7c{+=69_@S| z*wp4MHmjsI<8~6!QKZbDWi4WR5dT3z*>@*xV3Qc_eg13tbxgO@1y45)V#8drbn zGGcf9)pR0iB-1nogxn~IcH|XmHk^zXej3k#d1dZZwtqPpEhPGxN3~Qr(EV<6VqxZO zvvI>o#(*D-&wj0zL}^D^aD~KN-{C}tjd$ads-TxEl~7|N_vZ3_1uiWA%%MsZtNwMN zQdI6A=g*wz(q@D5L{L&h833n(^44{hQqFyJhvg4Hg};11mva*N@~!q$B?Y>lmAupa zFV+4QPH4^*{yI*i&Q<;fPPopMM&mP>vn~rGGboZS3qNNt>RlE_XV93N-Jd!!#9X!F zm!dHq;!ai)gmv?ojy*(WZsso&!9}X|ev2d3lgt6c=WWKsKVyQt4`^e$8O8&! zh|l*A=$Q|J%SstJrJRO!{zH?S58Yxchk=z!P1MOn^_+(TF;}iU$!;oe+x$C5`;NgV zzGHmun1Zi&jQ$;?Tye+P-7#ymcZ|v%lTXeN+g&yphfs#EIvuPMpHr8LkH!RDsbm5A zN+F5*$MQ-t1RMc8%+2Z=lt>>uj)R0*4!J73omAkf&oW$9;06w{%0kQx2xdj3S0B?_ zL|6_-Vn?SFy7?wa*6fsI0!-nV#OJog%!>)#(e$@YcU9bugAjTv*|-}M;lb_qB!}1_ zBoZg_IkMRZKyv$FW)@fL@^(Ih{kNua63_({N%ZaaKkq$S7@0n z5{5cFdk-B1XJuG5>d1I3E z0^~IN@Vc81`5M@1-Wr;IgsNZ{4YbHljq zvTIqxMGr{>SRm$RG+il4F{;groCXi+G-;BY}&yIT3R3U0O%l@}-` zQElUYhn9BW%Z;zFEjf7L4*#gZPdA!F`N$3IqRLR5%FXHTMAYOzyyqeG60{=o3)Idt z&fPvg<`F|%BoPx>_>`zx!=7>XtrVJBLMAxgAl?J;#$NfkiPLU2BGryR@-imyLncwR z{6lAf-OxB9G1*hb-9QRPSAY7@_|_E`cWJ{QR9=kup%y*M1B{w`+)b#~zyUthN&KEv zON>PjA?D=@7XRRHMb5<^@7~rinGc1Jm<@%6nK58k*O}jItJU_+-n~HQH?yyEz4}?y zGF++?@x;UeA38D)3WiEgfQauZfW1jODEsWT-0u;z zGTmNyarCzeh!e0|5@@$_isS#^4%dOX@L6}PICsijSg>KJvfn+zW#rD3eV+`ug!!TH zEt5AyiS1J?!0h+wWugh?f?jYmeOTeB)P|(RR69eA3Din~kJsC>l_1E)?9I6PBS%(n zB?-hBTdnlfM|}ldE~eredd5n+TT7nkk7JY3#?JO1e(W z#mY#y=r>3=^$@wBTZe#zH~;9hM@bI!Rdq{PiYJo)gm lzSuI;JsY_m-W$pqyaGDluM(kblOQIL5DqJ=vW^PQ{{owde4YRR diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index b77db9051..84a913e43 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -174,13 +174,13 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2020.11 manual generated on 2020-12-02 22:29:04 UTC from -git revision 9624a001f9 +Buildroot 2020.11.1 manual generated on 2020-12-27 14:25:17 UTC from +git revision 804a9e1865 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= -9624a001f9d4314f8bcc9219df717d4c41fb5373] file in the Buildroot +804a9e18656c1584b059129e0b5cebe2a2405fac] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index 8b753e6c1..64f7c94a5 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.9.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.9.14" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index 00bbf3d1c..3a257750b 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 5eb20a65a410669928f94b3975872e493fa6d0fe441c6a78b7564affa2a5d260 linux-5.9.11.tar.xz +sha256 39fcfb41dcdf71b6b42b88eff3d8cedbe7523830ccae847f3914c0b97e1e6b49 linux-5.9.14.tar.xz sha256 4ab4a3f694b7b4cfbe78871eab34c8039ad33692144c45c669827a594da85534 linux-5.8.18.tar.xz -sha256 49da425c1f3c530fd3ff31d85a0461f6b6dc6e459f7faf3eee23e49a98ce64c7 linux-5.4.80.tar.xz +sha256 beec970bbb93de8ab839f27930f7ab00c7bd65af0ffa07a50e765affdc2561c6 linux-5.4.83.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 9e0bdebf18a12d0c899e5e4042e715e24a70ab0fd986a3f4c67c8ec2710bad97 linux-4.4.246.tar.xz -sha256 49e266c7d72d388e8ce6aa486a1018cc0595ae1b9e99934bce5b484fd8dba9f5 linux-4.9.246.tar.xz -sha256 cb02465cc8f1972cc14707b25d779c8668d220c39e68a24bb23afd4c58182b9c linux-4.14.209.tar.xz -sha256 18345206f9c61e8adafa5204d0ca0b8619f1d9aafd70cbd5cb0fbf1faf521585 linux-4.19.160.tar.xz +sha256 e52a49ceb639d871478a143c314648c35e22222c317ecdf49866830fea5c3dfc linux-4.4.248.tar.xz +sha256 4687268061c9933c298b30d28e4bf1a30dfbab7c0da4bee194968e4f81ffeccf linux-4.9.248.tar.xz +sha256 0e1bc32c4842c3bbee3a15454408f528acd4d3c5e83312b93008d5ee2e9a0c79 linux-4.14.212.tar.xz +sha256 3eeec4e5eb8a129be3536357ecb028fae7d82fac933dcfac0b6089ee398fc5fc linux-4.19.163.tar.xz # Locally computed sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz sha256 bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c linux-cip-4.19.152-cip37-rt16.tar.gz diff --git a/buildroot/package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch b/buildroot/package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch new file mode 100644 index 000000000..8cc1f8bb0 --- /dev/null +++ b/buildroot/package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch @@ -0,0 +1,104 @@ +From 7f0f1e7e34f997eef697856804dd478b54bb365e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Dec 2020 10:45:21 +0100 +Subject: [PATCH] CMakeLists.txt: respect BUILD_TESTING=OFF + +Allow the user to disable unit tests through BUILD_TESTING=OFF: +https://cmake.org/cmake/help/latest/command/enable_testing.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/apitrace/apitrace/pull/698] +--- + CMakeLists.txt | 6 +++++- + gui/CMakeLists.txt | 6 ++++-- + lib/guids/CMakeLists.txt | 6 ++++-- + lib/os/CMakeLists.txt | 6 ++++-- + lib/trace/CMakeLists.txt | 6 ++++-- + 5 files changed, 21 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a07f069..ee401887 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,8 @@ option (ENABLE_FRAME_POINTER "Disable frame pointer omission" ON) + + option (ENABLE_ASAN "Enable Address Sanitizer" OFF) + ++option (BUILD_TESTING "Enable unit tests" ON) ++ + option (ENABLE_TESTS "Enable additional tests" OFF) + + if (ANDROID) +@@ -433,7 +435,9 @@ endmacro () + # which subdirectory they are declared + set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + +-enable_testing () ++if (BUILD_TESTING) ++ enable_testing () ++endif () + if (CMAKE_CROSSCOMPILING) + add_custom_target (check) + elseif (DEFINED CMAKE_BUILD_TYPE) +diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt +index 5baf3552..ad6ee501 100644 +--- a/gui/CMakeLists.txt ++++ b/gui/CMakeLists.txt +@@ -13,8 +13,10 @@ add_library (qubjson STATIC + qubjson.cpp + ) + +-add_gtest (qubjson_test qubjson_test.cpp) +-target_link_libraries (qubjson_test qubjson) ++if (BUILD_TESTING) ++ add_gtest (qubjson_test qubjson_test.cpp) ++ target_link_libraries (qubjson_test qubjson) ++endif () + + set(qapitrace_SRCS + apisurface.cpp +diff --git a/lib/guids/CMakeLists.txt b/lib/guids/CMakeLists.txt +index ce0f86da..ea28a18f 100644 +--- a/lib/guids/CMakeLists.txt ++++ b/lib/guids/CMakeLists.txt +@@ -5,5 +5,7 @@ add_library (guids STATIC + guids.hpp + ) + +-add_gtest (guids_test guids_test.cpp) +-target_link_libraries (guids_test guids) ++if (BUILD_TESTING) ++ add_gtest (guids_test guids_test.cpp) ++ target_link_libraries (guids_test guids) ++endif () +diff --git a/lib/os/CMakeLists.txt b/lib/os/CMakeLists.txt +index 222411e0..b7134b57 100644 +--- a/lib/os/CMakeLists.txt ++++ b/lib/os/CMakeLists.txt +@@ -36,5 +36,7 @@ if (APPLE) + ) + endif () + +-add_gtest (os_thread_test os_thread_test.cpp) +-target_link_libraries (os_thread_test os) ++if (BUILD_TESTING) ++ add_gtest (os_thread_test os_thread_test.cpp) ++ target_link_libraries (os_thread_test os) ++endif () +diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt +index c68bd00f..d95df978 100644 +--- a/lib/trace/CMakeLists.txt ++++ b/lib/trace/CMakeLists.txt +@@ -34,5 +34,7 @@ target_link_libraries (common + brotli_dec brotli_common + ) + +-add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp) +-target_link_libraries (trace_parser_flags_test common) ++if (BUILD_TESTING) ++ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp) ++ target_link_libraries (trace_parser_flags_test common) ++endif () +-- +2.29.2 + diff --git a/buildroot/package/ca-certificates/ca-certificates.hash b/buildroot/package/ca-certificates/ca-certificates.hash index 71a8da478..1ed1c3ca0 100644 --- a/buildroot/package/ca-certificates/ca-certificates.hash +++ b/buildroot/package/ca-certificates/ca-certificates.hash @@ -1,6 +1,6 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 47d4584eae85fc905e4994766eb3930a8a84e2e1 ca-certificates_20190110.tar.xz -sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz +sha1 f17235bc9c3aec538065a655681815c242a6d7d5 ca-certificates_20200601.tar.xz +sha256 43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63 ca-certificates_20200601.tar.xz # Locally computed -sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright +sha256 e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c debian/copyright diff --git a/buildroot/package/ca-certificates/ca-certificates.mk b/buildroot/package/ca-certificates/ca-certificates.mk index 79c81a41e..5c24d4be4 100644 --- a/buildroot/package/ca-certificates/ca-certificates.mk +++ b/buildroot/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20190110 +CA_CERTIFICATES_VERSION = 20200601 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20200602T145955Z/pool/main/c/ca-certificates CA_CERTIFICATES_DEPENDENCIES = host-openssl # ca-certificates can be built with either python 2 or python 3 # but it must be at least python 2.7 diff --git a/buildroot/package/cryptopp/cryptopp.hash b/buildroot/package/cryptopp/cryptopp.hash index c0d442a97..2774dc70e 100644 --- a/buildroot/package/cryptopp/cryptopp.hash +++ b/buildroot/package/cryptopp/cryptopp.hash @@ -1,5 +1,5 @@ -# Hash from: https://www.cryptopp.com/release820.html: -sha256 03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 cryptopp820.zip +# Hash from: https://www.cryptopp.com/release830.html: +sha512 ad5219a66c5924d330d3646d0ff996dd235006f6812074bc4eb9e8c662a4f000ba20449d377f24b133d19ce682f7b2a3b2eb4c08857ce0f5bb39743d1d425147 cryptopp830.zip # Hash for license file: -sha256 f29d65ae3f0c8e327284f193524643ffb4d682fcca3e1740a5c6cbab0e720583 License.txt +sha256 e668af8c73a38a66a1e8951d14ec24e7582fee5254dd6c3dae488a416d105d5f License.txt diff --git a/buildroot/package/cryptopp/cryptopp.mk b/buildroot/package/cryptopp/cryptopp.mk index f1d19386a..c1b8aaa44 100644 --- a/buildroot/package/cryptopp/cryptopp.mk +++ b/buildroot/package/cryptopp/cryptopp.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTOPP_VERSION = 8.2.0 +CRYPTOPP_VERSION = 8.3.0 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = https://cryptopp.com CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX) diff --git a/buildroot/package/dhcpcd/dhcpcd.mk b/buildroot/package/dhcpcd/dhcpcd.mk index 0dcd36f36..4900e0581 100644 --- a/buildroot/package/dhcpcd/dhcpcd.mk +++ b/buildroot/package/dhcpcd/dhcpcd.mk @@ -11,6 +11,18 @@ DHCPCD_DEPENDENCIES = host-pkgconf DHCPCD_LICENSE = BSD-2-Clause DHCPCD_LICENSE_FILES = LICENSE +DHCPCD_CONFIG_OPTS = \ + --libexecdir=/lib/dhcpcd \ + --os=linux \ + --privsepuser=dhcpcd + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +DHCPCD_CONFIG_OPTS += --with-udev +DHCPCD_DEPENDENCIES += udev +else +DHCPCD_CONFIG_OPTS += --without-udev +endif + ifeq ($(BR2_STATIC_LIBS),y) DHCPCD_CONFIG_OPTS += --enable-static endif @@ -20,16 +32,11 @@ DHCPCD_CONFIG_OPTS += --disable-fork --disable-privsep endif define DHCPCD_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) ./configure \ - --os=linux \ - --libexecdir=/lib/dhcpcd \ - $(DHCPCD_CONFIG_OPTS) ) + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(DHCPCD_CONFIG_OPTS)) endef define DHCPCD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all endef define DHCPCD_INSTALL_TARGET_CMDS @@ -51,6 +58,10 @@ define DHCPCD_INSTALL_INIT_SYSTEMD endef endif +define DHCPCD_USERS + dhcpcd -1 dhcpcd -1 * - - - dhcpcd user +endef + # NOTE: Even though this package has a configure script, it is not generated # using the autotools, so we have to use the generic package infrastructure. diff --git a/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk b/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk index 5933f1677..5fad615b6 100644 --- a/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk @@ -5,7 +5,7 @@ ################################################################################ DTV_SCAN_TABLES_VERSION = 6d019038cd04e837d9dd58701202c15924c1c654 -DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git +DTV_SCAN_TABLES_SITE = https://git.linuxtv.org/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git # This package only contains the transponders data. This is not a 'work' diff --git a/buildroot/package/flare-engine/Config.in b/buildroot/package/flare-engine/Config.in index cdcb01894..d08b740af 100644 --- a/buildroot/package/flare-engine/Config.in +++ b/buildroot/package/flare-engine/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLARE_ENGINE bool "flare-engine" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # SDL2 + select BR2_PACKAGE_LIBPNG # SDL2_IMAGE needs libpng support select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_MIXER diff --git a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index fca8a4d44..06c74869c 100644 --- a/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -108,6 +108,7 @@ define IMX_GPU_VIV_INSTALL_TARGET_CMDS $(IMX_GPU_VIV_INSTALL_EXAMPLES) $(IMX_GPU_VIV_INSTALL_GMEM_INFO) cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr + $(INSTALL) -D -m 0644 $(@D)/gpu-core/etc/Vivante.icd $(TARGET_DIR)/etc/OpenCL/vendors/Vivante.icd for lib in EGL GAL GLESv2 VDK; do \ for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ case $$f in \ diff --git a/buildroot/package/ghostscript/ghostscript.hash b/buildroot/package/ghostscript/ghostscript.hash index 143b28014..f6cedc619 100644 --- a/buildroot/package/ghostscript/ghostscript.hash +++ b/buildroot/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9532/SHA512SUMS -sha512 73aa6013aeecbd1345317a40349089a2f19a2205fc11b8ca0b619df1e91f2ca8b03efc09be9e079cb5ab8e1b838aa2236349cd1c177217c14308242f99138ae4 ghostscript-9.53.2.tar.gz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/SHA512SUMS +sha512 c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6 ghostscript-9.53.3.tar.gz # Hash for license file: sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE diff --git a/buildroot/package/ghostscript/ghostscript.mk b/buildroot/package/ghostscript/ghostscript.mk index e8d35a50b..e6842631f 100644 --- a/buildroot/package/ghostscript/ghostscript.mk +++ b/buildroot/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.53.2 +GHOSTSCRIPT_VERSION = 9.53.3 GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index 79d6abe8d..de2cf74cb 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1 go1.15.5.src.tar.gz +sha256 890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817 go1.15.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index d2ab9b81d..e9f8be778 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.15.5 +GO_VERSION = 1.15.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -39,6 +39,10 @@ else ifeq ($(BR2_ARM_CPU_ARMV6),y) GO_GOARM = 6 else ifeq ($(BR2_ARM_CPU_ARMV7A),y) GO_GOARM = 7 +else ifeq ($(BR2_ARM_CPU_ARMV8A),y) +# Go doesn't support 32-bit GOARM=8 (https://github.com/golang/go/issues/29373) +# but can still benefit from armv7 optimisations +GO_GOARM = 7 endif else ifeq ($(BR2_aarch64),y) GO_GOARCH = arm64 @@ -99,8 +103,8 @@ HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ GOARCH="" \ GOCACHE="$(HOST_GO_HOST_CACHE)" \ - CC="$(HOST_CCNOCCACHE)" \ - CXX="$(HOST_CXXNOCCACHE)" \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" \ CGO_CFLAGS="$(HOST_CFLAGS)" \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" diff --git a/buildroot/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash index a127af919..fbbd2e4ba 100644 --- a/buildroot/package/haproxy/haproxy.hash +++ b/buildroot/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.4.tar.gz.sha256 -sha256 87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2 haproxy-2.2.4.tar.gz +# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.6.tar.gz.sha256 +sha256 be1c6754cbaceafc4837e0c6036c7f81027a3992516435cbbbc5dc749bf5a087 haproxy-2.2.6.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk index 70ff997fb..a6e07c9ad 100644 --- a/buildroot/package/haproxy/haproxy.mk +++ b/buildroot/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.2 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).6 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt diff --git a/buildroot/package/imagemagick/imagemagick.hash b/buildroot/package/imagemagick/imagemagick.hash index 3380378fd..8a111edb1 100644 --- a/buildroot/package/imagemagick/imagemagick.hash +++ b/buildroot/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9f2b8b131222354b196c640fca4e53eb0bbf62246621b9d467f223366272d7a7 imagemagick-7.0.10-28.tar.gz -sha256 e2d364de83dd9e7c866bd99ee7dac2fe92071fb70e9b187293353fb285cf09ac LICENSE +sha256 fa993169a06052267eaf81cf85bbf5a30c0bf243511017d986f47abbe65ff262 imagemagick-7.0.10-51.tar.gz +sha256 7b43ee798e835f5e0dc03c92c52d288b46a771c4561d57ef2a9a8b2c76bf33cb LICENSE diff --git a/buildroot/package/imagemagick/imagemagick.mk b/buildroot/package/imagemagick/imagemagick.mk index d44b7d1d1..f30d3dfc2 100644 --- a/buildroot/package/imagemagick/imagemagick.mk +++ b/buildroot/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.10-28 +IMAGEMAGICK_VERSION = 7.0.10-51 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/jasper/jasper.hash b/buildroot/package/jasper/jasper.hash index 5edf45e6d..2a0a4fdff 100644 --- a/buildroot/package/jasper/jasper.hash +++ b/buildroot/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 afc4166bff29b8a0dc46ed5e8d6a208d7976fccfd0b1146e3400c8b2948794a2 jasper-2.0.22.tar.gz +sha256 20facc904bd9d38c20e0c090b1be3ae02ae5b2703b803013be2ecad586a18927 jasper-2.0.23.tar.gz sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/buildroot/package/jasper/jasper.mk b/buildroot/package/jasper/jasper.mk index ab7cb933b..338610832 100644 --- a/buildroot/package/jasper/jasper.mk +++ b/buildroot/package/jasper/jasper.mk @@ -4,7 +4,7 @@ # ################################################################################ -JASPER_VERSION = 2.0.22 +JASPER_VERSION = 2.0.23 JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 diff --git a/buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch b/buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch new file mode 100644 index 000000000..e2c28a2eb --- /dev/null +++ b/buildroot/package/kismet/0001-configure.ac-don-t-override-LDFLAGS-with-CPPFLAGS.patch @@ -0,0 +1,44 @@ +From e70968bcbca86dd448d619c40cdeaae8b7dcee98 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 24 Nov 2020 23:01:55 +0100 +Subject: [PATCH] configure.ac: don't override LDFLAGS with CPPFLAGS + +Don't override LDFLAGS with CPPFLAGS to avoid a build failure when +building statically with uclibc due to -static keyword being lost: + +/home/buildroot/autobuild/run/instance-3/output-1/host/bin/xtensa-buildroot-linux-uclibc-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o kismet_cap_linux_wifi ../interface_control.c.o ../wifi_ht_channels.c.o linux_wireless_control.c.o linux_netlink_control.c.o linux_nexmon_control.c.o linux_wireless_rfkill.c.o capture_linux_wifi.c.o ../libkismetdatasource.a -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lpcap -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/home/buildroot/autobuild/run/instance-3/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/.libs -lnl-genl-3 -lnl-3 -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lpthread -lnl-genl-3 -lnl-3 -lpthread -lpthread -L/home/buildroot/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lprotobuf-c -lm +/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/libgcc.a(unwind-dw2-fde-dip.o): in function `_Unwind_Find_registered_FDE': +/home/buildroot/autobuild/run/instance-3/output-1/build/host-gcc-final-9.3.0/build/xtensa-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde.c:1040: undefined reference to `dl_iterate_phdr' +collect2: error: ld returned 1 exit status + +To fix this build failure, just drop OCPPFLAGS and OLDFLAGS which are +not used anymore + +Fixes: + - http://autobuild.buildroot.org/results/b859eb3850c0beb23e18010dc2f07cd0f5c14440 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/kismetwireless/kismet/pull/326 (merged)] +--- + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index aab47fb0..4df37a29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -619,11 +619,6 @@ else + AC_MSG_RESULT([no]) + fi + +-OCPPFLAGS=$CPPFLAGS +-CPPFLAGS="$CPPFLAGS" +-OLDFLAGS=$LDFLAGS +-LDFLAGS="$CPPFLAGS" +- + # Do we need libm for math functions? + AC_MSG_CHECKING([for libm math function in std libs]) + OCFL="$CFLAGS" +-- +2.29.2 + diff --git a/buildroot/package/kismet/kismet.mk b/buildroot/package/kismet/kismet.mk index 54d014021..0a4ae00f0 100644 --- a/buildroot/package/kismet/kismet.mk +++ b/buildroot/package/kismet/kismet.mk @@ -17,6 +17,8 @@ KISMET_DEPENDENCIES = \ zlib KISMET_LICENSE = GPL-2.0+ KISMET_LICENSE_FILES = LICENSE +# We're patching configure.ac +KISMET_AUTORECONF = YES KISMET_CONF_OPTS = --disable-debuglibs KISMET_CXXFLAGS = $(TARGET_CXXFLAGS) diff --git a/buildroot/package/libcurl/0001-libssh2-fix-build-with-disabled-proxy-support.patch b/buildroot/package/libcurl/0001-libssh2-fix-build-with-disabled-proxy-support.patch deleted file mode 100644 index 180f24358..000000000 --- a/buildroot/package/libcurl/0001-libssh2-fix-build-with-disabled-proxy-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 75d2b1787b3253784a94c66016829acf1f442526 Mon Sep 17 00:00:00 2001 -Message-Id: <75d2b1787b3253784a94c66016829acf1f442526.1603688719.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Mon, 26 Oct 2020 06:56:49 +0200 -Subject: [PATCH] libssh2: fix build with disabled proxy support - -Build breaks because the http_proxy field is missing: - -vssh/libssh2.c: In function 'ssh_connect': -vssh/libssh2.c:3119:10: error: 'struct connectdata' has no member named 'http_proxy' - if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) { - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/curl/curl/pull/6125 - - lib/vssh/libssh2.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c -index 6c6db049bf5a..74cd5d887549 100644 ---- a/lib/vssh/libssh2.c -+++ b/lib/vssh/libssh2.c -@@ -3094,6 +3094,7 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done) - return CURLE_FAILED_INIT; - } - -+#ifndef CURL_DISABLE_PROXY - if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) { - /* - * This crazy union dance is here to avoid assigning a void pointer a -@@ -3132,7 +3133,9 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done) - libssh2_session_callback_set(ssh->ssh_session, - LIBSSH2_CALLBACK_SEND, sshsend.sendp); - } -- else if(conn->handler->protocol & CURLPROTO_SCP) { -+ else -+#endif /* CURL_DISABLE_PROXY */ -+ if(conn->handler->protocol & CURLPROTO_SCP) { - conn->recv[FIRSTSOCKET] = scp_recv; - conn->send[FIRSTSOCKET] = scp_send; - } --- -2.28.0 - diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index 332614d82..8e851bb90 100644 --- a/buildroot/package/libcurl/libcurl.hash +++ b/buildroot/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.73.0.tar.xz.asc +# https://curl.haxx.se/download/curl-7.74.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 7c4c7ca4ea88abe00fea4740dcf81075c031b1d0bb23aff2d5efde20a3c2408a curl-7.73.0.tar.xz +sha256 999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b curl-7.74.0.tar.xz sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index 74ce3be65..9484f41ff 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.73.0 +LIBCURL_VERSION = 7.74.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ diff --git a/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch index 9d2381bb3..d84a1ab46 100644 --- a/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch +++ b/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix compile time atomic detection Improved compile-time detection of atomic support in the compiler. -Upstream-Status: Merged +Upstream-Status: 'Needs information' See : https://gitlab.gnome.org/GNOME/glib/issues/1063 Signed-off-by: Brendan Heading diff --git a/buildroot/package/libhtp/libhtp.hash b/buildroot/package/libhtp/libhtp.hash index df75336df..8bc150618 100644 --- a/buildroot/package/libhtp/libhtp.hash +++ b/buildroot/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4c3ac4c6027710455ffe725f24ac6a83b2c13fe0afc83b74df2cca78ba46976a libhtp-0.5.35.tar.gz +sha256 ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b libhtp-0.5.36.tar.gz sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/buildroot/package/libhtp/libhtp.mk b/buildroot/package/libhtp/libhtp.mk index c402cf750..de82caaa5 100644 --- a/buildroot/package/libhtp/libhtp.mk +++ b/buildroot/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.35 +LIBHTP_VERSION = 0.5.36 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch index f20b6f083..6527bc23a 100644 --- a/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +++ b/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch @@ -9,6 +9,8 @@ Signed-off-by: Ryan Barnett [rebased on openssl-1.1.0h] Signed-off-by: Peter Seiderer +[rebased on openssl-1.1.1i] +Signed-off-by: Bernd Kuhls --- Configurations/unix-Makefile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -17,7 +19,7 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tm index 40cf2c3..777d9ca 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl -@@ -268,7 +268,7 @@ list-tests: +@@ -491,7 +491,7 @@ list-tests: @echo "Tests are not supported with your chosen Configure options" @ : {- output_on() if !$disabled{tests}; "" -} diff --git a/buildroot/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/buildroot/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch index 3d6eaf49d..b5070ad74 100644 --- a/buildroot/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ b/buildroot/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -11,6 +11,8 @@ Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/8883) [vfazio: fixup for 1.1.1d] Signed-off-by: Vincent Fazio +[rebased on openssl-1.1.1i] +Signed-off-by: Bernd Kuhls --- Configure | 4 ++++ 1 file changed, 4 insertions(+) @@ -19,7 +21,7 @@ diff --git a/Configure b/Configure index 5a699836f3..f9152b1702 100755 --- a/Configure +++ b/Configure -@@ -1413,6 +1413,10 @@ my %predefined_CXX = $config{CXX} +@@ -1417,6 +1417,10 @@ my %predefined_CXX = $config{CXX} ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) : (); diff --git a/buildroot/package/libopenssl/libopenssl.hash b/buildroot/package/libopenssl/libopenssl.hash index dcfe7d5c0..5e24ca17a 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.1h.tar.gz.sha256 -sha256 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 openssl-1.1.1h.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1i.tar.gz.sha256 +sha256 e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 openssl-1.1.1i.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk index fe5a444cc..ac12d1701 100644 --- a/buildroot/package/libopenssl/libopenssl.mk +++ b/buildroot/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1h +LIBOPENSSL_VERSION = 1.1.1i LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay diff --git a/buildroot/package/libressl/libressl.hash b/buildroot/package/libressl/libressl.hash index 9dfb74ff0..0dd0ffcae 100644 --- a/buildroot/package/libressl/libressl.hash +++ b/buildroot/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 a9d1e1d030b8bcc67bf6428b8c0fff14a5602e2236257b9e3d77acaf12e2a7a1 libressl-3.2.2.tar.gz +sha256 412dc2baa739228c7779e93eb07cd645d5c964d2f2d837a9fd56db7498463d73 libressl-3.2.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/buildroot/package/libressl/libressl.mk b/buildroot/package/libressl/libressl.mk index 41484f5a9..2f7644a8e 100644 --- a/buildroot/package/libressl/libressl.mk +++ b/buildroot/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.2.2 +LIBRESSL_VERSION = 3.2.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING diff --git a/buildroot/package/libuv/libuv.hash b/buildroot/package/libuv/libuv.hash index 2aba18490..c682affae 100644 --- a/buildroot/package/libuv/libuv.hash +++ b/buildroot/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2cd9a757fe6c512440933e2bdcab21143d4aa6249b2541399908ce038b756c9d libuv-1.38.0.tar.gz +sha256 70fe1c9ba4f2c509e8166c0ca2351000237da573bb6c82092339207a9715ba6b libuv-1.40.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/buildroot/package/libuv/libuv.mk b/buildroot/package/libuv/libuv.mk index 493168cd9..5876ab893 100644 --- a/buildroot/package/libuv/libuv.mk +++ b/buildroot/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.38.0 +LIBUV_VERSION = 1.40.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 2dc2457e2..437cc2699 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -346,13 +346,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.246" if BR2_KERNEL_HEADERS_4_4 - default "4.9.246" if BR2_KERNEL_HEADERS_4_9 - default "4.14.209" if BR2_KERNEL_HEADERS_4_14 - default "4.19.160" if BR2_KERNEL_HEADERS_4_19 - default "5.4.80" if BR2_KERNEL_HEADERS_5_4 + default "4.4.248" if BR2_KERNEL_HEADERS_4_4 + default "4.9.248" if BR2_KERNEL_HEADERS_4_9 + default "4.14.212" if BR2_KERNEL_HEADERS_4_14 + default "4.19.163" if BR2_KERNEL_HEADERS_4_19 + default "5.4.83" if BR2_KERNEL_HEADERS_5_4 default "5.8.18" if BR2_KERNEL_HEADERS_5_8 - default "5.9.11" if BR2_KERNEL_HEADERS_5_9 + default "5.9.14" if BR2_KERNEL_HEADERS_5_9 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/lua/5.4.1/lua.hash b/buildroot/package/lua/5.4.1/lua.hash deleted file mode 100644 index 82347ef99..000000000 --- a/buildroot/package/lua/5.4.1/lua.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Hashes from: http://www.lua.org/ftp/ -md5 1d575faef1c907292edd79e7a2784d30 lua-5.4.1.tar.gz -sha1 88961e7d4fda58ca2c6163938fd48db8880e803d lua-5.4.1.tar.gz - -# Locally computed -sha256 c202c5ff3b0c7a0ff2b215fff534c4b4018554843d23ac6eca3d97533b3ad97f doc/readme.html diff --git a/buildroot/package/lua/5.4.1/0001-root-path.patch b/buildroot/package/lua/5.4.2/0001-root-path.patch similarity index 95% rename from buildroot/package/lua/5.4.1/0001-root-path.patch rename to buildroot/package/lua/5.4.2/0001-root-path.patch index 588fecb12..8e82c1ce5 100644 --- a/buildroot/package/lua/5.4.1/0001-root-path.patch +++ b/buildroot/package/lua/5.4.2/0001-root-path.patch @@ -6,7 +6,7 @@ Index: b/src/luaconf.h =================================================================== --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -227,7 +227,7 @@ +@@ -212,7 +212,7 @@ #else /* }{ */ diff --git a/buildroot/package/lua/5.4.1/0002-shared-libs-for-lua.patch b/buildroot/package/lua/5.4.2/0002-shared-libs-for-lua.patch similarity index 100% rename from buildroot/package/lua/5.4.1/0002-shared-libs-for-lua.patch rename to buildroot/package/lua/5.4.2/0002-shared-libs-for-lua.patch diff --git a/buildroot/package/lua/5.4.1/0011-linenoise.patch b/buildroot/package/lua/5.4.2/0011-linenoise.patch similarity index 100% rename from buildroot/package/lua/5.4.1/0011-linenoise.patch rename to buildroot/package/lua/5.4.2/0011-linenoise.patch diff --git a/buildroot/package/lua/5.4.2/lua.hash b/buildroot/package/lua/5.4.2/lua.hash new file mode 100644 index 000000000..f916c8e4e --- /dev/null +++ b/buildroot/package/lua/5.4.2/lua.hash @@ -0,0 +1,6 @@ +# Hashes from: https://www.lua.org/ftp/ +md5 49c92d6a49faba342c35c52e1ac3f81e lua-5.4.2.tar.gz +sha1 96d4a21393c94bed286b8dc0568f4bdde8730b22 lua-5.4.2.tar.gz + +# Locally computed +sha256 17bd5781d5dfa8c946fea639984fcbcb499d8bb3056a3c2cb5c15c3da5d1c207 doc/readme.html diff --git a/buildroot/package/lua/lua.mk b/buildroot/package/lua/lua.mk index 287c3b2ad..387df6169 100644 --- a/buildroot/package/lua/lua.mk +++ b/buildroot/package/lua/lua.mk @@ -5,13 +5,13 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.1 +LUA_VERSION = 5.4.2 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else LUA_VERSION = 5.1.5 endif -LUA_SITE = http://www.lua.org/ftp +LUA_SITE = https://www.lua.org/ftp LUA_INSTALL_STAGING = YES LUA_LICENSE = MIT ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) diff --git a/buildroot/package/mbedtls/mbedtls.hash b/buildroot/package/mbedtls/mbedtls.hash index 0082eee4a..39df05060 100644 --- a/buildroot/package/mbedtls/mbedtls.hash +++ b/buildroot/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.8: -sha256 fe9e3b15c3375943bdfebbbb20dd6b4f1147b3b5d926248bd835d73247407430 mbedtls-2.16.8.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.9: +sha256 fc17ff7d8c11d08f23ae2800a18269408ad2c24ea6bb8b9363e41a01c2425697 mbedtls-2.16.9.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/buildroot/package/mbedtls/mbedtls.mk b/buildroot/package/mbedtls/mbedtls.mk index 5094434e6..77373d8b3 100644 --- a/buildroot/package/mbedtls/mbedtls.mk +++ b/buildroot/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.16.8 +MBEDTLS_VERSION = 2.16.9 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ diff --git a/buildroot/package/mongodb/mongodb.hash b/buildroot/package/mongodb/mongodb.hash index ab13d7765..3b2580cc4 100644 --- a/buildroot/package/mongodb/mongodb.hash +++ b/buildroot/package/mongodb/mongodb.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 f44a846514f8db8be2a662210ad7fefc059d8e17ab2c59aceeae8b0b173d8286 mongodb-src-r4.2.10.tar.gz +sha256 ab5a8b6e967614a8ad67c0ca87124c4f380d4a476508973a7995d54ed902b02e mongodb-src-r4.2.11.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 APACHE-2.0.txt sha256 09d99ca61eb07873d5334077acba22c33e7f7d0a9fa08c92734e0ac8430d6e27 LICENSE-Community.txt diff --git a/buildroot/package/mongodb/mongodb.mk b/buildroot/package/mongodb/mongodb.mk index 6a1caf4fc..e16bb2a16 100644 --- a/buildroot/package/mongodb/mongodb.mk +++ b/buildroot/package/mongodb/mongodb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGODB_VERSION = 4.2.10 +MONGODB_VERSION = 4.2.11 MONGODB_SITE = https://fastdl.mongodb.org/src MONGODB_SOURCE = mongodb-src-r$(MONGODB_VERSION).tar.gz diff --git a/buildroot/package/mutt/0001-Ensure-IMAP-connection-is-closed-after-a-connection-error.patch b/buildroot/package/mutt/0001-Ensure-IMAP-connection-is-closed-after-a-connection-error.patch new file mode 100644 index 000000000..7afc73608 --- /dev/null +++ b/buildroot/package/mutt/0001-Ensure-IMAP-connection-is-closed-after-a-connection-error.patch @@ -0,0 +1,48 @@ +From 04b06aaa3e0cc0022b9b01dbca2863756ebbf59a Mon Sep 17 00:00:00 2001 +From: Kevin McCarthy +Date: Mon, 16 Nov 2020 10:20:21 -0800 +Subject: [PATCH] Ensure IMAP connection is closed after a connection error. + +During connection, if the server provided an illegal initial response, +Mutt "bailed", but did not actually close the connection. The calling +code unfortunately relied on the connection status to decide to +continue with authentication, instead of checking the "bail" return +value. + +This could result in authentication credentials being sent over an +unencrypted connection, without $ssl_force_tls being consulted. + +Fix this by strictly closing the connection on any invalid response +during connection. The fix is intentionally small, to ease +backporting. A better fix would include removing the 'err_close_conn' +label, and perhaps adding return value checking in the caller (though +this change obviates the need for that). + +This addresses CVE-2020-28896. Thanks to Gabriel Salles-Loustau for +reporting the problem, and providing test cases to reproduce. + +[Retrieved from: +https://gitlab.com/muttmua/mutt/-/commit/04b06aaa3e0cc0022b9b01dbca2863756ebbf59a] +Signed-off-by: Fabrice Fontaine +--- + imap/imap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/imap/imap.c b/imap/imap.c +index b24e8a3f..b13dd54d 100644 +--- a/imap/imap.c ++++ b/imap/imap.c +@@ -561,9 +561,9 @@ int imap_open_connection (IMAP_DATA* idata) + + #if defined(USE_SSL) + err_close_conn: +- imap_close_connection (idata); + #endif + bail: ++ imap_close_connection (idata); + FREE (&idata->capstr); + return -1; + } +-- +GitLab + diff --git a/buildroot/package/mutt/mutt.mk b/buildroot/package/mutt/mutt.mk index 0ff03724c..4e1400457 100644 --- a/buildroot/package/mutt/mutt.mk +++ b/buildroot/package/mutt/mutt.mk @@ -11,6 +11,9 @@ MUTT_LICENSE_FILES = GPL MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp +# 0001-Ensure-IMAP-connection-is-closed-after-a-connection-error.patch +MUTT_IGNORE_CVES += CVE-2020-28896 + ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv MUTT_CONF_OPTS += --enable-iconv @@ -40,7 +43,7 @@ MUTT_CONF_OPTS += --disable-pop endif # SSL support is only used by imap or pop3 module -ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr @@ -58,6 +61,13 @@ else MUTT_CONF_OPTS += --without-sqlite3 endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +MUTT_DEPENDENCIES += zlib +MUTT_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +else +MUTT_CONF_OPTS += --without-zlib +endif + # Avoid running tests to check for: # - target system is *BSD # - C99 conformance (snprintf, vsnprintf) diff --git a/buildroot/package/ncurses/ncurses.mk b/buildroot/package/ncurses/ncurses.mk index f4e4784a3..4d8dcecc3 100644 --- a/buildroot/package/ncurses/ncurses.mk +++ b/buildroot/package/ncurses/ncurses.mk @@ -187,6 +187,9 @@ define HOST_NCURSES_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/progs tic endef +HOST_NCURSES_CONF_ENV = \ + ac_cv_path_LDCONFIG="" + HOST_NCURSES_CONF_OPTS = \ --with-shared \ --without-gpm \ diff --git a/buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch b/buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch new file mode 100644 index 000000000..fb68e175e --- /dev/null +++ b/buildroot/package/netsnmp/0006-IP-MIB-Linux-Fix-a-memory-leak-in-an-error-path.patch @@ -0,0 +1,37 @@ +From 7c073e3a1b736689135fd2ed44ede5b83790bd37 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Mon, 26 Aug 2019 18:32:08 -0700 +Subject: IP-MIB, Linux: Fix a memory leak in an error path + +When a Linux system is booted with "ipv6.disable=1" in the kernel command +line, the file "/proc/net/snmp6" is not created. Fix the memory leak in +_systemstats_v6_load_systemstats() that is triggered with IPv6 disabled. + +See also https://sourceforge.net/p/net-snmp/bugs/2976/. + +Reported-by: Mark E Rusk +--- + agent/mibgroup/ip-mib/data_access/systemstats_linux.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c +index e28ff93..f68d122 100644 +--- a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c ++++ b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c +@@ -560,10 +560,12 @@ _systemstats_v6_load_systemstats(netsnmp_container* container, u_int load_flags) + * try to open file. If we can't, that's ok - maybe the module hasn't + * been loaded yet. + */ +- if (!(devin = fopen(filename, "r"))) { ++ devin = fopen(filename, "r"); ++ if (!devin) { + DEBUGMSGTL(("access:systemstats", + "Failed to load Systemstats Table (linux1), cannot open %s\n", + filename)); ++ netsnmp_access_systemstats_entry_free(entry); + return 0; + } + +-- +2.7.4 + diff --git a/buildroot/package/nodejs/nodejs.hash b/buildroot/package/nodejs/nodejs.hash index 33fb40788..61259425b 100644 --- a/buildroot/package/nodejs/nodejs.hash +++ b/buildroot/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.18.4/SHASUMS256.txt -sha256 25f03cb18e53b6d0959d0c219e701a85eb4693f526bdda7c72bc6199b364f609 node-v12.18.4.tar.xz +# From https://nodejs.org/dist/v12.19.1/SHASUMS256.txt +sha256 74077e0cc3db000a6f3cc685b220e609807b61adc8e7d8243e8511d478d1b17d node-v12.19.1.tar.xz # Hash for license file sha256 0dc03af08b95ea0c1e27f8fd591dee4383eb6f2c304db6eb6cdfb6751f7da87b LICENSE diff --git a/buildroot/package/nodejs/nodejs.mk b/buildroot/package/nodejs/nodejs.mk index b159b1025..524a6b5d8 100644 --- a/buildroot/package/nodejs/nodejs.mk +++ b/buildroot/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 12.18.4 +NODEJS_VERSION = 12.19.1 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ diff --git a/buildroot/package/opencv3/opencv3.mk b/buildroot/package/opencv3/opencv3.mk index 3e3e5987a..e888485d2 100644 --- a/buildroot/package/opencv3/opencv3.mk +++ b/buildroot/package/opencv3/opencv3.mk @@ -46,6 +46,7 @@ endif # OpenCV build options OPENCV3_CONF_OPTS += \ -DBUILD_WITH_STATIC_CRT=OFF \ + -DENABLE_CCACHE=OFF \ -DENABLE_COVERAGE=OFF \ -DENABLE_FAST_MATH=ON \ -DENABLE_IMPL_COLLECTION=OFF \ @@ -286,7 +287,9 @@ OPENCV3_CONF_OPTS += -DWITH_PNG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y) +# protobuf needs c++11 (since 3.6.0) OPENCV3_CONF_OPTS += \ + -DENABLE_CXX11=ON \ -DPROTOBUF_UPDATE_FILES=ON \ -DWITH_PROTOBUF=ON OPENCV3_DEPENDENCIES += protobuf diff --git a/buildroot/package/openldap/0001-fix_cross_strip.patch b/buildroot/package/openldap/0001-fix_cross_strip.patch index ed4964e44..d9d6f9d50 100644 --- a/buildroot/package/openldap/0001-fix_cross_strip.patch +++ b/buildroot/package/openldap/0001-fix_cross_strip.patch @@ -44,7 +44,7 @@ diff -rupN openldap-2.4.40/clients/tools/Makefile.in openldap-2.4.40-br/clients/ diff -rupN openldap-2.4.40/configure.in openldap-2.4.40-br/configure.in --- openldap-2.4.40/configure.in 2014-09-18 21:48:49.000000000 -0400 +++ openldap-2.4.40-br/configure.in 2015-01-16 15:50:48.874816786 -0500 -@@ -669,6 +669,15 @@ if test -z "${AR}"; then +@@ -668,6 +668,15 @@ if test -z "${AR}"; then fi fi diff --git a/buildroot/package/openldap/0002-fix-bignum.patch b/buildroot/package/openldap/0002-fix-bignum.patch index d3dc88fc3..159ea8e22 100644 --- a/buildroot/package/openldap/0002-fix-bignum.patch +++ b/buildroot/package/openldap/0002-fix-bignum.patch @@ -15,7 +15,7 @@ Signed-off-by: "Yann E. MORIN" diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure --- openldap-2.4.40.orig/configure 2014-09-19 03:48:49.000000000 +0200 +++ openldap-2.4.40/configure 2015-01-25 18:44:54.216879362 +0100 -@@ -23478,7 +23478,7 @@ +@@ -23431,7 +23431,7 @@ if test "$ac_cv_header_openssl_bn_h" = "yes" && test "$ac_cv_header_openssl_crypto_h" = "yes" && @@ -27,7 +27,7 @@ diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure diff -durN openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in --- openldap-2.4.40.orig/configure.in 2014-09-19 03:48:49.000000000 +0200 +++ openldap-2.4.40/configure.in 2015-01-25 18:44:37.628676446 +0100 -@@ -2367,7 +2367,7 @@ +@@ -2383,7 +2383,7 @@ AC_CHECK_HEADERS(openssl/crypto.h) if test "$ac_cv_header_openssl_bn_h" = "yes" && test "$ac_cv_header_openssl_crypto_h" = "yes" && diff --git a/buildroot/package/openldap/openldap.hash b/buildroot/package/openldap/openldap.hash index 6790e8b7a..4908f6e69 100644 --- a/buildroot/package/openldap/openldap.hash +++ b/buildroot/package/openldap/openldap.hash @@ -1,7 +1,7 @@ -# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.50.md5 -md5 f9ed44ef373abed04c9e4c8586260f9e openldap-2.4.50.tgz -# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.50.sha1 -sha1 82f576e0d0d334e9e798d9de8936683546247bb9 openldap-2.4.50.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.56.md5 +md5 82a7dcf7aeaf95fdad16017c0ed9983a openldap-2.4.56.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.56.sha1 +sha1 4c617b87bd50ef8d071e7deb7525af79b08d4910 openldap-2.4.56.tgz # Locally computed -sha256 5cb57d958bf5c55a678c6a0f06821e0e5504d5a92e6a33240841fbca1db586b8 openldap-2.4.50.tgz +sha256 25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0 openldap-2.4.56.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/openldap/openldap.mk b/buildroot/package/openldap/openldap.mk index a9e71be59..e44c958c4 100644 --- a/buildroot/package/openldap/openldap.mk +++ b/buildroot/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.50 +OPENLDAP_VERSION = 2.4.56 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License diff --git a/buildroot/package/opkg-utils/opkg-utils.mk b/buildroot/package/opkg-utils/opkg-utils.mk index fa14053f6..a94a4cd5c 100644 --- a/buildroot/package/opkg-utils/opkg-utils.mk +++ b/buildroot/package/opkg-utils/opkg-utils.mk @@ -10,6 +10,8 @@ OPKG_UTILS_SITE_METHOD = git OPKG_UTILS_LICENSE = GPL-2.0+ OPKG_UTILS_LICENSE_FILES = COPYING +HOST_OPKG_UTILS_DEPENDENCIES += $(BR2_PYTHON3_HOST_DEPENDENCY) + define HOST_OPKG_UTILS_BUILD_CMDS $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) endef diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash index 4d9939af3..93ce1b34f 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 ecbc2c2000c6d8dcf1a76325312c61ed29db0b010acbd40cb92fcd4c014cd017 paho-mqtt-c-1.3.6.tar.gz +sha256 19e9f04ddf244ab8c937d7e631ca15cedce7df95712c554107600e80efdaf277 paho-mqtt-c-1.3.7.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk index 3ac46397d..a477c8baa 100644 --- a/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.6 +PAHO_MQTT_C_VERSION = 1.3.7 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE diff --git a/buildroot/package/pkg-cmake.mk b/buildroot/package/pkg-cmake.mk index dc545caed..3ee706725 100644 --- a/buildroot/package/pkg-cmake.mk +++ b/buildroot/package/pkg-cmake.mk @@ -22,10 +22,10 @@ # Set compiler variables. ifeq ($(BR2_CCACHE),y) -CMAKE_HOST_C_COMPILER = $(HOST_DIR)/bin/ccache -CMAKE_HOST_CXX_COMPILER = $(HOST_DIR)/bin/ccache -CMAKE_HOST_C_COMPILER_ARG1 = $(HOSTCC_NOCCACHE) -CMAKE_HOST_CXX_COMPILER_ARG1 = $(HOSTCXX_NOCCACHE) +CMAKE_HOST_C_COMPILER = $(HOSTCC_NOCCACHE) +CMAKE_HOST_CXX_COMPILER = $(HOSTCXX_NOCCACHE) +CMAKE_HOST_C_COMPILER_LAUNCHER = $(HOST_DIR)/bin/ccache +CMAKE_HOST_CXX_COMPILER_LAUNCHER = $(HOST_DIR)/bin/ccache else CMAKE_HOST_C_COMPILER = $(HOSTCC) CMAKE_HOST_CXX_COMPILER = $(HOSTCXX) @@ -134,9 +134,9 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER)" \ - $(if $$(CMAKE_HOST_C_COMPILER_ARG1),\ - -DCMAKE_C_COMPILER_ARG1="$$(CMAKE_HOST_C_COMPILER_ARG1)" \ - -DCMAKE_CXX_COMPILER_ARG1="$$(CMAKE_HOST_CXX_COMPILER_ARG1)" \ + $(if $$(CMAKE_HOST_C_COMPILER_LAUNCHER),\ + -DCMAKE_C_COMPILER_LAUNCHER="$$(CMAKE_HOST_C_COMPILER_LAUNCHER)" \ + -DCMAKE_CXX_COMPILER_LAUNCHER="$$(CMAKE_HOST_CXX_COMPILER_LAUNCHER)" \ ) \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ diff --git a/buildroot/package/pkg-golang.mk b/buildroot/package/pkg-golang.mk index 3813e1c40..d07242310 100644 --- a/buildroot/package/pkg-golang.mk +++ b/buildroot/package/pkg-golang.mk @@ -121,7 +121,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(TARGET_DIR)/usr/bin/$$(d) + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d) ) endef endif @@ -130,7 +130,7 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS $$(foreach d,$$($(2)_INSTALL_BINS),\ - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(HOST_DIR)/bin/$$(d) + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d) ) endef endif diff --git a/buildroot/package/pkg-meson.mk b/buildroot/package/pkg-meson.mk index 3a34ba703..e0b843dc3 100644 --- a/buildroot/package/pkg-meson.mk +++ b/buildroot/package/pkg-meson.mk @@ -87,6 +87,7 @@ define $(2)_CONFIGURE_CMDS --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ + -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build @@ -105,6 +106,7 @@ define $(2)_CONFIGURE_CMDS --localstatedir=$$(HOST_DIR)/var \ --default-library=shared \ --buildtype=release \ + -Dstrip=true \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build endef diff --git a/buildroot/package/python-crc16/Config.in b/buildroot/package/python-crc16/Config.in index b7a10b66a..06ad00778 100644 --- a/buildroot/package/python-crc16/Config.in +++ b/buildroot/package/python-crc16/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CRC16 bool "python-crc16" - depends on BR2_PACKAGE_PYTHON help This library calculates only CRC16 (16-bit codes) and the only supported variant at the moment is CRC-CCITT (XModem). diff --git a/buildroot/package/python-lxml/python-lxml.hash b/buildroot/package/python-lxml/python-lxml.hash index 240314e88..7918e0874 100644 --- a/buildroot/package/python-lxml/python-lxml.hash +++ b/buildroot/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 27ee0faf8077c7c1a589573b1450743011117f1aa1a91d5ae776bbc5ca6070f2 lxml-4.5.1.tar.gz +sha256 cd11c7e8d21af997ee8079037fff88f16fda188a9776eb4b81c7e4c9c0a7d7fc lxml-4.6.2.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/buildroot/package/python-lxml/python-lxml.mk b/buildroot/package/python-lxml/python-lxml.mk index 7e727a675..a8874737e 100644 --- a/buildroot/package/python-lxml/python-lxml.mk +++ b/buildroot/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.5.1 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/03/a8/73d795778143be51d8b86750b371b3efcd7139987f71618ad9f4b8b65543 +PYTHON_LXML_VERSION = 4.6.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/db/f7/43fecb94d66959c1e23aa53d6161231dca0e93ec500224cf31b3c4073e37 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. diff --git a/buildroot/package/python-pyparsing/Config.in b/buildroot/package/python-pyparsing/Config.in index 425ffe326..926ca07ed 100644 --- a/buildroot/package/python-pyparsing/Config.in +++ b/buildroot/package/python-pyparsing/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_PYTHON_PYPARSING module provides a library of classes that client code uses to construct the grammar directly in Python code. - http://pyparsing.wikispaces.com/ + https://github.com/pyparsing/pyparsing/ diff --git a/buildroot/package/python-pyqt5/python-pyqt5.mk b/buildroot/package/python-pyqt5/python-pyqt5.mk index 9285b6497..8f28c90d1 100644 --- a/buildroot/package/python-pyqt5/python-pyqt5.mk +++ b/buildroot/package/python-pyqt5/python-pyqt5.mk @@ -135,7 +135,7 @@ PYTHON_PYQT5_QTDETAIL_TYPE = shared # Turn off features that aren't available in current qt configuration PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),,PyQt_SSL) +PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) define PYTHON_PYQT5_QTDETAIL echo $(1) >> $(2)/qtdetail.out diff --git a/buildroot/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch b/buildroot/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch new file mode 100644 index 000000000..3621cdb2d --- /dev/null +++ b/buildroot/package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch @@ -0,0 +1,63 @@ +From 0eb7058b473069a04cde60a800dfd04148c0c8b1 Mon Sep 17 00:00:00 2001 +From: Yann E. MORIN +Date: Sat, 14 Dec 2020 21:15:17 +0100 +Subject: [PATCH] plugins/eglfs/gbm: don't FTBFS when EGLNativeDisplayType is not a pointer + +On some platforms, EGLNativeDisplayType is not a pointer, but some kind +of integer, like an int (e.g. TI's SGX) or an unsigned int. In those +cases, the build breaks with: + + qeglfskmsgbmintegration.cpp: In member function ‘virtual void* QEglFSKmsGbmIntegration::createDisplay(EGLNativeDisplayType)’: + qeglfskmsgbmintegration.cpp:83:60: error: invalid conversion from ‘EGLNativeDisplayType’ {aka ‘int’} to ‘void*’ [-fpermissive] + 83 | display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, nativeDisplay, nullptr); + | ^~~~~~~~~~~~~ + | | + | EGLNativeDisplayType {aka int} + +We fix that by casting nativeDisplay to void* as expected by +getPlatformDisplay(). + +We can do that, because usually, nativeDisplay is already a pointer, and +thus this cast is a no-op. When it is not already a pointer, we either +don't care because the code path will not be taken at runtime, or the +integer really is an opaque handle to some internal, low-level memory +management, much like a void* is an pointer to an opaque memory type... + +It is to be noted, though, that in some ABIs (like x32), the size of a +nativeDisplay that is not already a pointer, might be bigger than that +of a pointer. There is not much we can do here anyway, since there would +be no way to fit that in a void* to begin with, and the build will still +fail for those situations. Those types of ABIs are far frome being +widespread, the most prominent one, x32, even being retired... + +To be noted further: a more usual solution (as suggested in QTBUG-72567 +or in Gerrit:248270) would be to first cast to a qintptr or a quintptr, +before finally casting to a void*. However, casting to either (resp.) +qintptr or quintptr first, risk the case that nativeDisplay is of the other +kind of signedness, (resp.) unsigned or signed, which would also cause +some compile-time breakage. + +Finally, if nativeDisplay is something that is not an int-like, and that +can't be cast into a void*, this would be hugely weird, so much so, that +we do not even attempt to catter for that case. + +Fixes: QTBUG-72567 +Inspired-by: https://codereview.qt-project.org/c/qt/qtbase/+/248270 +Signed-off-by: Yann E. MORIN +--- + +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp +index d495a8d..059a580 100644 +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp +@@ -80,7 +80,9 @@ + } + + if (getPlatformDisplay) { +- display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, nativeDisplay, nullptr); ++ // EGLNativeDisplayType may be int on some platforms but those ++ // won't hit this path. Have to keep it compiling nonetheless. ++ display = getPlatformDisplay(EGL_PLATFORM_GBM_KHR, reinterpret_cast(nativeDisplay), nullptr); + } else { + qCDebug(qLcEglfsKmsDebug, "No eglGetPlatformDisplay for GBM, falling back to eglGetDisplay"); + display = eglGetDisplay(nativeDisplay); diff --git a/buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch b/buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch new file mode 100644 index 000000000..9604e8878 --- /dev/null +++ b/buildroot/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch @@ -0,0 +1,43 @@ +From f73eefdbc0577b125f7d36f54a27d8e95af831dd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 22 Dec 2020 11:52:31 +0100 +Subject: [PATCH] src/mount.c: fix build with kernel < 4.14 + +Build with kernel headers < 4.14 fails since version 1.5.0 and +https://github.com/rauc/rauc/commit/527bf2f7f746e0253f7843542e19cb0fa0c7c869: + +src/mount.c: In function 'r_setup_loop': +src/mount.c:201:25: error: 'LOOP_SET_BLOCK_SIZE' undeclared (first use in this function) + looprc = ioctl(loopfd, LOOP_SET_BLOCK_SIZE, 4096); + ^ + +Indeed, LOOP_SET_BLOCK_SIZE is only defined since +https://github.com/torvalds/linux/commit/89e4fdecb51cf5535867026274bc97de9480ade5 + +Fixes: + - http://autobuild.buildroot.org/results/829ae7ed66686c11a941ac99bd08a06f754affb4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rauc/rauc/pull/673] +--- + src/mount.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/mount.c b/src/mount.c +index 2e593ca..75acf49 100644 +--- a/src/mount.c ++++ b/src/mount.c +@@ -11,6 +11,10 @@ + #include "mount.h" + #include "utils.h" + ++#ifndef LOOP_SET_BLOCK_SIZE ++#define LOOP_SET_BLOCK_SIZE 0x4C09 ++#endif ++ + gboolean r_mount_bundle(const gchar *source, const gchar *mountpoint, GError **error) + { + const unsigned long flags = MS_NODEV | MS_NOSUID | MS_RDONLY; +-- +2.29.2 + diff --git a/buildroot/package/rauc/rauc.hash b/buildroot/package/rauc/rauc.hash index d32712229..73c1add99 100644 --- a/buildroot/package/rauc/rauc.hash +++ b/buildroot/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.4/rauc-1.4.tar.xz.asc -sha256 85aabf214cd93a37f7ad0b3aaad89eb94facf0f3ebf6e2edca945acbca9b0967 rauc-1.4.tar.xz +# https://github.com/rauc/rauc/releases/download/v1.5/rauc-1.5.tar.xz.asc +sha256 5dfbc46e808240c5014d318cfe64f0431307c37aa79cb2b013caa12daaf96d9d rauc-1.5.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/rauc/rauc.mk b/buildroot/package/rauc/rauc.mk index a6c7c0109..fd39f000a 100644 --- a/buildroot/package/rauc/rauc.mk +++ b/buildroot/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.4 +RAUC_VERSION = 1.5 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 diff --git a/buildroot/package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch b/buildroot/package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch new file mode 100644 index 000000000..781d3c0e6 --- /dev/null +++ b/buildroot/package/shadowsocks-libev/0001-configure.ac-use-pkg-config-to-find-netfilter_conntr.patch @@ -0,0 +1,62 @@ +From b3c61360a93b7f08fc9c33526056211408301ea9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 23 Nov 2020 21:16:38 +0100 +Subject: [PATCH] configure.ac: use pkg-config to find netfilter_conntrack + +Use pkg-config to retrieve the dependencies of netfilter_conntrack +and avoid the following build failure when building statically: + +configure:13096: /data/buildroot-test/instance-1/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -I/data/buildroot-test/instance-1/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include -DPCRE_STATIC -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -L/data/buildroot-test/instance-1/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib conftest.c -lnetfilter_conntrack -lnfnetlink -lev -lcares -lsodium -lmbedcrypto -lpcre >&5 +/data/buildroot-test/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /data/buildroot-test/instance-1/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': +api.c:(.text+0x3f): undefined reference to `mnl_nlmsg_put_header' + +Fixes: + - http://autobuild.buildroot.org/results/6cad497a7ab941a0ee3fd7007defc81e30cdcbe0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://github.com/shadowsocks/shadowsocks-libev/pull/2773] +--- + configure.ac | 5 +++-- + src/Makefile.am | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9787bc2..207c041 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -252,7 +252,8 @@ AC_ARG_ENABLE(connmarktos, + if test x"$enable_connmarktos" = "xyes" ; then + AC_MSG_NOTICE([Linux Netfilter Conntrack support requested by --enable-connmarktos: ${enable_connmarktos}]) + if test "x$enable_connmarktos" != "xno"; then +- AC_SEARCH_LIBS([nfct_query], [netfilter_conntrack],,[ ++ PKG_CHECK_MODULES([NETFILTER_CONNTRACK], [libnetfilter_conntrack],, ++ [AC_SEARCH_LIBS([nfct_query], [netfilter_conntrack],,[ + if test x"$enable_connmarktos" = "xyes"; then + AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack library not found]) + fi +@@ -262,7 +263,7 @@ if test x"$enable_connmarktos" = "xyes" ; then + if test x"$enable_connmarktos" = "xyes"; then + AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack headers not found]) + fi +- with_netfilter_conntrack=no]) ++ with_netfilter_conntrack=no])]) + # If nothing is broken; enable the libraries usage. + if test "x$with_netfilter_conntrack" != "xno"; then + with_netfilter_conntrack=yes +diff --git a/src/Makefile.am b/src/Makefile.am +index c261ed0..b81ced7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -9,7 +9,7 @@ AM_CFLAGS += -I$(top_srcdir)/libcork/include + endif + AM_CFLAGS += $(LIBPCRE_CFLAGS) + +-SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS) ++SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS) $(NETFILTER_CONNTRACK_LIBS) + if !USE_SYSTEM_SHARED_LIB + SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la \ + $(top_builddir)/libipset/libipset.la \ +-- +2.29.2 + diff --git a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk index 3ba4cb875..d69a37785 100644 --- a/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk +++ b/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk @@ -10,6 +10,8 @@ SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (lib SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES +# We're patching configure.ac +SHADOWSOCKS_LIBEV_AUTORECONF = YES SHADOWSOCKS_LIBEV_CONF_OPTS = \ --with-pcre=$(STAGING_DIR)/usr \ --disable-ssp diff --git a/buildroot/package/sqlcipher/sqlcipher.hash b/buildroot/package/sqlcipher/sqlcipher.hash index c37db7a20..96a6a7401 100644 --- a/buildroot/package/sqlcipher/sqlcipher.hash +++ b/buildroot/package/sqlcipher/sqlcipher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f sqlcipher-4.3.0.tar.gz +sha256 87458e0e16594b3ba6c7a1f046bc1ba783d002d35e0e7b61bb6b7bb862f362a7 sqlcipher-4.4.2.tar.gz sha256 3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8 LICENSE diff --git a/buildroot/package/sqlcipher/sqlcipher.mk b/buildroot/package/sqlcipher/sqlcipher.mk index 14290745a..5a9a77c1e 100644 --- a/buildroot/package/sqlcipher/sqlcipher.mk +++ b/buildroot/package/sqlcipher/sqlcipher.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLCIPHER_VERSION = 4.3.0 +SQLCIPHER_VERSION = 4.4.2 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/suricata/suricata.hash b/buildroot/package/suricata/suricata.hash index a6cf43fb6..7435c1b96 100644 --- a/buildroot/package/suricata/suricata.hash +++ b/buildroot/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 3c175a6dee9071141391f64828502cfb6e48dc1a20833e1411fb45be5368923b suricata-6.0.0.tar.gz +sha256 e7a1798fe59c1d213f752feefbf8bb54168f9fa56235cf3380347c696ecdb1ae suricata-6.0.1.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/suricata/suricata.mk b/buildroot/package/suricata/suricata.mk index 94c4784dd..a8970fe9a 100644 --- a/buildroot/package/suricata/suricata.mk +++ b/buildroot/package/suricata/suricata.mk @@ -4,7 +4,7 @@ # ################################################################################ -SURICATA_VERSION = 6.0.0 +SURICATA_VERSION = 6.0.1 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE diff --git a/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk b/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk index 8599e88e9..4baebb9be 100644 --- a/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk +++ b/buildroot/package/ti-sgx-demos/ti-sgx-demos.mk @@ -4,7 +4,7 @@ # ################################################################################ -# This correpsonds to SDK 06.00.00.07 plus one pull request +# This corresponds to SDK 06.00.00.07 plus one pull request TI_SGX_DEMOS_VERSION = bb8b74cdd1323e76697b3eb2258f863b15fee287 TI_SGX_DEMOS_SITE = http://git.ti.com/git/graphics/img-pvr-sdk.git TI_SGX_DEMOS_SITE_METHOD = git @@ -12,7 +12,7 @@ TI_SGX_DEMOS_LICENSE = Imagination Technologies License Agreement TI_SGX_DEMOS_LICENSE_FILES = LegalNotice.txt define TI_SGX_DEMOS_INSTALL_TARGET_CMDS - cp -dpfr $(@D)/targetfs/arm/Examples/Advanced/Wayland/OGLES* \ + cp -dpfr $(@D)/targetfs/arm/Examples/Advanced/NullWS/OGLES* \ $(TARGET_DIR)/usr/bin/ endef diff --git a/buildroot/package/ti-sgx-km/ti-sgx-km.mk b/buildroot/package/ti-sgx-km/ti-sgx-km.mk index ae294c300..d5fd3b470 100644 --- a/buildroot/package/ti-sgx-km/ti-sgx-km.mk +++ b/buildroot/package/ti-sgx-km/ti-sgx-km.mk @@ -4,7 +4,7 @@ # ################################################################################ -# This correpsonds to SDK 06.00.00.07 +# This corresponds to SDK 06.00.00.07 TI_SGX_KM_VERSION = 4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d TI_SGX_KM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git TI_SGX_KM_SITE_METHOD = git diff --git a/buildroot/package/ti-sgx-um/ti-sgx-um.mk b/buildroot/package/ti-sgx-um/ti-sgx-um.mk index 0e26d057c..bf7d22563 100644 --- a/buildroot/package/ti-sgx-um/ti-sgx-um.mk +++ b/buildroot/package/ti-sgx-um/ti-sgx-um.mk @@ -4,7 +4,7 @@ # ################################################################################ -# This correpsonds to SDK 06.00.00.07 plus one pull request +# This corresponds to SDK 06.00.00.07 plus one pull request TI_SGX_UM_VERSION = 2a2e5bb090ced870d73ed4edbc54793e952cc6d8 TI_SGX_UM_SITE = http://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git TI_SGX_UM_SITE_METHOD = git diff --git a/buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch b/buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch new file mode 100644 index 000000000..40f928860 --- /dev/null +++ b/buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch @@ -0,0 +1,39 @@ +From 085ca40781f7c39febe6d14fb7e5cba342e1804b Mon Sep 17 00:00:00 2001 +From: Ricardo Crudo +Date: Sat, 30 May 2020 22:03:01 +0200 +Subject: [PATCH] Enable build for different c libraries + +The open_memstream.c was using GLIBC macro definition to test if the +library is building on a Linux box. This makes impossible to build +tinycbor against other C libraries, as musl for example. + +Signed-off-by: Ricardo Crudo +[Retrieved from: +https://github.com/intel/tinycbor/commit/085ca40781f7c39febe6d14fb7e5cba342e1804b] +Signed-off-by: Fabrice Fontaine +--- + src/open_memstream.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/open_memstream.c b/src/open_memstream.c +index 18f3de8..3365378 100644 +--- a/src/open_memstream.c ++++ b/src/open_memstream.c +@@ -38,7 +38,7 @@ + #ifdef __APPLE__ + typedef int RetType; + typedef int LenType; +-#elif __GLIBC__ ++#elif __linux__ + typedef ssize_t RetType; + typedef size_t LenType; + #else +@@ -101,7 +101,7 @@ FILE *open_memstream(char **bufptr, size_t *lenptr) + + #ifdef __APPLE__ + return funopen(b, NULL, write_to_buffer, NULL, close_buffer); +-#elif __GLIBC__ ++#elif __linux__ + static const cookie_io_functions_t vtable = { + NULL, + write_to_buffer, diff --git a/buildroot/package/uclibc-ng-test/0001-add-nios2-tls-macros-from-glibc.patch b/buildroot/package/uclibc-ng-test/0001-add-nios2-tls-macros-from-glibc.patch new file mode 100644 index 000000000..574d10c1b --- /dev/null +++ b/buildroot/package/uclibc-ng-test/0001-add-nios2-tls-macros-from-glibc.patch @@ -0,0 +1,84 @@ +From bf6fcd59d1ff51584a703b1d78c9e8fd4f808917 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 28 Nov 2020 11:44:00 +0100 +Subject: [PATCH] add nios2 tls macros from glibc + +Retrieved from +https://github.com/bminor/glibc/blob/master/sysdeps/nios2/tls-macros.h + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/wbx-github/uclibc-ng-test/commit/bf6fcd59d1ff51584a703b1d78c9e8fd4f808917] +--- + test/tls/tls-macros-nios2.h | 46 +++++++++++++++++++++++++++++++++++++ + test/tls/tls-macros.h | 4 ++++ + 2 files changed, 50 insertions(+) + create mode 100644 test/tls/tls-macros-nios2.h + +diff --git a/test/tls/tls-macros-nios2.h b/test/tls/tls-macros-nios2.h +new file mode 100644 +index 0000000..7029530 +--- /dev/null ++++ b/test/tls/tls-macros-nios2.h +@@ -0,0 +1,46 @@ ++#define TLS_LE(x) \ ++ ({ int *__result; \ ++ asm ("addi %0, r23, %%tls_le(" #x ")" \ ++ : "=r" (__result)); \ ++ __result; }) ++ ++#define TLS_IE(x) \ ++ ({ int *__result; \ ++ int __tmp; \ ++ asm ("nextpc %0 ; " \ ++ "1: movhi %1, %%hiadj(_gp_got - 1b) ; " \ ++ "addi %1, %1, %%lo(_gp_got - 1b) ; " \ ++ "add %0, %0, %1 ; " \ ++ "ldw %1, %%tls_ie(" #x ")(%0) ; " \ ++ "add %1, r23, %1" \ ++ : "=&r" (__tmp), "=&r" (__result)); \ ++ __result; }) ++ ++#define TLS_LD(x) \ ++ ({ char *__result; \ ++ char *__result2; \ ++ int *__result3; \ ++ int __tmp; \ ++ extern void *__tls_get_addr (void *); \ ++ asm ("nextpc %0 ; " \ ++ "1: movhi %1, %%hiadj(_gp_got - 1b) ; " \ ++ "addi %1, %1, %%lo(_gp_got - 1b) ; " \ ++ "add %0, %0, %1 ; " \ ++ "addi %0, %0, %%tls_ldm(" #x ")" \ ++ : "=r" (__result), "=r" (__tmp)); \ ++ __result2 = (char *)__tls_get_addr (__result); \ ++ asm ("addi %0, %1, %%tls_ldo(" #x ")" \ ++ : "=r" (__result3) : "r" (__result2)); \ ++ __result3; }) ++ ++#define TLS_GD(x) \ ++ ({ int *__result; \ ++ int __tmp; \ ++ extern void *__tls_get_addr (void *); \ ++ asm ("nextpc %0 ; " \ ++ "1: movhi %1, %%hiadj(_gp_got - 1b) ; " \ ++ "addi %1, %1, %%lo(_gp_got - 1b) ; " \ ++ "add %0, %0, %1 ; " \ ++ "addi %0, %0, %%tls_gd(" #x ")" \ ++ : "=r" (__result), "=r" (__tmp)); \ ++ (int *)__tls_get_addr (__result); }) +diff --git a/test/tls/tls-macros.h b/test/tls/tls-macros.h +index 4a4e916..087b365 100644 +--- a/test/tls/tls-macros.h ++++ b/test/tls/tls-macros.h +@@ -64,6 +64,10 @@ + #include + #endif + ++#ifdef __nios2__ ++#include ++#endif ++ + #if defined(__powerpc__) && !defined(__powerpc64__) + #include + #endif diff --git a/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash b/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash new file mode 100644 index 000000000..2a73237f0 --- /dev/null +++ b/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 1f22e4143413550d64cbde193de388e8884eb7398cd41d3835e5d8a06a488423 uclibc-ng-test-c64d6ac77f0e745c70e76024212c72e4bbe2091a.tar.gz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/buildroot/package/unbound/unbound.hash b/buildroot/package/unbound/unbound.hash index c2c6ab7ff..9ccea6eb8 100644 --- a/buildroot/package/unbound/unbound.hash +++ b/buildroot/package/unbound/unbound.hash @@ -1,3 +1,5 @@ +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.13.0.tar.gz.sha256 +sha256 a954043a95b0326ca4037e50dace1f3a207a0a19e9a4a22f4c6718fc623db2a1 unbound-1.13.0.tar.gz + # Locally calculated -sha256 5b9253a97812f24419bf2e6b3ad28c69287261cf8c8fa79e3e9f6d3bf7ef5835 unbound-1.12.0.tar.gz -sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE +sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/buildroot/package/unbound/unbound.mk b/buildroot/package/unbound/unbound.mk index d60180b6c..8b7d1e8e9 100644 --- a/buildroot/package/unbound/unbound.mk +++ b/buildroot/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.12.0 +UNBOUND_VERSION = 1.13.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause diff --git a/buildroot/package/uvw/uvw.hash b/buildroot/package/uvw/uvw.hash index f842345ea..ba8c7b893 100644 --- a/buildroot/package/uvw/uvw.hash +++ b/buildroot/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2695276bb4b154174ac0a6401bde5c0768bca99a43c9a469af67526f7e2e9410 uvw-2.6.0_libuv-v1.38.tar.gz +sha256 aa5769f5b9ba50de72ab02a8f8acf298b4aa9ceaef07992418a13a0fa119ce7d uvw-2.8.0_libuv_v1.40.tar.gz sha256 755b2f245af22830c15b60c54469c0d92fbed42009b0d0074cec4b3959905757 LICENSE diff --git a/buildroot/package/uvw/uvw.mk b/buildroot/package/uvw/uvw.mk index dd9b6b27d..39952caa1 100644 --- a/buildroot/package/uvw/uvw.mk +++ b/buildroot/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.6.0_libuv-v1.38 +UVW_VERSION = 2.8.0_libuv_v1.40 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO diff --git a/buildroot/package/webkitgtk/webkitgtk.hash b/buildroot/package/webkitgtk/webkitgtk.hash index 1849d9eff..27f0e5a69 100644 --- a/buildroot/package/webkitgtk/webkitgtk.hash +++ b/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.30.3.tar.xz.sums -md5 3db32cffeab82efcade1ce77f94865c2 webkitgtk-2.30.3.tar.xz -sha1 6eed6e8a3c2f47533821169679fe381ceb0550be webkitgtk-2.30.3.tar.xz -sha256 6dea14f03916882816f2fed9497a5103fc54b2ab8602ab145ca991e4951e5e7f webkitgtk-2.30.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.30.4.tar.xz.sums +md5 81c813d77a7b52ef655922f9b387f3a1 webkitgtk-2.30.4.tar.xz +sha1 330f45d7badf944fb01a3238ebb2ceaad8c2a91f webkitgtk-2.30.4.tar.xz +sha256 d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24 webkitgtk-2.30.4.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 0310f058f..73111d383 100644 --- a/buildroot/package/webkitgtk/webkitgtk.mk +++ b/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.30.3 +WEBKITGTK_VERSION = 2.30.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash index 667d8a371..b0e7687e1 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.4.0.txt -sha1 6fdf4f394c287f1e21b48c5293ec1a6e6b627996 wireshark-3.4.0.tar.xz -sha256 67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae wireshark-3.4.0.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.2.txt +sha1 b33276e4e6c3d6a057da3b569b58316330a5f3e3 wireshark-3.4.2.tar.xz +sha256 de9868729e426a469baabd8d444240d84fa5445020e92c842dd19afd0d47a4c4 wireshark-3.4.2.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index 567c8cc11..84dfe7494 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.0 +WIRESHARK_VERSION = 3.4.2 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/wpewebkit/wpewebkit.hash b/buildroot/package/wpewebkit/wpewebkit.hash index 3534abf0e..42bd27f11 100644 --- a/buildroot/package/wpewebkit/wpewebkit.hash +++ b/buildroot/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.30.3.tar.xz.sums -md5 75f6ef1819b182043a25b916272ebec6 wpewebkit-2.30.3.tar.xz -sha1 2ed723f779513205449e0c5b7c080eb19d635aee wpewebkit-2.30.3.tar.xz -sha256 f2dfc1a6279810353f601bb9bd0d8ef671b41b38352d679b93d01631c2bf7b4b wpewebkit-2.30.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.30.4.tar.xz.sums +md5 d423a01ffb5be44e6ad59b2cfb9d6eb3 wpewebkit-2.30.4.tar.xz +sha1 2fdca7b888966ad2ed7d998bef52c9024dae063f wpewebkit-2.30.4.tar.xz +sha256 1e521d85cf8cf344b9fd08eabad7a1d18a330fb7862a77eaf78d7d7b10d5f6ef wpewebkit-2.30.4.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 66f86edf4..d3afdf009 100644 --- a/buildroot/package/wpewebkit/wpewebkit.mk +++ b/buildroot/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.30.3 +WPEWEBKIT_VERSION = 2.30.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES diff --git a/buildroot/package/x11r7/xserver_xorg-server/0007-Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch b/buildroot/package/x11r7/xserver_xorg-server/0007-Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch deleted file mode 100644 index 8297aa8a9..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/0007-Fix-XkbSetDeviceInfo-and-SetDeviceIndicators-heap-ov.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 87c64fc5b0db9f62f4e361444f4b60501ebf67b9 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Sun, 11 Oct 2020 17:05:09 +0200 -Subject: [PATCH] Fix XkbSetDeviceInfo() and SetDeviceIndicators() heap - overflows - -ZDI-CAN 11389 / CVE-2020-25712 - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 8e016cd74..f54cc97f8 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -6536,7 +6536,9 @@ SetDeviceIndicators(char *wire, - unsigned changed, - int num, - int *status_rtrn, -- ClientPtr client, xkbExtensionDeviceNotify * ev) -+ ClientPtr client, -+ xkbExtensionDeviceNotify * ev, -+ xkbSetDeviceInfoReq * stuff) - { - xkbDeviceLedsWireDesc *ledWire; - int i; -@@ -6557,6 +6559,11 @@ SetDeviceIndicators(char *wire, - xkbIndicatorMapWireDesc *mapWire; - XkbSrvLedInfoPtr sli; - -+ if (!_XkbCheckRequestBounds(client, stuff, ledWire, ledWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) ledWire; -+ } -+ - namec = mapc = statec = 0; - sli = XkbFindSrvLedInfo(dev, ledWire->ledClass, ledWire->ledID, - XkbXI_IndicatorMapsMask); -@@ -6575,6 +6582,10 @@ SetDeviceIndicators(char *wire, - memset((char *) sli->names, 0, XkbNumIndicators * sizeof(Atom)); - for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { - if (ledWire->namesPresent & bit) { -+ if (!_XkbCheckRequestBounds(client, stuff, atomWire, atomWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) atomWire; -+ } - sli->names[n] = (Atom) *atomWire; - if (sli->names[n] == None) - ledWire->namesPresent &= ~bit; -@@ -6592,6 +6603,10 @@ SetDeviceIndicators(char *wire, - if (ledWire->mapsPresent) { - for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { - if (ledWire->mapsPresent & bit) { -+ if (!_XkbCheckRequestBounds(client, stuff, mapWire, mapWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) mapWire; -+ } - sli->maps[n].flags = mapWire->flags; - sli->maps[n].which_groups = mapWire->whichGroups; - sli->maps[n].groups = mapWire->groups; -@@ -6671,7 +6686,7 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, - ed.deviceID = dev->id; - wire = (char *) &stuff[1]; - if (stuff->change & XkbXI_ButtonActionsMask) { -- int nBtns, sz, i; -+ int nBtns, sz, i; - XkbAction *acts; - DeviceIntPtr kbd; - -@@ -6683,7 +6698,11 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, - return BadAlloc; - dev->button->xkb_acts = acts; - } -+ if (stuff->firstBtn + stuff->nBtns > nBtns) -+ return BadValue; - sz = stuff->nBtns * SIZEOF(xkbActionWireDesc); -+ if (!_XkbCheckRequestBounds(client, stuff, wire, (char *) wire + sz)) -+ return BadLength; - memcpy((char *) &acts[stuff->firstBtn], (char *) wire, sz); - wire += sz; - ed.reason |= XkbXI_ButtonActionsMask; -@@ -6704,7 +6723,8 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, - int status = Success; - - wire = SetDeviceIndicators(wire, dev, stuff->change, -- stuff->nDeviceLedFBs, &status, client, &ed); -+ stuff->nDeviceLedFBs, &status, client, &ed, -+ stuff); - if (status != Success) - return status; - } --- -2.20.1 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/0008-Check-SetMap-request-length-carefully.patch b/buildroot/package/x11r7/xserver_xorg-server/0008-Check-SetMap-request-length-carefully.patch deleted file mode 100644 index a8b33ebf3..000000000 --- a/buildroot/package/x11r7/xserver_xorg-server/0008-Check-SetMap-request-length-carefully.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 446ff2d3177087b8173fa779fa5b77a2a128988b Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Thu, 12 Nov 2020 19:15:07 +0100 -Subject: [PATCH] Check SetMap request length carefully. - -Avoid out of bounds memory accesses on too short request. - -ZDI-CAN 11572 / CVE-2020-14360 - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 92 insertions(+) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index f54cc97f8..d056c698c 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -2382,6 +2382,93 @@ SetVirtualModMap(XkbSrvInfoPtr xkbi, - return (char *) wire; - } - -+#define _add_check_len(new) \ -+ if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \ -+ else len += new -+ -+/** -+ * Check the length of the SetMap request -+ */ -+static int -+_XkbSetMapCheckLength(xkbSetMapReq *req) -+{ -+ size_t len = sz_xkbSetMapReq, req_len = req->length << 2; -+ xkbKeyTypeWireDesc *keytype; -+ xkbSymMapWireDesc *symmap; -+ BOOL preserve; -+ int i, map_count, nSyms; -+ -+ if (req_len < len) -+ goto bad; -+ /* types */ -+ if (req->present & XkbKeyTypesMask) { -+ keytype = (xkbKeyTypeWireDesc *)(req + 1); -+ for (i = 0; i < req->nTypes; i++) { -+ _add_check_len(XkbPaddedSize(sz_xkbKeyTypeWireDesc)); -+ if (req->flags & XkbSetMapResizeTypes) { -+ _add_check_len(keytype->nMapEntries -+ * sz_xkbKTSetMapEntryWireDesc); -+ preserve = keytype->preserve; -+ map_count = keytype->nMapEntries; -+ if (preserve) { -+ _add_check_len(map_count * sz_xkbModsWireDesc); -+ } -+ keytype += 1; -+ keytype = (xkbKeyTypeWireDesc *) -+ ((xkbKTSetMapEntryWireDesc *)keytype + map_count); -+ if (preserve) -+ keytype = (xkbKeyTypeWireDesc *) -+ ((xkbModsWireDesc *)keytype + map_count); -+ } -+ } -+ } -+ /* syms */ -+ if (req->present & XkbKeySymsMask) { -+ symmap = (xkbSymMapWireDesc *)((char *)req + len); -+ for (i = 0; i < req->nKeySyms; i++) { -+ _add_check_len(sz_xkbSymMapWireDesc); -+ nSyms = symmap->nSyms; -+ _add_check_len(nSyms*sizeof(CARD32)); -+ symmap += 1; -+ symmap = (xkbSymMapWireDesc *)((CARD32 *)symmap + nSyms); -+ } -+ } -+ /* actions */ -+ if (req->present & XkbKeyActionsMask) { -+ _add_check_len(req->totalActs * sz_xkbActionWireDesc -+ + XkbPaddedSize(req->nKeyActs)); -+ } -+ /* behaviours */ -+ if (req->present & XkbKeyBehaviorsMask) { -+ _add_check_len(req->totalKeyBehaviors * sz_xkbBehaviorWireDesc); -+ } -+ /* vmods */ -+ if (req->present & XkbVirtualModsMask) { -+ _add_check_len(XkbPaddedSize(Ones(req->virtualMods))); -+ } -+ /* explicit */ -+ if (req->present & XkbExplicitComponentsMask) { -+ /* two bytes per non-zero explicit componen */ -+ _add_check_len(XkbPaddedSize(req->totalKeyExplicit * sizeof(CARD16))); -+ } -+ /* modmap */ -+ if (req->present & XkbModifierMapMask) { -+ /* two bytes per non-zero modmap component */ -+ _add_check_len(XkbPaddedSize(req->totalModMapKeys * sizeof(CARD16))); -+ } -+ /* vmodmap */ -+ if (req->present & XkbVirtualModMapMask) { -+ _add_check_len(req->totalVModMapKeys * sz_xkbVModMapWireDesc); -+ } -+ if (len == req_len) -+ return Success; -+bad: -+ ErrorF("[xkb] BOGUS LENGTH in SetMap: expected %ld got %ld\n", -+ len, req_len); -+ return BadLength; -+} -+ -+ - /** - * Check if the given request can be applied to the given device but don't - * actually do anything, except swap values when client->swapped and doswap are both true. -@@ -2642,6 +2729,11 @@ ProcXkbSetMap(ClientPtr client) - CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess); - CHK_MASK_LEGAL(0x01, stuff->present, XkbAllMapComponentsMask); - -+ /* first verify the request length carefully */ -+ rc = _XkbSetMapCheckLength(stuff); -+ if (rc != Success) -+ return rc; -+ - tmp = (char *) &stuff[1]; - - /* Check if we can to the SetMap on the requested device. If this --- -2.20.1 - diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 2b55449e1..d6b3c92e0 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-August/003059.html -sha256 e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 xorg-server-1.20.9.tar.bz2 -sha512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 xorg-server-1.20.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2020-December/003067.html +sha256 977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99 xorg-server-1.20.10.tar.bz2 +sha512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae xorg-server-1.20.10.tar.bz2 # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index de9746774..8ac2d17b2 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.9 +XSERVER_XORG_SERVER_VERSION = 1.20.10 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT diff --git a/buildroot/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch b/buildroot/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch new file mode 100644 index 000000000..e4dbdf189 --- /dev/null +++ b/buildroot/package/x11vnc/0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch @@ -0,0 +1,25 @@ +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= +Date: Wed, 18 Nov 2020 08:40:45 +0100 +Subject: [PATCH] scan: limit access to shared memory segments to current user + +[Retrieved from: +https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a] +Signed-off-by: Fabrice Fontaine +--- + src/scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scan.c b/src/scan.c +index 43e00d2..12994d5 100644 +--- a/src/scan.c ++++ b/src/scan.c +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, + + #if HAVE_XSHM + shm->shmid = shmget(IPC_PRIVATE, +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); + + if (shm->shmid == -1) { + rfbErr("shmget(%s) failed.\n", name); diff --git a/buildroot/package/x11vnc/x11vnc.mk b/buildroot/package/x11vnc/x11vnc.mk index 9daf49058..571febfcf 100644 --- a/buildroot/package/x11vnc/x11vnc.mk +++ b/buildroot/package/x11vnc/x11vnc.mk @@ -12,6 +12,8 @@ X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING +# 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch +X11VNC_IGNORE_CVES += CVE-2020-29074 # Source coming from github, no configure included X11VNC_AUTORECONF = YES diff --git a/buildroot/package/xen/xen.hash b/buildroot/package/xen/xen.hash index eb5b18b41..95061c3fc 100644 --- a/buildroot/package/xen/xen.hash +++ b/buildroot/package/xen/xen.hash @@ -1,27 +1,3 @@ # Locally computed -sha256 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035 xen-4.14.0.tar.gz +sha256 cf0d7316ad674491f49b7ef0518cb1d906a2e3bfad639deef0ef2343b119ac0c xen-4.14.1.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING -# https://xenbits.xenproject.org/xsa/advisory-333.html -sha256 8edec914fbdf036fba8cb54a75d3a9b025fac936e0af35512954a2dc2b12a26f xsa333.patch -# https://xenbits.xenproject.org/xsa/advisory-334.html -sha256 323cd9d24b2e95643833865a9943172c56edd25dfd170e4741034d28dfd0d4bd xsa334.patch -# https://xenbits.xenproject.org/xsa/advisory-336.html -sha256 ecb59876fb92cfe0916ed5f3227a30efe038224c1f6ec36bc3706c4e2214552c xsa336.patch -# https://xenbits.xenproject.org/xsa/advisory-337.html -sha256 98c48781dd46bf6ff6cc46246c6c9f2e2be6ec696c0e7918d4b82845588ce04e xsa337-1.patch -sha256 9e8ae24222371379f2ea62e14fcc7f7282e01c356dff230c22c9ab1d2fb941e2 xsa337-2.patch -# https://xenbits.xenproject.org/xsa/advisory-338.html -sha256 7345eac1cbad23b082523e9cbd0331f8a9f16c6e459fb2a686606253f5514c9b xsa338.patch -# https://xenbits.xenproject.org/xsa/advisory-339.html -sha256 b6ffa7671d905aa12498ad64915be3b7cba74ce1c5bf6bce18b1f106ebf6d715 xsa339.patch -# https://xenbits.xenproject.org/xsa/advisory-340.html -sha256 2bb088fcc1f8f79bf5ddb7b4e101cb1db76a343d2fb1cdafb7cd54612e4009da xsa340.patch -# https://xenbits.xenproject.org/xsa/advisory-342.html -sha256 060caee3fb5971fca0f2fbdef622c52d9bc6e0ed9efad33de5b6b504651c2112 xsa342.patch -# https://xenbits.xenproject.org/xsa/advisory-343.html -sha256 d714a542bae9d96b6a061c5a8f754549d699dcfb7bf2a766b721f6bbe33aefd2 xsa343-1.patch -sha256 657c44c8ea13523d2e59776531237bbc20166c9b7c3960e0e9ad381fce927344 xsa343-2.patch -sha256 2b275e3fa559167c1b59e6fd4a20bc4d1df9d9cb0cbd0050a3db9c3d0299b233 xsa343-3.patch -# https://xenbits.xenproject.org/xsa/advisory-344.html -sha256 5f9dbdc48bed502d614a76e5819afa41a72cec603c5a2c9491d73873a991a5ed xsa344-1.patch -sha256 381ca5c51bc120bfd5c742be3988f570abb870c4b75c8a48cf49ae4fa1046d73 xsa344-2.patch diff --git a/buildroot/package/xen/xen.mk b/buildroot/package/xen/xen.mk index 0c3ecbb90..cb1ea23ba 100644 --- a/buildroot/package/xen/xen.mk +++ b/buildroot/package/xen/xen.mk @@ -4,45 +4,8 @@ # ################################################################################ -XEN_VERSION = 4.14.0 +XEN_VERSION = 4.14.1 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) -XEN_PATCH = \ - https://xenbits.xenproject.org/xsa/xsa333.patch \ - https://xenbits.xenproject.org/xsa/xsa334.patch \ - https://xenbits.xenproject.org/xsa/xsa336.patch \ - https://xenbits.xenproject.org/xsa/xsa337/xsa337-1.patch \ - https://xenbits.xenproject.org/xsa/xsa337/xsa337-2.patch \ - https://xenbits.xenproject.org/xsa/xsa338.patch \ - https://xenbits.xenproject.org/xsa/xsa339.patch \ - https://xenbits.xenproject.org/xsa/xsa340.patch \ - https://xenbits.xenproject.org/xsa/xsa342.patch \ - https://xenbits.xenproject.org/xsa/xsa343/xsa343-1.patch \ - https://xenbits.xenproject.org/xsa/xsa343/xsa343-2.patch \ - https://xenbits.xenproject.org/xsa/xsa343/xsa343-3.patch \ - https://xenbits.xenproject.org/xsa/xsa344/xsa344-1.patch \ - https://xenbits.xenproject.org/xsa/xsa344/xsa344-2.patch - -# xsa333.patch -XEN_IGNORE_CVES += CVE-2020-25602 -# xsa334.patch -XEN_IGNORE_CVES += CVE-2020-25598 -# xsa336.patch -XEN_IGNORE_CVES += CVE-2020-25604 -# xsa337-1.patch, xsa337-2.patch -XEN_IGNORE_CVES += CVE-2020-25595 -# xsa338.patch -XEN_IGNORE_CVES += CVE-2020-25597 -# xsa339.patch -XEN_IGNORE_CVES += CVE-2020-25596 -# xsa340.patch -XEN_IGNORE_CVES += CVE-2020-25603 -# xsa342.patch -XEN_IGNORE_CVES += CVE-2020-25600 -# xsa343-1.patch, xsa-343-2.patch, xsa-343-3.patch -XEN_IGNORE_CVES += CVE-2020-25599 -# xsa344-1.patch, xsa344-2.patch -XEN_IGNORE_CVES += CVE-2020-25601 - XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING XEN_DEPENDENCIES = host-acpica host-python3 diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index db2a752c3..753a9bdcd 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2020.11' +RELEASE='2020.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048