diff --git a/buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch b/buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch index b7990b694..561d4851c 100644 --- a/buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch +++ b/buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch @@ -96,10 +96,10 @@ Signed-off-by: Thomas Petazzoni linux/linux.mk | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/buildroot/linux/linux.mk b/buildroot/linux/linux.mk +diff --git a/linux/linux.mk b/buildroot/linux/linux.mk index ae1edbeb..5a1cb42e 100644 ---- a/buildroot/linux/linux.mk -+++ b/buildroot/linux/linux.mk +--- a/linux/linux.mk ++++ b/linux/linux.mk @@ -408,6 +408,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_FB,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO,$(@D)/.config) diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 7dda1c47e..cd7c130cd 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,31 @@ +2020.02.3, released June 3rd, 2020 + + Important / security related fixes. + + Fix various build issues of host packages on hosts using GCC + 10. + + Updated/fixed packages: arm-trusted-firmware, audit, bind, + binutils, bison, clamav, crda, dovecot, dtc, efl, elf2flt, + erlang, fakeroot, ffmpeg, fmc, fmlib, freerdp, gcc, git, + glib-networking, gnupg, leveldb, libexif, libssh2, + libusb-compat, linux-headers, lrzip, ltrace, mariadb, mesa3d, + mp4v2, openldap, openocd, perl, php, prosody, + python-pycryptodomex, python-pyqt5, qemu, rpi-firmware, rustc, + speexdsp, sysrepo, systemd, tremor, vboot-utils, wireshark, + xen + + Removed packages: python-pycrypto + + Issues resolved (http://bugs.uclibc.org): + + #12361: Init system (systemd) kills login on Raspberry Pi Zero + #12656: bison fails to relocate with relocate-sdk.sh + #12671: leveldb won't detect that snappy is present (static.. + #12691: host-rust build fails + #12831: RPI-firmware package: DTB-overlay dependency + + 2020.02.2, released May 12th, 2020 Important / security related fixes. diff --git a/buildroot/Config.in.legacy b/buildroot/Config.in.legacy index b925e563d..e04853aea 100644 --- a/buildroot/Config.in.legacy +++ b/buildroot/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2020.02" +config BR2_PACKAGE_PYTHON_PYCRYPTO + bool "python-pycrypto package removed" + select BR2_LEGACY + help + This package has been removed, use python-pycryptodomex + instead. + config BR2_PACKAGE_JAMVM bool "jamvm removed" select BR2_LEGACY diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index b623d17c8..efe4b0781 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -465,9 +465,6 @@ N: Biagio Montaruli F: board/acmesystems/ F: configs/acmesystems_* -N: Bimal Jacob -F: package/nginx-upload/ - N: Bogdan Radulescu F: package/iftop/ F: package/ncdu/ @@ -482,27 +479,6 @@ N: Carlo Caione F: package/jailhouse/ F: package/sunxi-boards/ -N: Carlos Santos -F: package/busybox/ -F: package/initscripts/ -F: package/intel-microcode/ -F: package/liburiparser/ -F: package/modem-manager/ -F: package/pamtester/ -F: package/pcm-tools/ -F: package/skeleton-custom/ -F: package/skeleton-init-common/ -F: package/skeleton-init-none/ -F: package/skeleton-init-systemd/ -F: package/skeleton-init-sysv/ -F: package/skeleton/ -F: package/sysvinit/ -F: package/util-linux/ -F: package/tpm2-abrmd/ -F: package/tpm2-tools/ -F: package/tpm2-totp/ -F: package/tpm2-tss/ - N: Carsten Schoenert F: package/dvbsnoop/ F: package/libdvbsi/ @@ -660,9 +636,6 @@ F: package/openldap/ N: David du Colombier <0intro@gmail.com> F: package/x264/ -N: David Graziano -F: package/libcsv/ - N: David Lechner F: board/lego/ev3/ F: configs/lego_ev3_defconfig @@ -1203,9 +1176,6 @@ F: package/python-pexpect/ F: package/python-ptyprocess/ F: package/zynq-boot-bin/ -N: Jared Bents -F: package/davici/ - N: Jarkko Sakkinen F: package/quota/ @@ -1610,6 +1580,7 @@ F: package/cgroupfs-mount/ F: package/crda/ F: package/cunit/ F: package/dacapo/ +F: package/davici/ F: package/dnsmasq/ F: package/dosfstools/ F: package/eigen/ @@ -1873,9 +1844,6 @@ F: package/openjpeg/ N: Olivier Singla F: package/shellinabox/ -N: Paresh Chaudhary -F: package/checksec/ - N: Parnell Springmeyer F: package/scrypt/ @@ -2169,7 +2137,6 @@ N: Ryan Barnett F: package/atftp/ F: package/miraclecast/ F: package/python-pyasn/ -F: package/python-pycrypto/ F: package/python-pysnmp/ F: package/python-pysnmp-mibs/ F: package/python-tornado/ @@ -2313,12 +2280,10 @@ F: package/libscrypt/ N: Stephan Hoffmann F: package/cache-calibrator/ F: package/gtest/ +F: package/libhttpserver/ F: package/mtdev/ F: package/mtdev2tuio/ -N: Stephan Hoffmann -F: package/libhttpserver/ - N: Steve Calfee F: package/python-pymysql/ F: package/python-pyratemp/ diff --git a/buildroot/Makefile b/buildroot/Makefile index cd6d66908..2ed455165 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2020.02.2 +export BR2_VERSION := 2020.02.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1589285000 +BR2_VERSION_EPOCH = 1591196000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 index bd5f6cdc7..75f182be6 100644 --- a/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 +++ b/buildroot/board/freescale/common/imx/genimage.cfg.template_imx8 @@ -13,7 +13,7 @@ image boot.vfat { %FILES% } } - size = 32M + size = 64M } image sdcard.img { diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 27f63a87f..37efe8263 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -19,9 +19,11 @@ else ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) # The licensing of custom or from-git versions is unknown. # This is valid only for the official v1.4. +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst endif +endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) diff --git a/buildroot/configs/raspberrypi3_64_defconfig b/buildroot/configs/raspberrypi3_64_defconfig index 148769e9d..1f27957c6 100644 --- a/buildroot/configs/raspberrypi3_64_defconfig +++ b/buildroot/configs/raspberrypi3_64_defconfig @@ -17,7 +17,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/configs/raspberrypi4_64_defconfig b/buildroot/configs/raspberrypi4_64_defconfig index 056b89cec..b14c66d22 100644 --- a/buildroot/configs/raspberrypi4_64_defconfig +++ b/buildroot/configs/raspberrypi4_64_defconfig @@ -17,7 +17,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 3a2218cae..739135548 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

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

List of Examples

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

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

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

The Buildroot user manual

Table of Contents

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

List of Examples

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

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

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 @@ -484,7 +484,7 @@ The first solution is Static using device tablesystem/device_table_dev.txt board/<yourcompany>/<yourproject>/device_table_dev.txt. For more details about the format of the device table file, see - Chapter 23, Makedev syntax documentation. + Chapter 24, Makedev syntax documentation.

  • The second solution is Dynamic using devtmpfs only. devtmpfs is a virtual filesystem inside the Linux kernel that has been @@ -1331,7 +1331,7 @@ If it is passed as a relative path, it is important to note that it is interpreted relative to the main Buildroot source directory, not to the Buildroot output directory.

    Note: If using an br2-external tree from before Buildroot 2016.11, you need to convert it before you can use it with Buildroot 2016.11 onward. See -Section 25.1, “Migrating to 2016.11” for help on doing so.

    Some examples:

    buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig

    From now on, definitions from the /path/to/foo br2-external tree +Section 26.1, “Migrating to 2016.11” for help on doing so.

    Some examples:

    buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig

    From now on, definitions from the /path/to/foo br2-external tree will be used:

    buildroot/ $ make
 buildroot/ $ make legal-info

    We can switch to another br2-external tree at any time:

    buildroot/ $ make BR2_EXTERNAL=/where/we/have/bar xconfig

    We can also use multiple br2-external trees:

    buildroot/ $ make BR2_EXTERNAL=/path/to/foo:/where/we/have/bar menuconfig

    Or disable the usage of any br2-external tree:

    buildroot/ $ make BR2_EXTERNAL= xconfig

    9.2.1. Layout of a br2-external tree

    A br2-external tree must contain at least those three files, described in the following chapters:

    • @@ -1725,7 +1725,7 @@ such changes from there unless you use an explicit fakeroot from the post-build script.

      Instead, Buildroot provides support for so-called permission tables. To use this feature, set config option BR2_ROOTFS_DEVICE_TABLE to a space-separated list of permission tables, regular text files following -the makedev syntax.

      If you are using a static device table (i.e. not using devtmpfs, +the makedev syntax.

      If you are using a static device table (i.e. not using devtmpfs, mdev, or (e)udev) then you can add device nodes using the same syntax, in so-called device tables. To use this feature, set config option BR2_ROOTFS_STATIC_DEVICE_TABLE to a space-separated list of @@ -1737,7 +1737,7 @@ related to a specific application, you should set variables To cover this requirement, Buildroot provides support for so-called users tables. To use this feature, set config option BR2_ROOTFS_USERS_TABLES to a space-separated list of users tables, -regular text files following the makeusers syntax.

      As shown in Section 9.1, “Recommended directory structure”, the recommended location for +regular text files following the makeusers syntax.

      As shown in Section 9.1, “Recommended directory structure”, the recommended location for such files is board/<company>/<boardname>/.

      It should be noted that if the custom users are related to a specific application, you should set variable FOO_USERS in the package’s .mk file instead (see Section 17.5.2, “generic-package reference”).

    9.7. Customization after the images have been created

    While post-build scripts (Section 9.5, “Customizing the generated target filesystem”) are run before @@ -3117,17 +3117,17 @@ because two builds can never be perfectly simultaneous, and because LIBFOO_DEVICES lists the device files to be created by Buildroot when using the static device table. The syntax to use is the makedevs one. You can find some documentation for this syntax in the - Chapter 23, Makedev syntax documentation. This variable is optional. + Chapter 24, Makedev syntax documentation. This variable is optional.

  • LIBFOO_PERMISSIONS lists the changes of permissions to be done at the end of the build process. The syntax is once again the makedevs one. - You can find some documentation for this syntax in the Chapter 23, Makedev syntax documentation. + You can find some documentation for this syntax in the Chapter 24, Makedev syntax documentation. This variable is optional.
  • LIBFOO_USERS lists the users to create for this package, if it installs a program you want to run as a specific user (e.g. as a daemon, or as a cron-job). The syntax is similar in spirit to the makedevs one, and is - described in the Chapter 24, Makeusers syntax documentation. This variable is optional. + described in the Chapter 25, Makeusers syntax documentation. This variable is optional.

  • LIBFOO_LICENSE defines the license (or licenses) under which the package is released. @@ -5452,7 +5452,23 @@ When using the -c command line option,

  • When using without any arguments, it validates the integrity of the DEVELOPERS file and will note WARNINGS for items that don’t match. -

    • Part IV. Appendix

    Chapter 23. Makedev syntax documentation

    The makedev syntax is used in several places in Buildroot to +

    Chapter 23. Release Engineering

    23.1. Releases

    The Buildroot project makes quarterly releases with monthly bugfix +releases. The first release of each year is a long term support +release, LTS.

    • +Quarterly releases: 2020.02, 2020.05, 2020.08, and 2020.11 +
    • +Bugfix releases: 2020.02.1, 2020.02.2, … +
    • +LTS releases: 2020.02, 2021.02, … +

    Releases are supported until the first bugfix release of the next +release, e.g., 2020.05.x is EOL when 2020.08.1 is released.

    LTS releases are supported until the first bugfix release of the next +LTS, e.g., 2020.02.x is supported until 2021.02.1 is released.

    23.2. Development

    Each release cycle consist of two months of development on the master +branch and one month stabilization before the release is made. During +this phase no new features are added to master, only bugfixes.

    The stabilization phase starts with tagging -rc1, and every week until +the release, another release candidate is tagged.

    To handle new features and version bumps during the stabilization phase, +a next branch may be created for these features. Once the current +release has been made, the next branch is merged into master and +the development cycle for the next release continues there.

    Part IV. Appendix

    Chapter 24. Makedev syntax documentation

    The makedev syntax is used in several places in Buildroot to define changes to be made for permissions, or which device files to create and how to create them, in order to avoid calls to mknod.

    This syntax is derived from the makedev utility, and more complete documentation can be found in the package/makedevs/README file.

    It takes the form of a space separated list of fields, one file per @@ -5508,7 +5524,7 @@ you will write :

    /usr/bin/foo f 755 root root - - - - -
 If you want to add the capability cap_sys_admin and cap_net_admin to the
 binary foo, you will write :
    /usr/bin/foo f 755 root root - - - - -
 |xattr cap_sys_admin+eip
-|xattr cap_net_admin+eip

    Chapter 24. Makeusers syntax documentation

    The syntax to create users is inspired by the makedev syntax, above, but +|xattr cap_net_admin+eip

    Chapter 25. Makeusers syntax documentation

    The syntax to create users is inspired by the makedev syntax, above, but is specific to Buildroot.

    The syntax for adding a user is a space-separated list of fields, one user per line; the fields are:

    username

    uid

    group

    gid

    password

    home

    shell

    groups

    comment

    Where:

    • username is the desired user name (aka login name) for the user. @@ -5591,9 +5607,9 @@ main group gid is computed by Buildroot, and will u
    • comment is: Test user -

    Chapter 25. Migrating from older Buildroot versions

    Some versions have introduced backward incompatibilities. This section +

    Chapter 26. Migrating from older Buildroot versions

    Some versions have introduced backward incompatibilities. This section explains those incompatibilities, and for each explains what to do to -complete the migration.

    25.1. Migrating to 2016.11

    Before Buildroot 2016.11, it was possible to use only one br2-external +complete the migration.

    26.1. Migrating to 2016.11

    Before Buildroot 2016.11, it was possible to use only one br2-external tree at once. With Buildroot 2016.11 came the possibility to use more than one simultaneously (for details, see Section 9.2, “Keeping customizations outside of Buildroot”).

    This however means that older br2-external trees are not usable as-is. A minor change has to be made: adding a name to your br2-external tree.

    This can be done very easily in just a few steps:

    • @@ -5605,7 +5621,7 @@ with only ASCII characters from the set [A-Za-z0-9_]BR2_EXTERNAL in your br2-external tree with the new variable: 

      $ find . -type f | xargs sed -i 's/BR2_EXTERNAL/BR2_EXTERNAL_NAME_OF_YOUR_TREE_PATH/g'

    Now, your br2-external tree can be used with Buildroot 2016.11 onward.

    Note: This change makes your br2-external tree incompatible with Buildroot -before 2016.11.

    25.2. Migrating to 2017.08

    Before Buildroot 2017.08, host packages were installed in $(HOST_DIR)/usr +before 2016.11.

    26.2. Migrating to 2017.08

    Before Buildroot 2017.08, host packages were installed in $(HOST_DIR)/usr (with e.g. the autotools' --prefix=$(HOST_DIR)/usr). With Buildroot 2017.08, they are now installed directly in $(HOST_DIR).

    Whenever a package installs an executable that is linked with a library in $(HOST_DIR)/lib, it must have an RPATH pointing to that directory.

    An RPATH pointing to $(HOST_DIR)/usr/lib is no longer accepted.

    \ No newline at end of file diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index 64c19ef7d..eaa72ccc1 100644 Binary files a/buildroot/docs/manual/manual.pdf and b/buildroot/docs/manual/manual.pdf differ diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index 848cba11b..43922619d 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -143,15 +143,19 @@ III. Developer guide 21.7. Using the run-tests framework 22. DEVELOPERS file and get-developers + 23. Release Engineering + + 23.1. Releases + 23.2. Development IV. Appendix - 23. Makedev syntax documentation - 24. Makeusers syntax documentation - 25. Migrating from older Buildroot versions + 24. Makedev syntax documentation + 25. Makeusers syntax documentation + 26. Migrating from older Buildroot versions - 25.1. Migrating to 2016.11 - 25.2. Migrating to 2017.08 + 26.1. Migrating to 2016.11 + 26.2. Migrating to 2017.08 List of Examples @@ -163,13 +167,13 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2020.02.2 manual generated on 2020-05-12 12:18:45 UTC from -git revision 2f7183d131 +Buildroot 2020.02.3 manual generated on 2020-06-03 14:56:43 UTC from +git revision d42f3adaae 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= -2f7183d13133f2ded97fee273bd0cbed10226e4e] file in the Buildroot +d42f3adaae24a6aa3abc2de4f39fa8023f971d31] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers @@ -878,7 +882,7 @@ different solutions to handle the /dev directory : BR2_ROOTFS_STATIC_DEVICE_TABLE to system/device_table_dev.txt board///device_table_dev.txt. For more details about the format of the device table file, see - Chapter 23, Makedev syntax documentation. + Chapter 24, Makedev syntax documentation. * The second solution is Dynamic using devtmpfs only. devtmpfs is a virtual filesystem inside the Linux kernel that has been introduced in kernel 2.6.32 (if you use an older kernel, it is @@ -2173,7 +2177,7 @@ directory, not to the Buildroot output directory. Note: If using an br2-external tree from before Buildroot 2016.11, you need to convert it before you can use it with Buildroot 2016.11 -onward. See Section 25.1, “Migrating to 2016.11” for help on doing +onward. See Section 26.1, “Migrating to 2016.11” for help on doing so. Some examples: @@ -3470,6 +3474,10 @@ Table of Contents 21.7. Using the run-tests framework 22. DEVELOPERS file and get-developers +23. Release Engineering + + 23.1. Releases + 23.2. Development Chapter 14. How Buildroot works @@ -4595,17 +4603,17 @@ information is (assuming the package name is libfoo) : * LIBFOO_DEVICES lists the device files to be created by Buildroot when using the static device table. The syntax to use is the makedevs one. You can find some documentation for this syntax in - the Chapter 23, Makedev syntax documentation. This variable is + the Chapter 24, Makedev syntax documentation. This variable is optional. * LIBFOO_PERMISSIONS lists the changes of permissions to be done at the end of the build process. The syntax is once again the makedevs one. You can find some documentation for this syntax in - the Chapter 23, Makedev syntax documentation. This variable is + the Chapter 24, Makedev syntax documentation. This variable is optional. * LIBFOO_USERS lists the users to create for this package, if it installs a program you want to run as a specific user (e.g. as a daemon, or as a cron-job). The syntax is similar in spirit to the - makedevs one, and is described in the Chapter 24, Makeusers + makedevs one, and is described in the Chapter 25, Makeusers syntax documentation. This variable is optional. * LIBFOO_LICENSE defines the license (or licenses) under which the package is released. This name will appear in the manifest file @@ -7814,18 +7822,50 @@ DEVELOPERS file for various tasks: the DEVELOPERS file and will note WARNINGS for items that don’t match. +Chapter 23. Release Engineering + +23.1. Releases + +The Buildroot project makes quarterly releases with monthly bugfix +releases. The first release of each year is a long term support +release, LTS. + + * Quarterly releases: 2020.02, 2020.05, 2020.08, and 2020.11 + * Bugfix releases: 2020.02.1, 2020.02.2, … + * LTS releases: 2020.02, 2021.02, … + +Releases are supported until the first bugfix release of the next +release, e.g., 2020.05.x is EOL when 2020.08.1 is released. + +LTS releases are supported until the first bugfix release of the next +LTS, e.g., 2020.02.x is supported until 2021.02.1 is released. + +23.2. Development + +Each release cycle consist of two months of development on the master +branch and one month stabilization before the release is made. During +this phase no new features are added to master, only bugfixes. + +The stabilization phase starts with tagging -rc1, and every week +until the release, another release candidate is tagged. + +To handle new features and version bumps during the stabilization +phase, a next branch may be created for these features. Once the +current release has been made, the next branch is merged into master +and the development cycle for the next release continues there. + Part IV. Appendix Table of Contents -23. Makedev syntax documentation -24. Makeusers syntax documentation -25. Migrating from older Buildroot versions +24. Makedev syntax documentation +25. Makeusers syntax documentation +26. Migrating from older Buildroot versions - 25.1. Migrating to 2016.11 - 25.2. Migrating to 2017.08 + 26.1. Migrating to 2016.11 + 26.2. Migrating to 2017.08 -Chapter 23. Makedev syntax documentation +Chapter 24. Makedev syntax documentation The makedev syntax is used in several places in Buildroot to define changes to be made for permissions, or which device files to create @@ -7914,7 +7954,7 @@ cap_net_admin to the binary foo, you will write : |xattr cap_sys_admin+eip |xattr cap_net_admin+eip -Chapter 24. Makeusers syntax documentation +Chapter 25. Makeusers syntax documentation The syntax to create users is inspired by the makedev syntax, above, but is specific to Buildroot. @@ -7999,13 +8039,13 @@ This will create this user: * test is not a member of any additional groups * comment is: Test user -Chapter 25. Migrating from older Buildroot versions +Chapter 26. Migrating from older Buildroot versions Some versions have introduced backward incompatibilities. This section explains those incompatibilities, and for each explains what to do to complete the migration. -25.1. Migrating to 2016.11 +26.1. Migrating to 2016.11 Before Buildroot 2016.11, it was possible to use only one br2-external tree at once. With Buildroot 2016.11 came the @@ -8038,7 +8078,7 @@ onward. Note: This change makes your br2-external tree incompatible with Buildroot before 2016.11. -25.2. Migrating to 2017.08 +26.2. Migrating to 2017.08 Before Buildroot 2017.08, host packages were installed in $(HOST_DIR) /usr (with e.g. the autotools' --prefix=$(HOST_DIR)/usr). With diff --git a/buildroot/docs/manual/manual.txt b/buildroot/docs/manual/manual.txt index b76ab40d4..48de65ee1 100644 --- a/buildroot/docs/manual/manual.txt +++ b/buildroot/docs/manual/manual.txt @@ -66,6 +66,8 @@ include::contribute.txt[] include::developers.txt[] +include::release-engineering.txt[] + = Appendix include::appendix.txt[] diff --git a/buildroot/docs/manual/release-engineering.txt b/buildroot/docs/manual/release-engineering.txt new file mode 100644 index 000000000..0cf38183f --- /dev/null +++ b/buildroot/docs/manual/release-engineering.txt @@ -0,0 +1,34 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +[[RELENG]] +== Release Engineering +=== Releases + +The Buildroot project makes quarterly releases with monthly bugfix +releases. The first release of each year is a long term support +release, LTS. + + - Quarterly releases: 2020.02, 2020.05, 2020.08, and 2020.11 + - Bugfix releases: 2020.02.1, 2020.02.2, ... + - LTS releases: 2020.02, 2021.02, ... + +Releases are supported until the first bugfix release of the next +release, e.g., 2020.05.x is EOL when 2020.08.1 is released. + +LTS releases are supported until the first bugfix release of the next +LTS, e.g., 2020.02.x is supported until 2021.02.1 is released. + +=== Development + +Each release cycle consist of two months of development on the +master+ +branch and one month stabilization before the release is made. During +this phase no new features are added to +master+, only bugfixes. + +The stabilization phase starts with tagging +-rc1+, and every week until +the release, another release candidate is tagged. + +To handle new features and version bumps during the stabilization phase, +a +next+ branch may be created for these features. Once the current +release has been made, the +next+ branch is merged into +master+ and +the development cycle for the next release continues there. diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index 8b8776771..4d18038e9 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.4.40" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.4.43" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.118-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.115-cip24-rt9" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index ed76f6804..8c0a7a813 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,10 +1,10 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 83563f027687ecaafb41d0d2d52056f40ec9822f8a9e43592e215349730020ab linux-5.4.40.tar.xz +sha256 2667b90a42d42557aca9e3d37bba1b4e71809b9523958e6870ada311c4790744 linux-5.4.43.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 cd963e66d7fb07f142fa5274ec90f46c8388a327e2ba28c5fec245d734b0d425 linux-4.4.223.tar.xz -sha256 cf5300e6f5d8c66c2bed8f00d53f9c58103731809862427012e4010f5d782ae5 linux-4.9.223.tar.xz -sha256 444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e linux-4.14.180.tar.xz -sha256 5050268ec5cf003d96366d1611ecfa4ab6974125d6fa26cea1ccb81dd4df00a5 linux-4.19.122.tar.xz +sha256 49474956a6149c16cbcba862d1f4db54835a32d336063c75094f669f1c34c65e linux-4.4.225.tar.xz +sha256 e547748c548b0f55f665bc78cfec322e7b96f41527b5e4b5d79430fdaa57c3e8 linux-4.9.225.tar.xz +sha256 671d1f1d5ad0ae74fb21ee70a5544400e7d6270098d3f8b134484ded2c3e5b90 linux-4.14.182.tar.xz +sha256 9843f40efb37491770688810d153d0779daed8eb097773a0de5abf2cb0d1bd7e linux-4.19.125.tar.xz # Locally computed sha256 ea53913813cb5a9069608532b327de7a7ed0fdc8fed8c6f10cd55d1ac6a58ffb linux-cip-4.19.118-cip25.tar.gz sha256 7f0a0db0e1cfb14053523f4432f1ad1468b5bd42305b44905c4b103466c8d655 linux-cip-4.19.115-cip24-rt9.tar.gz diff --git a/buildroot/package/Config.in b/buildroot/package/Config.in index edf7687ab..c328d9f15 100644 --- a/buildroot/package/Config.in +++ b/buildroot/package/Config.in @@ -1053,7 +1053,6 @@ menu "External python modules" source "package/python-pycares/Config.in" source "package/python-pycli/Config.in" source "package/python-pycparser/Config.in" - source "package/python-pycrypto/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" diff --git a/buildroot/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch b/buildroot/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch new file mode 100644 index 000000000..9a546261d --- /dev/null +++ b/buildroot/package/audit/0003-Header-definitions-need-to-be-external-when-building.patch @@ -0,0 +1,28 @@ +From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001 +From: Steve Grubb +Date: Fri, 10 Jan 2020 21:13:50 -0500 +Subject: [PATCH] Header definitions need to be external when building with + -fno-common (which is default in GCC 10) - Tony Jones + +Patch taken from upstream: https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f +Signed-off-by: Heiko Thiery +--- + src/ausearch-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ausearch-common.h b/src/ausearch-common.h +index 6669203..3040547 100644 +--- a/src/ausearch-common.h ++++ b/src/ausearch-common.h +@@ -50,7 +50,7 @@ extern pid_t event_pid; + extern int event_exact_match; + extern uid_t event_uid, event_euid, event_loginuid; + extern const char *event_tuid, *event_teuid, *event_tauid; +-slist *event_node_list; ++extern slist *event_node_list; + extern const char *event_comm; + extern const char *event_filename; + extern const char *event_hostname; +-- +2.20.1 + diff --git a/buildroot/package/bind/bind.hash b/buildroot/package/bind/bind.hash index 53b5ce3a4..4eb3aff3b 100644 --- a/buildroot/package/bind/bind.hash +++ b/buildroot/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.13/bind-9.11.13.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.11.19/bind-9.11.19.tar.gz.asc # with key AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38 -sha256 fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d bind-9.11.13.tar.gz -sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT +sha256 0dee554a4caa368948b32da9a0c97b516c19103bc13ff5b3762c5d8552f52329 bind-9.11.19.tar.gz +sha256 da2aec2b7f6f0feb16bcb080e2c587375fd3195145f047e4d92d112f5b9db501 COPYRIGHT diff --git a/buildroot/package/bind/bind.mk b/buildroot/package/bind/bind.mk index 89d83d4d5..362a26dce 100644 --- a/buildroot/package/bind/bind.mk +++ b/buildroot/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.13 +BIND_VERSION = 9.11.19 BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) diff --git a/buildroot/package/binutils/binutils.mk b/buildroot/package/binutils/binutils.mk index 876c9c59f..81308e2e8 100644 --- a/buildroot/package/binutils/binutils.mk +++ b/buildroot/package/binutils/binutils.mk @@ -112,6 +112,7 @@ endef ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif diff --git a/buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch b/buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch new file mode 100644 index 000000000..f40c39c55 --- /dev/null +++ b/buildroot/package/bison/0001-src-make-path-to-m4-relocatable.patch @@ -0,0 +1,70 @@ +From 50c8a3af1661c3950b9743d673fd46872860aa08 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 18 May 2020 07:53:20 +0200 +Subject: [PATCH] src: make path to m4 relocatable + +Commit a4ede8f85b0c9a254fcb01e5888cee1983095669 ("package: make bison +a relocatable package") made Bison relocatable, but in fact it still +contains one absolute reference: the M4 variable, which points to the +M4 program. Let's fix that by using relocate(). + +We don't use relocate2() to store the temporary buffer and re-use it, +because m4path() is only called once. + +Upstream: submitted to the bison-patches@gnu.org mailing list +https://lists.gnu.org/archive/html/bison-patches/2020-05/msg00078.html +Signed-off-by: Thomas Petazzoni +--- + src/files.c | 7 +++++++ + src/files.h | 3 +++ + src/output.c | 2 +- + 3 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/files.c b/src/files.c +index 71c10e34..b8b43230 100644 +--- a/src/files.c ++++ b/src/files.c +@@ -421,6 +421,13 @@ pkgdatadir (void) + } + } + ++char const * ++m4path (void) ++{ ++ char const *m4 = getenv("M4"); ++ return m4 ? m4 : relocate(M4); ++} ++ + void + output_file_names_free (void) + { +diff --git a/src/files.h b/src/files.h +index 00814ad0..64b6f8b5 100644 +--- a/src/files.h ++++ b/src/files.h +@@ -64,6 +64,9 @@ extern char *all_but_ext; + /* Where our data files are installed. */ + char const *pkgdatadir (void); + ++/* Where the m4 program is installed. */ ++char const *m4path (void); ++ + void compute_output_file_names (void); + void output_file_names_free (void); + +diff --git a/src/output.c b/src/output.c +index 1871fd75..ebe75095 100644 +--- a/src/output.c ++++ b/src/output.c +@@ -682,7 +682,7 @@ static void + output_skeleton (void) + { + /* Compute the names of the package data dir and skeleton files. */ +- char const *m4 = (m4 = getenv ("M4")) ? m4 : M4; ++ char const *m4 = m4path (); + char const *datadir = pkgdatadir (); + char *skeldir = xpath_join (datadir, "skeletons"); + char *m4sugar = xpath_join (datadir, "m4sugar/m4sugar.m4"); +-- +2.26.2 + diff --git a/buildroot/package/bison/bison.mk b/buildroot/package/bison/bison.mk index 2174a9061..4cc635c44 100644 --- a/buildroot/package/bison/bison.mk +++ b/buildroot/package/bison/bison.mk @@ -12,5 +12,6 @@ BISON_LICENSE_FILES = COPYING # parallel build issue in examples/c/reccalc/ BISON_MAKE = $(MAKE1) HOST_BISON_DEPENDENCIES = host-m4 +HOST_BISON_CONF_OPTS = --enable-relocatable $(eval $(host-autotools-package)) diff --git a/buildroot/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash index 613d9b412..f98dc6b32 100644 --- a/buildroot/package/clamav/clamav.hash +++ b/buildroot/package/clamav/clamav.hash @@ -1,14 +1,14 @@ # Locally calculated -sha256 89fcdcc0eba329ca84d270df09d2bb89ae55f5024b0c3bddb817512fb2c907d3 clamav-0.102.2.tar.gz -sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING -sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 -sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file -sha256 6dce638b76399e7521ad8e182d3e33e4496c85b3b69b6ff434b53017101e82ad COPYING.getopt -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LGPL -sha256 e3a9b913515a42f8ff3ef1551c3a2cdba383c39ed959729e0e2911219496ad74 COPYING.llvm -sha256 d96d71b66aa32c4a2d1619b9ca3347dafa9460bcf0fb5ac2408916067ad31dfc COPYING.lzma -sha256 accdcf2455c07b99abea59016b3663eaef926a92092d103bfaa25fed27cf6b24 COPYING.pcre -sha256 e2c1395a3d9fea6d5d25847c9d783db6e2cc8b085b4025861f459139c5dfd90b COPYING.regex -sha256 1faccc6b5c7b958fb807a3f573d5be9bf7889fe898f7e0617c544b05a81bfd00 COPYING.unrar -sha256 a20d6317c5384e8d4c05f9c31097878675d9429ec46090656166039cc10bc957 COPYING.YARA -sha256 c2f77553f8d870c5635b0dace0519253233f172b33ce1fdf6578610706294eee COPYING.zlib +sha256 ed3050c4569989ee7ab54c7b87246b41ed808259632849be0706467442dc0693 clamav-0.102.3.tar.gz +sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING +sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 +sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file +sha256 6dce638b76399e7521ad8e182d3e33e4496c85b3b69b6ff434b53017101e82ad COPYING.getopt +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LGPL +sha256 e3a9b913515a42f8ff3ef1551c3a2cdba383c39ed959729e0e2911219496ad74 COPYING.llvm +sha256 d96d71b66aa32c4a2d1619b9ca3347dafa9460bcf0fb5ac2408916067ad31dfc COPYING.lzma +sha256 accdcf2455c07b99abea59016b3663eaef926a92092d103bfaa25fed27cf6b24 COPYING.pcre +sha256 e2c1395a3d9fea6d5d25847c9d783db6e2cc8b085b4025861f459139c5dfd90b COPYING.regex +sha256 1faccc6b5c7b958fb807a3f573d5be9bf7889fe898f7e0617c544b05a81bfd00 COPYING.unrar +sha256 a20d6317c5384e8d4c05f9c31097878675d9429ec46090656166039cc10bc957 COPYING.YARA +sha256 c2f77553f8d870c5635b0dace0519253233f172b33ce1fdf6578610706294eee COPYING.zlib diff --git a/buildroot/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk index b8d7de52f..eec18fcc0 100644 --- a/buildroot/package/clamav/clamav.mk +++ b/buildroot/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.102.2 +CLAMAV_VERSION = 0.102.3 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ diff --git a/buildroot/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/buildroot/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch index fb46d58ed..f2b9cca2d 100644 --- a/buildroot/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch +++ b/buildroot/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch @@ -1,11 +1,11 @@ -From 4c346aa9e816bddfedc8ac99809fd1ed91bfc8ee Mon Sep 17 00:00:00 2001 +From 8228c484a1533ff904b276c342adcb6310abe272 Mon Sep 17 00:00:00 2001 From: Taahir Ahmed Date: Wed, 30 Mar 2016 11:23:54 -0300 Subject: [PATCH] crda: support python 3 in utils/key2pub.py utils/key2pub.py can now be run under either python 2.7 or python 3.x. This required some minor syntactical changes as well as switching from -M2Crypto to pycrypto, since M2Crypto doesn't support python 3.x. +M2Crypto to pycryptodomex, since M2Crypto doesn't support python 3.x. In addition, some errors in the generated source file keys-ssl.h are fixed: @@ -17,12 +17,22 @@ fixed: [Gustavo: don't call /utils/key2pub.py since that doesn't compute] +Use pycryptodomex insdead of pycrypto + +From [1]: +"PyCryptodome is a fork of PyCrypto, which is not maintained any more +(the last release dates back to 2013 [2]). It exposes almost the same +API, but there are a few incompatibilities [3]." + +[1] https://github.com/OP-TEE/optee_os/commit/90ad2450436fdd9fc0d28a3f92f3fbcfd89a38f0 +[2] https://pypi.org/project/pycrypto/#history +[3] https://pycryptodome.readthedocs.io/en/latest/src/vs_pycrypto.html + Signed-off-by: Gustavo Zacarias [Rebased against crda-4.14] Signed-off-by: Peter Seiderer ---- -Status: submitted upstream by author but not (yet) accepted -URL: http://www.spinics.net/lists/linux-wireless/msg138936.html +[Romain: Use pycryptodomex] +Signed-off-by: Romain Naour --- Makefile | 2 +- utils/key2pub.py | 146 ++++++++++++++++++++++++----------------------- @@ -42,7 +52,7 @@ index a3ead30..8da38d0 100644 $(LIBREG): regdb.h reglib.h reglib.c $(NQ) ' CC ' $@ diff --git a/utils/key2pub.py b/utils/key2pub.py -index 9bb04cd..9f92ebd 100755 +index 9bb04cd..8a0ba2a 100755 --- a/utils/key2pub.py +++ b/utils/key2pub.py @@ -1,126 +1,128 @@ @@ -57,11 +67,11 @@ index 9bb04cd..9f92ebd 100755 - sys.stderr.write('Please install the "M2Crypto" Python module.\n') - sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') - sys.exit(1) -+ from Crypto.PublicKey import RSA ++ from Cryptodome.PublicKey import RSA +except ImportError as e: -+ sys.stderr.write('ERROR: Failed to import the "Crypto.PublicKey" module: %s\n' % e.message) -+ sys.stderr.write('Please install the "Crypto.PublicKey" Python module.\n') -+ sys.stderr.write('On Debian GNU/Linux the package is called "python-crypto".\n') ++ sys.stderr.write('ERROR: Failed to import the "Cryptodome.PublicKey" module: %s\n' % e.message) ++ sys.stderr.write('Please install the "Cryptodome.PublicKey" Python module.\n') ++ sys.stderr.write('On Debian GNU/Linux the package is called "python-cryptodomex".\n') + sys.exit(1) + +def bitwise_collect(value, radix_bits): @@ -269,5 +279,5 @@ index 9bb04cd..9f92ebd 100755 modes[mode][1](output, idx - 1) -- -2.18.0 +2.25.3 diff --git a/buildroot/package/crda/crda.mk b/buildroot/package/crda/crda.mk index eb43a7d77..c5880797b 100644 --- a/buildroot/package/crda/crda.mk +++ b/buildroot/package/crda/crda.mk @@ -6,7 +6,7 @@ CRDA_VERSION = 4.14 CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot -CRDA_DEPENDENCIES = host-pkgconf host-python-pycrypto libnl libgcrypt +CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE diff --git a/buildroot/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch b/buildroot/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch deleted file mode 100644 index b6d3ed3ec..000000000 --- a/buildroot/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 902917880ca29f1007750a70cf46e7246b2d0a2a Mon Sep 17 00:00:00 2001 -From: Josef 'Jeff' Sipek -Date: Tue, 14 Nov 2017 06:01:21 +0100 -Subject: [PATCH] byteorder.h: fix uclibc build - -Patch suggested on upstream mailinglist: -https://www.dovecot.org/pipermail/dovecot/2017-November/110019.html - -Signed-off-by: Bernd Kuhls ---- - src/lib/byteorder.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/lib/byteorder.h b/src/lib/byteorder.h -index 2f5dc7c17..4ffe8da21 100644 ---- a/src/lib/byteorder.h -+++ b/src/lib/byteorder.h -@@ -23,6 +23,11 @@ - #ifndef BYTEORDER_H - #define BYTEORDER_H - -+#undef bswap_8 -+#undef bswap_16 -+#undef bswap_32 -+#undef bswap_64 -+ - /* - * These prototypes exist to catch bugs in the code generating macros below. - */ --- -2.11.0 - diff --git a/buildroot/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch b/buildroot/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch deleted file mode 100644 index 686ed7383..000000000 --- a/buildroot/package/dovecot/0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 40851dc3471809cabe8cc3f9b71980f8d82344ae Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 4 Jan 2020 14:39:39 +0100 -Subject: [PATCH] lib-ssl-iostream: Do not build static test-iostream-ssl - -Fixes broken static build: -https://dovecot.org/pipermail/dovecot/2019-October/117326.html - -Patch sent upstream: https://github.com/dovecot/core/pull/111 - -Signed-off-by: Bernd Kuhls ---- - src/lib-ssl-iostream/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am -index 94ead5cec..5aaea5d51 100644 ---- a/src/lib-ssl-iostream/Makefile.am -+++ b/src/lib-ssl-iostream/Makefile.am -@@ -46,7 +46,6 @@ test_libs = \ - ../lib/liblib.la - - test_iostream_ssl_SOURCES = test-iostream-ssl.c --test_iostream_ssl_LDFLAGS = -static - test_iostream_ssl_LDADD = $(test_libs) $(SSL_LIBS) $(DLLIB) - test_iostream_ssl_DEPENDENCIES = $(test_libs) - --- -2.20.1 - diff --git a/buildroot/package/dovecot/dovecot.hash b/buildroot/package/dovecot/dovecot.hash index e61937495..09295816d 100644 --- a/buildroot/package/dovecot/dovecot.hash +++ b/buildroot/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 f89fb69423fc5bdc05955c8fc0607eab9e33511f9a643b721763db6156c49651 dovecot-2.3.9.3.tar.gz -sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT +sha256 6642e62f23b1b23cfac235007ca6e21cb67460cca834689fad450724456eb10c dovecot-2.3.10.1.tar.gz +sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/buildroot/package/dovecot/dovecot.mk b/buildroot/package/dovecot/dovecot.mk index 9f89ce635..59b52a3f8 100644 --- a/buildroot/package/dovecot/dovecot.mk +++ b/buildroot/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).9.3 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).10.1 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 @@ -14,8 +14,6 @@ DOVECOT_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ openssl -# 0002-lib-ssl-iostream-Do-not-build-static-test-iostream-s.patch -DOVECOT_AUTORECONF = YES # add host-gettext for AM_ICONV macro DOVECOT_DEPENDENCIES += host-gettext diff --git a/buildroot/package/dtc/dtc.hash b/buildroot/package/dtc/dtc.hash index e4d6c0254..902ce1baf 100644 --- a/buildroot/package/dtc/dtc.hash +++ b/buildroot/package/dtc/dtc.hash @@ -1,7 +1,7 @@ # from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc -sha256 660b74039690fc37013660544d09191834efb58503c73c555c5513ba75ab031f dtc-1.5.1.tar.xz +sha256 10503b0217e1b07933e29e8d347a00015b2431bea5f59afe0bed3af30340c82d dtc-1.6.0.tar.xz # Hash for license files -sha256 78e1e1ce5728a990d59c7de61d4741c49185d5129daf783b386380a214328d68 README.license -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL -sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause +sha256 78e1e1ce5728a990d59c7de61d4741c49185d5129daf783b386380a214328d68 README.license +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause diff --git a/buildroot/package/dtc/dtc.mk b/buildroot/package/dtc/dtc.mk index d532487dd..956a60b29 100644 --- a/buildroot/package/dtc/dtc.mk +++ b/buildroot/package/dtc/dtc.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTC_VERSION = 1.5.1 +DTC_VERSION = 1.6.0 DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library) diff --git a/buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch b/buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch new file mode 100644 index 000000000..1b54bfdf0 --- /dev/null +++ b/buildroot/package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch @@ -0,0 +1,222 @@ +From c245b576aad09ac5faeb800de7f7c4fef87c6363 Mon Sep 17 00:00:00 2001 +From: Tom Callaway +Date: Fri, 31 Jan 2020 12:40:45 +0000 +Subject: [PATCH] Fix build with gcc 10 (which has -fno-common enabled by + default). + +EFL failed to build from source in Fedora Rawhide as a result of the update to GCC 10. GCC 10 enables -fno-common by default, and this found three issues in EFL: + + # The eina benchmark code defined int key_size in a header that was included in multiple places. + #/usr/bin/ld: bin/elementary/elementary_test-test_ui_clock.o:(.bss.dt1+0x0): multiple definition of `dt1'; bin/elementary/elementary_test-test_datetime.o:(.bss.dt1+0x0): first defined here + The elementary test code defines the "dt1", "dt2", "dt3" vars in two code files which are compiled together (but these variables do not appear to be used globally) + # The eio test code defines the "ee" var in two code files which are compiled together (but this variable does not appear to be used globally) + +I've fixed these issues and confirmed locally that the code builds again in Fedora. + +Reviewed-by: Marcel Hollerbach +Differential Revision: https://phab.enlightenment.org/D11259 + +Patch taken from upstream: https://github.com/Enlightenment/efl/commit/c245b576aad09ac5faeb800de7f7c4fef87c6363 +Signed-off-by: Heiko Thiery +--- + src/benchmarks/eina/eina_bench.h | 2 +- + src/benchmarks/eina/eina_bench_crc_hash.c | 1 + + src/bin/elementary/test_ui_clock.c | 90 +++++++++++------------ + src/tests/eio/eio_test_map.c | 10 +-- + 4 files changed, 52 insertions(+), 51 deletions(-) + +diff --git a/src/benchmarks/eina/eina_bench.h b/src/benchmarks/eina/eina_bench.h +index a38d70433e..747ac6f39f 100644 +--- a/src/benchmarks/eina/eina_bench.h ++++ b/src/benchmarks/eina/eina_bench.h +@@ -21,7 +21,7 @@ + + #include "eina_benchmark.h" + +-int key_size; ++extern int key_size; + + void eina_bench_hash(Eina_Benchmark *bench); + void eina_bench_crc_hash_short(Eina_Benchmark *bench); +diff --git a/src/benchmarks/eina/eina_bench_crc_hash.c b/src/benchmarks/eina/eina_bench_crc_hash.c +index b6734489a3..7750233ed4 100644 +--- a/src/benchmarks/eina/eina_bench_crc_hash.c ++++ b/src/benchmarks/eina/eina_bench_crc_hash.c +@@ -26,6 +26,7 @@ + uint64_t CityHash64(const char *buf, size_t len); + #endif + ++int key_size; + char *key_str=NULL; + + void repchar(int n) +diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c +index 79e9074ead..9973b25cd3 100644 +--- a/src/bin/elementary/test_ui_clock.c ++++ b/src/bin/elementary/test_ui_clock.c +@@ -6,7 +6,7 @@ + + /* A simple test, just displaying clock in its default format */ + +-Evas_Object *dt1, *dt2, *dt3, *dt4; ++Evas_Object *uicdt1, *uicdt2, *uicdt3, *uicdt4; + + static void + _changed_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) +@@ -28,19 +28,19 @@ _bt_clicked(void *data EINA_UNUSED, const Efl_Event *ev) + new_time.tm_mday = 26; + new_time.tm_hour = 9; + new_time.tm_min = 0; +- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE); +- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE); +- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); +- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); +- efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); +- efl_ui_clock_time_set(dt1, new_time); +- +- elm_object_disabled_set(dt1, EINA_TRUE); ++ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_HOUR, EINA_TRUE); ++ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_MINUTE, EINA_TRUE); ++ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); ++ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); ++ efl_ui_clock_field_visible_set(uicdt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); ++ efl_ui_clock_time_set(uicdt1, new_time); ++ ++ elm_object_disabled_set(uicdt1, EINA_TRUE); + elm_object_disabled_set(ev->object, EINA_TRUE); + +- efl_del(dt2); +- efl_del(dt3); +- dt2 = dt3 = NULL; ++ efl_del(uicdt2); ++ efl_del(uicdt3); ++ uicdt2 = uicdt3 = NULL; + } + + void +@@ -56,33 +56,33 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ + efl_content_set(win, efl_added), + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240))); + +- dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, +- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), +- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE), +- efl_ui_clock_pause_set(efl_added, EINA_TRUE), +- efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), +- efl_pack(bx, efl_added)); +- +- dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, +- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), +- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), +- efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), +- efl_ui_clock_pause_set(efl_added, EINA_TRUE), +- efl_pack(bx, efl_added)); +- elm_object_disabled_set(dt2, EINA_TRUE); +- +- dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, +- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), +- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), +- efl_pack(bx, efl_added)); ++ uicdt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, ++ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), ++ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DAY, EINA_FALSE), ++ efl_ui_clock_pause_set(efl_added, EINA_TRUE), ++ efl_event_callback_add(efl_added, EFL_UI_CLOCK_EVENT_CHANGED, _changed_cb, NULL), ++ efl_pack(bx, efl_added)); ++ ++ uicdt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, ++ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), ++ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), ++ efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_SECOND, EINA_FALSE), ++ efl_ui_clock_pause_set(efl_added, EINA_TRUE), ++ efl_pack(bx, efl_added)); ++ elm_object_disabled_set(uicdt2, EINA_TRUE); ++ ++ uicdt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, ++ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), ++ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), ++ efl_pack(bx, efl_added)); + + efl_add(EFL_UI_TEXTBOX_CLASS, bx, + efl_text_set(efl_added, "Editable Clock:"), +@@ -92,12 +92,12 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ + efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 25)), + efl_pack(bx, efl_added)); + +- dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, +- efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), +- efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), +- efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), +- efl_ui_clock_pause_set(efl_added, EINA_TRUE), +- efl_pack(bx, efl_added)); ++ uicdt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, ++ efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), ++ efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), ++ efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), ++ efl_ui_clock_pause_set(efl_added, EINA_TRUE), ++ efl_pack(bx, efl_added)); + + efl_add(EFL_UI_BUTTON_CLASS, win, + efl_text_set(efl_added, "Back to the future..."), +diff --git a/src/tests/eio/eio_test_map.c b/src/tests/eio/eio_test_map.c +index fdb0631a9d..f794f73d73 100644 +--- a/src/tests/eio/eio_test_map.c ++++ b/src/tests/eio/eio_test_map.c +@@ -14,7 +14,7 @@ + + #include "eio_suite.h" + +-Eina_File *ee; ++Eina_File *eie; + + static void + _done_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED) +@@ -25,7 +25,7 @@ _done_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED) + static void + _open_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, Eina_File *ef) + { +- ee = ef; ++ eie = ef; + ecore_main_loop_quit(); + } + +@@ -70,17 +70,17 @@ EFL_START_TEST(eio_test_map_simple) + ecore_main_loop_begin(); + fail_if(!ef); + +- ef = eio_file_map_all(ee, EINA_FILE_POPULATE, _filter_cb, _map_cb, ++ ef = eio_file_map_all(eie, EINA_FILE_POPULATE, _filter_cb, _map_cb, + _error_cb, data); + ecore_main_loop_begin(); + fail_if(!ef); + +- ef = eio_file_map_new(ee, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb, ++ ef = eio_file_map_new(eie, EINA_FILE_WILLNEED, 0, strlen(data), _filter_cb, + _map_cb, _error_cb, data); + ecore_main_loop_begin(); + fail_if(!ef); + +- ef = eio_file_close(ee, _done_cb, _error_cb, NULL); ++ ef = eio_file_close(eie, _done_cb, _error_cb, NULL); + ecore_main_loop_begin(); + fail_if(!ef); + +-- +2.20.1 + diff --git a/buildroot/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch b/buildroot/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch new file mode 100644 index 000000000..953bd79cc --- /dev/null +++ b/buildroot/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch @@ -0,0 +1,188 @@ +From d7eb73163bcea31168c438fc132a0967ac172e3d Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Thu, 7 May 2020 21:11:43 -0700 +Subject: [PATCH] elf2flt.c: add new relocation types for xtensa + +Xtensa have added new relocation types R_XTENSA_[NP]DIFF{8,16,32} with +the same properties as the existing types R_XTENSA_DIFF{8,16,32}. +Add them to the list of ignored relocation types. + +This fixes the following error when invoking elf2flt on xtensa binaries +built with the recent binutils: + + ERROR: reloc type R_XTENSA_PDIFF32 unsupported in this context + +Reported-by: Romain Naour +Signed-off-by: Max Filippov +Backported from: d7eb73163bcea31168c438fc132a0967ac172e3d +--- + Makefile.in | 3 ++- + configure | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 14 ++++++++++++ + elf2flt.c | 8 +++++++ + 4 files changed, 88 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 52b3347d7f43..0529c7f0a25a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -30,7 +30,8 @@ DEFS = @DEFS@ \ + -DNO_GOT_CHECK=@got_check@ \ + -DUSE_EMIT_RELOCS=@emit_relocs@ \ + -DEMIT_CTOR_DTOR=@emit_ctor_dtor@ \ +- -DALWAYS_RELOC_TEXT=@always_reloc_text@ ++ -DALWAYS_RELOC_TEXT=@always_reloc_text@ \ ++ -DHAVE_BFD_XTENSA_PDIFF_RELOCS=@HAVE_BFD_XTENSA_PDIFF_RELOCS@ + EXEEXT = @EXEEXT@ + OBJEXT = @OBJEXT@ + +diff --git a/configure b/configure +index bb8e33f9cb28..bca38c34247e 100755 +--- a/configure ++++ b/configure +@@ -621,6 +621,7 @@ ac_includes_default="\ + + ac_subst_vars='LTLIBOBJS + LIBOBJS ++HAVE_BFD_XTENSA_PDIFF_RELOCS + SYMBOL_PREFIX + always_reloc_text + emit_ctor_dtor +@@ -1729,6 +1730,52 @@ fi + + } # ac_fn_c_try_link + ++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES ++# --------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. ++ac_fn_c_check_decl () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_c_check_decl ++ + # ac_fn_c_check_func LINENO FUNC VAR + # ---------------------------------- + # Tests whether FUNC exists, setting the cache variable VAR accordingly +@@ -4272,6 +4319,22 @@ $as_echo "#define const /**/" >>confdefs.h + fi + + ++HAVE_BFD_XTENSA_PDIFF_RELOCS=0 ++case $target in ++ xtensa*) ++ OLD_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="-I$bfd_include_dir -I$binutils_include_dir $CPPFLAGS" ++ ac_fn_c_check_decl "$LINENO" "R_XTENSA_PDIFF8" "ac_cv_have_decl_R_XTENSA_PDIFF8" "#include \"bfd.h\" ++ #include \"elf/xtensa.h\" ++" ++if test "x$ac_cv_have_decl_R_XTENSA_PDIFF8" = xyes; then : ++ HAVE_BFD_XTENSA_PDIFF_RELOCS=1 ++fi ++ ++ CPPFLAGS=$OLD_CPPFLAGS ++ ;; ++esac ++ + for ac_func in vprintf + do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +@@ -4333,6 +4396,7 @@ fi + + + ++ + ac_config_files="$ac_config_files ld-elf2flt.sh:ld-elf2flt.in Makefile elf2flt.ld" + + cat >confcache <<\_ACEOF +diff --git a/configure.ac b/configure.ac +index d6b4119eb18a..19969b1045f6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -202,6 +202,19 @@ AC_CHECK_HEADERS(fcntl.h unistd.h bfd.h) + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + ++HAVE_BFD_XTENSA_PDIFF_RELOCS=0 ++case $target in ++ xtensa*) ++ AS_VAR_COPY([OLD_CPPFLAGS], [CPPFLAGS]) ++ AS_VAR_SET([CPPFLAGS], ["-I$bfd_include_dir -I$binutils_include_dir $CPPFLAGS"]) ++ AC_CHECK_DECL([R_XTENSA_PDIFF8], ++ [HAVE_BFD_XTENSA_PDIFF_RELOCS=1],, ++ [#include "bfd.h" ++ #include "elf/xtensa.h"]) ++ AS_VAR_COPY([CPPFLAGS], [OLD_CPPFLAGS]) ++ ;; ++esac ++ + dnl Checks for library functions. + AC_FUNC_VPRINTF + +@@ -235,6 +248,7 @@ AC_SUBST(emit_relocs) + AC_SUBST(emit_ctor_dtor) + AC_SUBST(always_reloc_text) + AC_SUBST(SYMBOL_PREFIX) ++AC_SUBST(HAVE_BFD_XTENSA_PDIFF_RELOCS) + + AC_OUTPUT(ld-elf2flt.sh:ld-elf2flt.in Makefile elf2flt.ld) + +diff --git a/elf2flt.c b/elf2flt.c +index b7c4a490df02..961534973f56 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -776,6 +776,14 @@ output_relocs ( + case R_XTENSA_DIFF8: + case R_XTENSA_DIFF16: + case R_XTENSA_DIFF32: ++#if HAVE_BFD_XTENSA_PDIFF_RELOCS ++ case R_XTENSA_PDIFF8: ++ case R_XTENSA_PDIFF16: ++ case R_XTENSA_PDIFF32: ++ case R_XTENSA_NDIFF8: ++ case R_XTENSA_NDIFF16: ++ case R_XTENSA_NDIFF32: ++#endif + case R_XTENSA_32_PCREL: + continue; + case R_XTENSA_32: +-- +2.20.1 + diff --git a/buildroot/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch b/buildroot/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch new file mode 100644 index 000000000..69b6fae81 --- /dev/null +++ b/buildroot/package/erlang/0003-ei_portio.h-avoid-ODR-violation-of-ei_default_socket.patch @@ -0,0 +1,54 @@ +From de870d7f9f36b3e68f280057851a4585a67ab219 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 14 Jan 2020 23:15:01 +0000 +Subject: [PATCH] ei_portio.h: avoid ODR violation of + 'ei_default_socket_callbacks' + +Noticed as a build failure against fresh gcc-master: + +``` +LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +collect2: error: ld returned 1 exit status +make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1 +``` + +The failure looks legitimate: `ei_default_socket_callbacks` is a +struct defined in 'ei_portio.h' and in 'ei_portio.c'. + +The change flips 'ei_portio.h' definition to declaration. + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Signed-off-by: Sergei Trofimovich + +Patch taken from upstream: https://github.com/erlang/otp/commit/de870d7f9f36b3e68f280057851a4585a67ab219 +Signed-off-by: Heiko Thiery +--- + lib/erl_interface/src/misc/ei_portio.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h +index 84ebc5039a..5172d085b4 100644 + +--- a/lib/erl_interface/src/misc/ei_portio.h ++++ b/lib/erl_interface/src/misc/ei_portio.h +@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov + int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs); + #endif + +-ei_socket_callbacks ei_default_socket_callbacks; ++extern ei_socket_callbacks ei_default_socket_callbacks; + + #define EI_FD_AS_CTX__(FD) \ + ((void *) (long) (FD)) +-- +2.20.1 + diff --git a/buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch b/buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch new file mode 100644 index 000000000..fc7454337 --- /dev/null +++ b/buildroot/package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch @@ -0,0 +1,28 @@ +Forward supported flags to fstatat, this fixes issues like +using an empty path + +Upstream BR: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959876 + +Signed-off-by: Norbert Lange + +diff -burN fakeroot-1.20.2.org/libfakeroot.c fakeroot-1.20.2/libfakeroot.c +--- fakeroot-1.20.2.org/libfakeroot.c 2014-10-05 17:16:00.000000000 +0200 ++++ fakeroot-1.20.2/libfakeroot.c 2020-05-10 22:24:18.896625085 +0200 +@@ -880,7 +880,7 @@ + /* If AT_SYMLINK_NOFOLLOW is set in the fchownat call it should + be when we stat it. */ + INT_STRUCT_STAT st; +- r=INT_NEXT_FSTATAT(dir_fd, path, &st, (flags & AT_SYMLINK_NOFOLLOW)); ++ r=INT_NEXT_FSTATAT(dir_fd, path, &st, (flags & (AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH | AT_NO_AUTOMOUNT))); + + if(r) + return(r); +@@ -1017,7 +1017,7 @@ + + /* If AT_SYMLINK_NOFOLLOW is set in the fchownat call it should + be when we stat it. */ +- r=INT_NEXT_FSTATAT(dir_fd, path, &st, flags & AT_SYMLINK_NOFOLLOW); ++ r=INT_NEXT_FSTATAT(dir_fd, path, &st, flags & (AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH | AT_NO_AUTOMOUNT)); + + if(r) + return(r); diff --git a/buildroot/package/ffmpeg/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch b/buildroot/package/ffmpeg/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch deleted file mode 100644 index 343d49600..000000000 --- a/buildroot/package/ffmpeg/0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1812352d767ccf5431aa440123e2e260a4db2726 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer -Date: Sat, 7 Mar 2020 15:42:58 +0100 -Subject: [PATCH] avcodec/cbs_jpeg: Check length for SOS - -Fixes: out of array access -Fixes: 19734/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5673507031875584 -Fixes: 19353/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5703944462663680 - -Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg -Signed-off-by: Michael Niedermayer - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/FFmpeg/FFmpeg/commit/1812352d767ccf5431aa440123e2e260a4db2726] ---- - libavcodec/cbs_jpeg.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c -index 6bbce5f89b7..89512a26bbf 100644 ---- a/libavcodec/cbs_jpeg.c -+++ b/libavcodec/cbs_jpeg.c -@@ -197,6 +197,9 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, - if (marker == JPEG_MARKER_SOS) { - length = AV_RB16(frag->data + start); - -+ if (length > end - start) -+ return AVERROR_INVALIDDATA; -+ - data_ref = NULL; - data = av_malloc(end - start + - AV_INPUT_BUFFER_PADDING_SIZE); diff --git a/buildroot/package/ffmpeg/ffmpeg.hash b/buildroot/package/ffmpeg/ffmpeg.hash index 1f68943fc..35bd68132 100644 --- a/buildroot/package/ffmpeg/ffmpeg.hash +++ b/buildroot/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c ffmpeg-4.2.2.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 -sha256 cad1218c22121b169fb1380178ab7a0b33cb38a3ff6d3915b8533d1d954f3ce7 LICENSE.md +sha256 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31 ffmpeg-4.2.3.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 +sha256 cad1218c22121b169fb1380178ab7a0b33cb38a3ff6d3915b8533d1d954f3ce7 LICENSE.md diff --git a/buildroot/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk index d01a9620d..736aa5b4b 100644 --- a/buildroot/package/ffmpeg/ffmpeg.mk +++ b/buildroot/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 4.2.2 +FFMPEG_VERSION = 4.2.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -16,9 +16,6 @@ FFMPEG_LICENSE += and GPL-2.0+ FFMPEG_LICENSE_FILES += COPYING.GPLv2 endif -# 0001-avcodec-cbs_jpeg-Check-length-for-SOS.patch -FFMPEG_IGNORE_CVES += CVE-2020-12284 - FFMPEG_CONF_OPTS = \ --prefix=/usr \ --enable-avfilter \ diff --git a/buildroot/package/fmc/fmc.mk b/buildroot/package/fmc/fmc.mk index 2a95fec0b..b38573013 100644 --- a/buildroot/package/fmc/fmc.mk +++ b/buildroot/package/fmc/fmc.mk @@ -5,7 +5,8 @@ ################################################################################ FMC_VERSION = fsl-sdk-v2.0 -FMC_SITE = git://git.freescale.com/ppc/sdk/fmc.git +FMC_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc +FMC_SITE_METHOD = git FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING FMC_DEPENDENCIES = libxml2 tclap fmlib diff --git a/buildroot/package/fmlib/fmlib.mk b/buildroot/package/fmlib/fmlib.mk index e67ab1e5d..8cb779201 100644 --- a/buildroot/package/fmlib/fmlib.mk +++ b/buildroot/package/fmlib/fmlib.mk @@ -5,7 +5,8 @@ ################################################################################ FMLIB_VERSION = fsl-sdk-v2.0 -FMLIB_SITE = git://git.freescale.com/ppc/sdk/fmlib.git +FMLIB_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib +FMLIB_SITE_METHOD = git FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux diff --git a/buildroot/package/freerdp/freerdp.hash b/buildroot/package/freerdp/freerdp.hash index b94ca1053..a6100271f 100644 --- a/buildroot/package/freerdp/freerdp.hash +++ b/buildroot/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.0.1.tar.gz.sha256 -sha256 2c4841c6a52fb153346436447708cbae7b479a7d8112d093e95d8c98f084be1b freerdp-2.1.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.1.1.tar.gz.sha256 +sha256 6c6bf72fba1058ca6524c040d0825e4cdaa88682884a6c1c360e1cd5b8e21723 freerdp-2.1.1.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/buildroot/package/freerdp/freerdp.mk b/buildroot/package/freerdp/freerdp.mk index d3038bd5c..f3bc26ac5 100644 --- a/buildroot/package/freerdp/freerdp.mk +++ b/buildroot/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.1.0 +FREERDP_VERSION = 2.1.1 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 diff --git a/buildroot/package/gcc/9.3.0/0004-gcc-Makefile.in-move-SELFTEST_DEPS-before-including-.patch b/buildroot/package/gcc/9.3.0/0004-gcc-Makefile.in-move-SELFTEST_DEPS-before-including-.patch new file mode 100644 index 000000000..227d35a7f --- /dev/null +++ b/buildroot/package/gcc/9.3.0/0004-gcc-Makefile.in-move-SELFTEST_DEPS-before-including-.patch @@ -0,0 +1,81 @@ +From 811c8d628045c3d248144fc560a4bf80209ca16e Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 21 May 2020 15:58:02 +0200 +Subject: [PATCH] gcc/Makefile.in: move SELFTEST_DEPS before including language + makefile fragments + +As reported by several Buildroot users [1][2][3], the gcc build +may fail while running selftests makefile target. + +The problem only occurs when ccache is used with gcc 9 and 10, +probably due to a race condition. + +While debuging with "make -p" we can notice that s-selftest-c target +contain only "cc1" as dependency instead of cc1 and SELFTEST_DEPS [4]. + + s-selftest-c: cc1 + +While the build is failing, the s-selftest-c dependencies recipe is +still running and reported as a bug by make. + + "Dependencies recipe running (THIS IS A BUG)." + +A change [5] in gcc 9 seems to introduce the problem since we can't +reproduce this problem with gcc 8. + +As suggested by Yann E. MORIN [6], move SELFTEST_DEPS before +including language makefile fragments. + +With the fix applied, the s-seltest-c dependency contains +SELFTEST_DEPS value. + + s-selftest-c: cc1 xgcc specs stmp-int-hdrs ../../gcc/testsuite/selftests + +[1] http://lists.busybox.net/pipermail/buildroot/2020-May/282171.html +[2] http://lists.busybox.net/pipermail/buildroot/2020-May/282766.html +[3] https://github.com/cirosantilli/linux-kernel-module-cheat/issues/108 +[4] https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/c/Make-lang.in;h=bfae6fd2549c4f728816cd355fa9739dcc08fcde;hb=033eb5671769a4c681a44aad08a454e667e08502#l120 +[5] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=033eb5671769a4c681a44aad08a454e667e08502 +[6] http://lists.busybox.net/pipermail/buildroot/2020-May/283213.html + +Upstream status: https://gcc.gnu.org/pipermail/gcc-patches/2020-May/546248.html + +Signed-off-by: Romain Naour +Cc: Ben Dakin-Norris +Cc: Maxim Kochetkov +Cc: Thomas Petazzoni +Cc: Yann E. MORIN +Cc: Cc: David Malcolm +--- +This patch should be backported to gcc 10 and gcc 9. +--- + gcc/Makefile.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index abae872cd63..e2ef3c46afc 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -1686,6 +1686,10 @@ $(FULL_DRIVER_NAME): ./xgcc + rm -f $@ + $(LN_S) $< $@ + ++# SELFTEST_DEPS need to be set before including language makefile fragments. ++# Otherwise $(SELFTEST_DEPS) is empty when used from various /Make-lang.in. ++SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests ++ + # + # Language makefile fragments. + +@@ -1950,8 +1954,6 @@ DEVNULL=$(if $(findstring mingw,$(build)),nul,/dev/null) + SELFTEST_FLAGS = -nostdinc $(DEVNULL) -S -o $(DEVNULL) \ + -fself-test=$(srcdir)/testsuite/selftests + +-SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests +- + # Run the selftests during the build once we have a driver and the frontend, + # so that self-test failures are caught as early as possible. + # Use "s-selftest-FE" to ensure that we only run the selftests if the +-- +2.25.4 + diff --git a/buildroot/package/git/git.hash b/buildroot/package/git/git.hash index 74bf334b7..5734fea17 100644 --- a/buildroot/package/git/git.hash +++ b/buildroot/package/git/git.hash @@ -1,4 +1,4 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 723f24dce8fdd621a308b6187553fce7d5244205c065fe0a3aebd0b7c3f88562 git-2.24.1.tar.xz +sha256 da8c594c21ef965cdff427f27a7a384833d96d4d67f3a13915b498009646ef29 git-2.24.3.tar.xz sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/buildroot/package/git/git.mk b/buildroot/package/git/git.mk index dd79c41e4..d5e81b529 100644 --- a/buildroot/package/git/git.mk +++ b/buildroot/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.24.1 +GIT_VERSION = 2.24.3 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ diff --git a/buildroot/package/glib-networking/glib-networking.hash b/buildroot/package/glib-networking/glib-networking.hash index 061b7af69..88649d842 100644 --- a/buildroot/package/glib-networking/glib-networking.hash +++ b/buildroot/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.61/glib-networking-2.61.1.sha256sum -sha256 a3acbe8953ba80e408bdc4a3e8c240fd9447181c7e800a175c3105604c38bad5 glib-networking-2.61.1.tar.xz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.62/glib-networking-2.62.4.sha256sum +sha256 c18f289eec480fdce12044c0a06f77521edf9f460d16ad4213de61f2a3b294cf glib-networking-2.62.4.tar.xz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/glib-networking/glib-networking.mk b/buildroot/package/glib-networking/glib-networking.mk index 39133371f..e1d4823ad 100644 --- a/buildroot/package/glib-networking/glib-networking.mk +++ b/buildroot/package/glib-networking/glib-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.61 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 +GLIB_NETWORKING_VERSION_MAJOR = 2.62 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).4 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES diff --git a/buildroot/package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch b/buildroot/package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch new file mode 100644 index 000000000..9f0ba1b01 --- /dev/null +++ b/buildroot/package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch @@ -0,0 +1,156 @@ +From 45ef4455a60929932d1499cf718c1c9f59af9f26 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 26 May 2020 22:57:05 +0200 +Subject: [PATCH] build: Always use EXTERN_UNLESS_MAIN_MODULE pattern + +This patch is loosely based on upstream commit +6aff8a132815a84bab69401c1e7de96ec549fbf2 ("build: Always use +EXTERN_UNLESS_MAIN_MODULE pattern."). However, this upstream commit +applies to gnupg2, and the code base has changed quite significantly +compared to gnupg 1.x, so upstream's patch cannot be applied +as-is. The goal of the patch is to make sure each variable is only +defined once, ass gcc 10 now default to -fno-common. + +Essentially, this patch mainly fixes the EXTERN_UNLESS_MAIN_MODULE +define so that it really expands to "extern" when +INCLUDED_BY_MAIN_MODULE is not defined, even on non-RiscOS +systems. Contrary to upstream's patch we however do not factorize the +multiple EXTERN_UNLESS_MAIN_MODULE definitions into a single place as +it requires too many changes: instead we simply fix the few +definitions of this macro. + +Once the macro is fixed, two places need to define +INCLUDED_BY_MAIN_MODULE: tools/bftest.c and tools/mpicalc.c so that +when they include the common headers, their variables are at least +defined once. + +The iobuf.{c,h} case is handled differently: iobuf.h gains an +unconditional "extern", with the variable being added to iobuf.c. This +is identical to what upstream's +6aff8a132815a84bab69401c1e7de96ec549fbf2 is doing. + +Signed-off-by: Thomas Petazzoni +--- + g10/options.h | 3 +-- + include/cipher.h | 2 +- + include/iobuf.h | 9 +-------- + include/memory.h | 2 +- + include/mpi.h | 2 +- + tools/bftest.c | 1 + + tools/mpicalc.c | 1 + + util/iobuf.c | 2 ++ + 8 files changed, 9 insertions(+), 13 deletions(-) + +diff --git a/g10/options.h b/g10/options.h +index 0ac6e7755..bae19e9e3 100644 +--- a/g10/options.h ++++ b/g10/options.h +@@ -26,8 +26,7 @@ + #include "packet.h" + + #ifndef EXTERN_UNLESS_MAIN_MODULE +-/* Norcraft can't cope with common symbols */ +-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) ++#if !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern + #else + #define EXTERN_UNLESS_MAIN_MODULE +diff --git a/include/cipher.h b/include/cipher.h +index dd4af18cb..6ef6e6829 100644 +--- a/include/cipher.h ++++ b/include/cipher.h +@@ -115,7 +115,7 @@ struct gcry_md_context { + typedef struct gcry_md_context *MD_HANDLE; + + #ifndef EXTERN_UNLESS_MAIN_MODULE +-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) ++#if !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern + #else + #define EXTERN_UNLESS_MAIN_MODULE +diff --git a/include/iobuf.h b/include/iobuf.h +index 030f8c8e9..b4d26b7e1 100644 +--- a/include/iobuf.h ++++ b/include/iobuf.h +@@ -69,14 +69,7 @@ struct iobuf_struct { + } unget; + }; + +-#ifndef EXTERN_UNLESS_MAIN_MODULE +-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) +-#define EXTERN_UNLESS_MAIN_MODULE extern +-#else +-#define EXTERN_UNLESS_MAIN_MODULE +-#endif +-#endif +-EXTERN_UNLESS_MAIN_MODULE int iobuf_debug_mode; ++extern int iobuf_debug_mode; + + void iobuf_enable_special_filenames ( int yes ); + int iobuf_is_pipe_filename (const char *fname); +diff --git a/include/memory.h b/include/memory.h +index d414a9b2e..6698337e3 100644 +--- a/include/memory.h ++++ b/include/memory.h +@@ -91,7 +91,7 @@ unsigned secmem_get_flags(void); + #define DBG_MEMSTAT memory_stat_debug_mode + + #ifndef EXTERN_UNLESS_MAIN_MODULE +-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) ++#if !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern + #else + #define EXTERN_UNLESS_MAIN_MODULE +diff --git a/include/mpi.h b/include/mpi.h +index a4c16f5af..7a45ff805 100644 +--- a/include/mpi.h ++++ b/include/mpi.h +@@ -36,7 +36,7 @@ + #include "memory.h" + + #ifndef EXTERN_UNLESS_MAIN_MODULE +-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) ++#if !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern + #else + #define EXTERN_UNLESS_MAIN_MODULE +diff --git a/tools/bftest.c b/tools/bftest.c +index 8a1572c2b..5afd7e125 100644 +--- a/tools/bftest.c ++++ b/tools/bftest.c +@@ -26,6 +26,7 @@ + #include + #endif + ++#define INCLUDED_BY_MAIN_MODULE + #include "util.h" + #include "cipher.h" + #include "i18n.h" +diff --git a/tools/mpicalc.c b/tools/mpicalc.c +index 46e5fc824..31acd82a4 100644 +--- a/tools/mpicalc.c ++++ b/tools/mpicalc.c +@@ -31,6 +31,7 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE + #include "util.h" + #include "mpi.h" + #include "i18n.h" +diff --git a/util/iobuf.c b/util/iobuf.c +index c8442929a..0d9ee4cec 100644 +--- a/util/iobuf.c ++++ b/util/iobuf.c +@@ -113,6 +113,8 @@ typedef struct { + static CLOSE_CACHE close_cache; + #endif + ++int iobuf_debug_mode; ++ + #ifdef _WIN32 + typedef struct { + int sock; +-- +2.26.2 + diff --git a/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk b/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk index 263706670..19f8515cb 100644 --- a/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk @@ -5,7 +5,7 @@ ################################################################################ KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git +KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git KVM_UNIT_TESTS_SITE_METHOD = git KVM_UNIT_TESTS_LICENSE = LGPL-2.0 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT diff --git a/buildroot/package/kvmtool/kvmtool.mk b/buildroot/package/kvmtool/kvmtool.mk index 5894e4771..2984817c7 100644 --- a/buildroot/package/kvmtool/kvmtool.mk +++ b/buildroot/package/kvmtool/kvmtool.mk @@ -5,7 +5,7 @@ ################################################################################ KVMTOOL_VERSION = f77d646ba01d04be5aad9449ac00719c043fe36e -KVMTOOL_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/will/kvmtool.git +KVMTOOL_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git KVMTOOL_SITE_METHOD = git KVMTOOL_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BINUTILS),binutils) \ diff --git a/buildroot/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch b/buildroot/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch new file mode 100644 index 000000000..2626e8865 --- /dev/null +++ b/buildroot/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch @@ -0,0 +1,98 @@ +From 450c1d88b3e1af34614294830b4dc0612d198d26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pawe=C5=82=20Bylica?= +Date: Wed, 8 May 2019 10:42:03 +0200 +Subject: [PATCH] cmake: Use find_package() to find Snappy + +Upstream: https://github.com/google/leveldb/pull/686/commits/3e73a396a082efc76e065ae974fe18c3bb27219d +[Thomas: this commit allows to fix the detection of the snappy library +in static link configurations] +Signed-off-by: Thomas Petazzoni +--- + CMakeLists.txt | 12 ++++++++---- + cmake/FindSnappy.cmake | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 4 deletions(-) + create mode 100644 cmake/FindSnappy.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78fead6..2efccda 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,9 @@ cmake_minimum_required(VERSION 3.9) + # Keep the version below in sync with the one in db.h + project(leveldb VERSION 1.22.0 LANGUAGES C CXX) + ++# Include local CMake modules. ++list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) ++ + # This project can use C11, but will gracefully decay down to C89. + set(CMAKE_C_STANDARD 11) + set(CMAKE_C_STANDARD_REQUIRED OFF) +@@ -31,13 +34,14 @@ option(LEVELDB_INSTALL "Install LevelDB's header and library" ON) + include(TestBigEndian) + test_big_endian(LEVELDB_IS_BIG_ENDIAN) + ++find_package(Snappy) ++ + include(CheckIncludeFile) + check_include_file("unistd.h" HAVE_UNISTD_H) + + include(CheckLibraryExists) + check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_ATOMIC) + check_library_exists(crc32c crc32c_value "" HAVE_CRC32C) +-check_library_exists(snappy snappy_compress "" HAVE_SNAPPY) + check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) + + include(CheckCXXSymbolExists) +@@ -276,9 +280,9 @@ endif(HAVE_ATOMIC) + if(HAVE_CRC32C) + target_link_libraries(leveldb crc32c) + endif(HAVE_CRC32C) +-if(HAVE_SNAPPY) +- target_link_libraries(leveldb snappy) +-endif(HAVE_SNAPPY) ++if(TARGET Snappy::snappy) ++ target_link_libraries(leveldb Snappy::snappy) ++endif() + if(HAVE_TCMALLOC) + target_link_libraries(leveldb tcmalloc) + endif(HAVE_TCMALLOC) +diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake +new file mode 100644 +index 0000000..88c1de9 +--- /dev/null ++++ b/cmake/FindSnappy.cmake +@@ -0,0 +1,31 @@ ++# Copyright 2019 The LevelDB Authors. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. See the AUTHORS file for names of contributors. ++ ++find_library(SNAPPY_LIBRARY ++ NAMES snappy ++ HINTS ${SNAPPY_ROOT_DIR}/lib ++) ++ ++find_path(SNAPPY_INCLUDE_DIR ++ NAMES snappy.h ++ HINTS ${SNAPPY_ROOT_DIR}/include ++) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Snappy DEFAULT_MSG SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR) ++ ++mark_as_advanced(SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR) ++ ++if(SNAPPY_FOUND) ++ set(HAVE_SNAPPY TRUE) # For compatibity with generating port_config.h. ++ ++ # Add imported targets. ++ # Follow the package naming convetion 'Snappy::' from ++ # https://github.com/google/snappy/blob/master/CMakeLists.txt#L211. ++ add_library(Snappy::snappy UNKNOWN IMPORTED) ++ set_target_properties(Snappy::snappy PROPERTIES ++ IMPORTED_LOCATION ${SNAPPY_LIBRARY} ++ INTERFACE_INCLUDE_DIRECTORIES ${SNAPPY_INCLUDE_DIR} ++ ) ++endif() +-- +2.26.2 + diff --git a/buildroot/package/leveldb/Config.in b/buildroot/package/leveldb/Config.in index c767b8864..c4279fcb6 100644 --- a/buildroot/package/leveldb/Config.in +++ b/buildroot/package/leveldb/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LEVELDB depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_SNAPPY help LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string diff --git a/buildroot/package/leveldb/leveldb.mk b/buildroot/package/leveldb/leveldb.mk index cf3c096f5..684b61867 100644 --- a/buildroot/package/leveldb/leveldb.mk +++ b/buildroot/package/leveldb/leveldb.mk @@ -9,9 +9,12 @@ LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION)) LEVELDB_LICENSE = BSD-3-Clause LEVELDB_LICENSE_FILES = LICENSE LEVELDB_INSTALL_STAGING = YES -LEVELDB_DEPENDENCIES = snappy LEVELDB_CONF_OPTS = \ -DLEVELDB_BUILD_BENCHMARKS=OFF \ -DLEVELDB_BUILD_TESTS=OFF +ifeq ($(BR2_PACKAGE_SNAPPY),y) +LEVELDB_DEPENDENCIES += snappy +endif + $(eval $(cmake-package)) diff --git a/buildroot/package/libexif/0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch b/buildroot/package/libexif/0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch deleted file mode 100644 index c98ed748c..000000000 --- a/buildroot/package/libexif/0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 -From: Marcus Meissner -Date: Tue, 25 Jul 2017 23:44:44 +0200 -Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax - makernote entries. - -This should fix: -https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 - -Signed-off-by: Peter Korsgaard ---- - libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c -index d03d159..ea0429a 100644 ---- a/libexif/pentax/mnote-pentax-entry.c -+++ b/libexif/pentax/mnote-pentax-entry.c -@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - case EXIF_FORMAT_SHORT: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; kcomponents; k++) { -+ if (sizeleft < 2) -+ break; - vs = exif_get_short (data, entry->order); - snprintf (val+len, maxlen-len, "%i ", vs); - len = strlen(val); - data += 2; -+ sizeleft -= 2; - } - } - break; - case EXIF_FORMAT_LONG: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; kcomponents; k++) { -+ if (sizeleft < 4) -+ break; - vl = exif_get_long (data, entry->order); - snprintf (val+len, maxlen-len, "%li", (long int) vl); - len = strlen(val); - data += 4; -+ sizeleft -= 4; - } - } - break; -@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - break; - } - -- return (val); -+ return val; - } --- -2.20.1 - diff --git a/buildroot/package/libexif/0002-On-saving-makernotes-make-sure-the-makernote-contain.patch b/buildroot/package/libexif/0002-On-saving-makernotes-make-sure-the-makernote-contain.patch deleted file mode 100644 index 84c92593b..000000000 --- a/buildroot/package/libexif/0002-On-saving-makernotes-make-sure-the-makernote-contain.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001 -From: Marcus Meissner -Date: Tue, 25 Jul 2017 23:38:56 +0200 -Subject: [PATCH] On saving makernotes, make sure the makernote container tags - has a type with 1 byte components. - -Fixes (at least): - https://sourceforge.net/p/libexif/bugs/130 - https://sourceforge.net/p/libexif/bugs/129 - -CVE-2017-7544: libexif through 0.6.21 is vulnerable to out-of-bounds heap -read vulnerability in exif_data_save_data_entry function in -libexif/exif-data.c caused by improper length computation of the allocated -data of an ExifMnote entry which can cause denial-of-service or possibly -information disclosure. - -Signed-off-by: Peter Korsgaard ---- - libexif/exif-data.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 67df4db..91f4c33 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; -+ if (exif_format_get_size (e->format) != 1) { -+ /* e->format is taken from input code, -+ * but we need to make sure it is a 1 byte -+ * entity due to the multiplication below. */ -+ e->format = EXIF_FORMAT_UNDEFINED; -+ } - } - } - --- -2.20.1 - diff --git a/buildroot/package/libexif/0003-Reduce-maximum-recursion-depth-in-exif_data_load_dat.patch b/buildroot/package/libexif/0003-Reduce-maximum-recursion-depth-in-exif_data_load_dat.patch deleted file mode 100644 index e662d6bfc..000000000 --- a/buildroot/package/libexif/0003-Reduce-maximum-recursion-depth-in-exif_data_load_dat.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5d28011c40ec86cf52cffad541093d37c263898a Mon Sep 17 00:00:00 2001 -From: Dan Fandrich -Date: Fri, 20 Apr 2018 18:05:19 +0200 -Subject: [PATCH] Reduce maximum recursion depth in exif_data_load_data_content - -This only needs to be a small, single digit integer for normal files, -and reducing the maximum closer to this reduces the time and space -needed to detect pathological cases. - -Signed-off-by: Peter Korsgaard ---- - libexif/exif-data.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index 91f4c33..04cdda2 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -378,7 +378,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) - return; - -- if (recursion_depth > 30) { -+ if (recursion_depth > 12) { - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", - "Deep recursion detected!"); - return; --- -2.20.1 - diff --git a/buildroot/package/libexif/0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch b/buildroot/package/libexif/0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch deleted file mode 100644 index ff991541f..000000000 --- a/buildroot/package/libexif/0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich -Date: Fri, 12 Oct 2018 16:01:45 +0200 -Subject: [PATCH] Improve deep recursion detection in - exif_data_load_data_content. - -The existing detection was still vulnerable to pathological cases -causing DoS by wasting CPU. The new algorithm takes the number of tags -into account to make it harder to abuse by cases using shallow recursion -but with a very large number of tags. This improves on commit 5d28011c -which wasn't sufficient to counter this kind of case. - -The limitation in the previous fix was discovered by Laurent Delosieres, -Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned -the identifier CVE-2018-20030. - -[Peter: drop NEWS change] -Signed-off-by: Peter Korsgaard ---- - libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 37 insertions(+), 8 deletions(-) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index e35403d..a6f9c94 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -35,6 +35,7 @@ - #include - #include - -+#include - #include - #include - #include -@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) { \ - break; \ - } - -+/*! Calculate the recursion cost added by one level of IFD loading. -+ * -+ * The work performed is related to the cost in the exponential relation -+ * work=1.1**cost -+ */ -+static unsigned int -+level_cost(unsigned int n) -+{ -+ static const double log_1_1 = 0.09531017980432493; -+ -+ /* Adding 0.1 protects against the case where n==1 */ -+ return ceil(log(n + 0.1)/log_1_1); -+} -+ - /*! Load data for an IFD. - * - * \param[in,out] data #ExifData -@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) { \ - * \param[in] d pointer to buffer containing raw IFD data - * \param[in] ds size of raw data in buffer at \c d - * \param[in] offset offset into buffer at \c d at which IFD starts -- * \param[in] recursion_depth number of times this function has been -- * recursively called without returning -+ * \param[in] recursion_cost factor indicating how expensive this recursive -+ * call could be - */ - static void - exif_data_load_data_content (ExifData *data, ExifIfd ifd, - const unsigned char *d, -- unsigned int ds, unsigned int offset, unsigned int recursion_depth) -+ unsigned int ds, unsigned int offset, unsigned int recursion_cost) - { - ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; - ExifShort n; -@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) - return; - -- if (recursion_depth > 12) { -+ if (recursion_cost > 170) { -+ /* -+ * recursion_cost is a logarithmic-scale indicator of how expensive this -+ * recursive call might end up being. It is an indicator of the depth of -+ * recursion as well as the potential for worst-case future recursive -+ * calls. Since it's difficult to tell ahead of time how often recursion -+ * will occur, this assumes the worst by assuming every tag could end up -+ * causing recursion. -+ * The value of 170 was chosen to limit typical EXIF structures to a -+ * recursive depth of about 6, but pathological ones (those with very -+ * many tags) to only 2. -+ */ - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", -- "Deep recursion detected!"); -+ "Deep/expensive recursion detected!"); - return; - } - -@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - CHECK_REC (EXIF_IFD_EXIF); -- exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_GPS_INFO_IFD_POINTER: - CHECK_REC (EXIF_IFD_GPS); -- exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - CHECK_REC (EXIF_IFD_INTEROPERABILITY); -- exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - thumbnail_offset = o; --- -2.20.1 - diff --git a/buildroot/package/libexif/0005-fix-CVE-2019-9278.patch b/buildroot/package/libexif/0005-fix-CVE-2019-9278.patch deleted file mode 100644 index f708b2ae5..000000000 --- a/buildroot/package/libexif/0005-fix-CVE-2019-9278.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 75aa73267fdb1e0ebfbc00369e7312bac43d0566 Mon Sep 17 00:00:00 2001 -From: Marcus Meissner -Date: Sat, 18 Jan 2020 09:29:42 +0100 -Subject: [PATCH] fix CVE-2019-9278 - -avoid the use of unsafe integer overflow checking constructs (unsigned integer operations cannot overflow, so "u1 + u2 > u1" can be optimized away) - -check for the actual sizes, which should also handle the overflows -document other places google patched, but do not seem relevant due to other restrictions - -fixes https://github.com/libexif/libexif/issues/26 - -Signed-off-by: Peter Korsgaard ---- - libexif/exif-data.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index a6f9c94..6332cd1 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -192,9 +192,15 @@ exif_data_load_data_entry (ExifData *data, ExifEntry *entry, - doff = offset + 8; - - /* Sanity checks */ -- if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) { -+ if (doff >= size) { - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Tag data past end of buffer (%u > %u)", doff+s, size); -+ "Tag starts past end of buffer (%u > %u)", doff, size); -+ return 0; -+ } -+ -+ if (s > size - doff) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -+ "Tag data goes past end of buffer (%u > %u)", doff+s, size); - return 0; - } - -@@ -315,13 +321,14 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, - unsigned int ds, ExifLong o, ExifLong s) - { - /* Sanity checks */ -- if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) { -- exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- "Bogus thumbnail offset (%u) or size (%u).", -- o, s); -+ if (o >= ds) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); -+ return; -+ } -+ if (s > ds - o) { -+ exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); - return; - } -- - if (data->data) - exif_mem_free (data->priv->mem, data->data); - if (!(data->data = exif_data_alloc (data, s))) { -@@ -947,7 +954,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 0 at %i.", (int) offset); - -- /* Sanity check the offset, being careful about overflow */ -+ /* ds is restricted to 16 bit above, so offset is restricted too, and offset+8 should not overflow. */ - if (offset > ds || offset + 6 + 2 > ds) - return; - -@@ -956,6 +963,7 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - - /* IFD 1 offset */ - n = exif_get_short (d + 6 + offset, data->priv->order); -+ /* offset < 2<<16, n is 16 bit at most, so this op will not overflow */ - if (offset + 6 + 2 + 12 * n + 4 > ds) - return; - -@@ -964,8 +972,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d_orig, - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 1 at %i.", (int) offset); - -- /* Sanity check. */ -- if (offset > ds || offset + 6 > ds) { -+ /* Sanity check. ds is ensured to be above 6 above, offset is 16bit */ -+ if (offset > ds - 6) { - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, - "ExifData", "Bogus offset of IFD1."); - } else { --- -2.20.1 - diff --git a/buildroot/package/libexif/Config.in b/buildroot/package/libexif/Config.in index 8a38b477b..8064c2e9f 100644 --- a/buildroot/package/libexif/Config.in +++ b/buildroot/package/libexif/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBEXIF image. The EXIF library allows you to parse an EXIF file and read the data from those tags. - http://libexif.sf.net + https://libexif.github.io diff --git a/buildroot/package/libexif/libexif.hash b/buildroot/package/libexif/libexif.hash index aa9fcc8d8..1a2157b3f 100644 --- a/buildroot/package/libexif/libexif.hash +++ b/buildroot/package/libexif/libexif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a libexif-0.6.21.tar.bz2 +sha256 5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56 libexif-0.6.22.tar.xz sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/buildroot/package/libexif/libexif.mk b/buildroot/package/libexif/libexif.mk index 643d9ed89..c945c275a 100644 --- a/buildroot/package/libexif/libexif.mk +++ b/buildroot/package/libexif/libexif.mk @@ -4,21 +4,13 @@ # ################################################################################ -LIBEXIF_VERSION = 0.6.21 -LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2 -LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION) +LIBEXIF_VERSION = 0.6.22 +LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.xz +LIBEXIF_SITE = \ + https://github.com/libexif/libexif/releases/download/libexif-$(subst .,_,$(LIBEXIF_VERSION))-release LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING -# 0001-fixes-some-not-all-buffer-overreads-during-decoding-.patch -LIBEXIF_IGNORE_CVES += CVE-2016-6328 -# 0002-On-saving-makernotes-make-sure-the-makernote-contain.patch -LIBEXIF_IGNORE_CVES += CVE-2017-7544 -# 0004-Improve-deep-recursion-detection-in-exif_data_load_d.patch -LIBEXIF_IGNORE_CVES += CVE-2018-20030 -# 0005-fix-CVE-2019-9278.patch -LIBEXIF_IGNORE_CVES += CVE-2019-9278 - $(eval $(autotools-package)) diff --git a/buildroot/package/libssh2/libssh2.mk b/buildroot/package/libssh2/libssh2.mk index 3819c1aa3..c03fe0db5 100644 --- a/buildroot/package/libssh2/libssh2.mk +++ b/buildroot/package/libssh2/libssh2.mk @@ -14,7 +14,7 @@ LIBSSH2_CONF_OPTS = --disable-examples-build # 0003-packet-c-improve-message-parsing.patch LIBSSH2_IGNORE_CVES += CVE-2019-17498 -# building from a git clone +# patch touching configure.ac and acinclude.m4 LIBSSH2_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y) diff --git a/buildroot/package/libusb-compat/libusb-compat.mk b/buildroot/package/libusb-compat/libusb-compat.mk index 61d4c203e..0ad6c6cbd 100644 --- a/buildroot/package/libusb-compat/libusb-compat.mk +++ b/buildroot/package/libusb-compat/libusb-compat.mk @@ -15,5 +15,11 @@ LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config LIBUSB_COMPAT_LICENSE = LGPL-2.1+ LIBUSB_COMPAT_LICENSE_FILES = COPYING +ifeq ($(BR2_STATIC_LIBS),) +LIBUSB_COMPAT_CONF_ENV += \ + LIBUSB_1_0_SONAME=`LC_ALL=C readelf -d $(STAGING_DIR)/usr/lib/libusb-1.0.so \ + |sed -r -e '/\(SONAME\)/!d; s/.*\[(.+)\]$$/\1/'` +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index 88b9ff992..6c37937f5 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -322,11 +322,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.223" if BR2_KERNEL_HEADERS_4_4 - default "4.9.223" if BR2_KERNEL_HEADERS_4_9 - default "4.14.180" if BR2_KERNEL_HEADERS_4_14 - default "4.19.122" if BR2_KERNEL_HEADERS_4_19 - default "5.4.40" if BR2_KERNEL_HEADERS_5_4 + default "4.4.225" if BR2_KERNEL_HEADERS_4_4 + default "4.9.225" if BR2_KERNEL_HEADERS_4_9 + default "4.14.182" if BR2_KERNEL_HEADERS_4_14 + default "4.19.125" if BR2_KERNEL_HEADERS_4_19 + default "5.4.43" if BR2_KERNEL_HEADERS_5_4 default 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/linux-headers/linux-headers.mk b/buildroot/package/linux-headers/linux-headers.mk index 80a077537..4c3cb716b 100644 --- a/buildroot/package/linux-headers/linux-headers.mk +++ b/buildroot/package/linux-headers/linux-headers.mk @@ -17,6 +17,7 @@ LINUX_HEADERS_CUSTOM_SVN = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_SVN)) LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION)) LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) +LINUX_HEADERS_CIP = $(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION) else # ! BR2_KERNEL_HEADERS_AS_KERNEL LINUX_HEADERS_CUSTOM_TARBALL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL)) LINUX_HEADERS_CUSTOM_GIT = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_GIT)) @@ -25,6 +26,7 @@ LINUX_HEADERS_CUSTOM_SVN = LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS)) LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_REPO_URL)) +LINUX_HEADERS_CIP = endif # BR2_KERNEL_HEADERS_AS_KERNEL # Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration @@ -43,6 +45,9 @@ else ifeq ($(LINUX_HEADERS_CUSTOM_SVN),y) LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = svn +else ifeq ($(LINUX_HEADERS_CIP),y) +LINUX_HEADERS_SOURCE = linux-cip-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot else ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),) # Since 4.12-rc1, -rc kernels are generated from cgit. This also works for # older -rc kernels. diff --git a/buildroot/package/lrzip/0001-missing-stdarg.patch b/buildroot/package/lrzip/0001-missing-stdarg.patch deleted file mode 100644 index 9ce0117a3..000000000 --- a/buildroot/package/lrzip/0001-missing-stdarg.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5ae1754025315d85fac11cb4eb2474789ee6475e Mon Sep 17 00:00:00 2001 -From: Sam Lancia -Date: Sat, 7 Sep 2019 20:54:29 +0100 -Subject: [PATCH] Lrzip.h: add missing header for va_list on some platforms - -Signed-off-by: Sam Lancia ---- - Lrzip.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Lrzip.h b/Lrzip.h -index 29bc2a9..8934c59 100644 ---- a/Lrzip.h -+++ b/Lrzip.h -@@ -20,6 +20,7 @@ - #ifndef LIBLRZIP_H - #define LIBLRZIP_H - -+#include - #include - #include - #ifdef _WIN32 --- -2.17.1 - - diff --git a/buildroot/package/lrzip/lrzip.hash b/buildroot/package/lrzip/lrzip.hash index bdf63f0ed..3e188c41e 100644 --- a/buildroot/package/lrzip/lrzip.hash +++ b/buildroot/package/lrzip/lrzip.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 10315c20d5a47590e7220c210735ba169677824d5672509266682eccec84d952 lrzip-0.631.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 4d31c429491f1378e868afe06867f68f8b1332fdca0758de24cc4da22103acfb lrzip-7f3bf46203bf45ea115d8bd9f310ea219be88af4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/lrzip/lrzip.mk b/buildroot/package/lrzip/lrzip.mk index 24edc847d..7419bb1ed 100644 --- a/buildroot/package/lrzip/lrzip.mk +++ b/buildroot/package/lrzip/lrzip.mk @@ -4,11 +4,18 @@ # ################################################################################ -LRZIP_VERSION = 0.631 -LRZIP_SITE = $(call github,ckolivas,lrzip,v$(LRZIP_VERSION)) +LRZIP_VERSION = 7f3bf46203bf45ea115d8bd9f310ea219be88af4 +LRZIP_SITE = $(call github,ckolivas,lrzip,$(LRZIP_VERSION)) LRZIP_AUTORECONF = YES LRZIP_LICENSE = GPL-2.0+ LRZIP_LICENSE_FILES = COPYING LRZIP_DEPENDENCIES = zlib lzo bzip2 +ifeq ($(BR2_i386)$(BR2_x86_64),y) +LRZIP_DEPENDENCIES += host-nasm +LRZIP_CONF_OPTS += --enable-asm +else +LRZIP_CONF_OPTS += --disable-asm +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/ltrace/ltrace.mk b/buildroot/package/ltrace/ltrace.mk index b71215e43..2eb60fe45 100644 --- a/buildroot/package/ltrace/ltrace.mk +++ b/buildroot/package/ltrace/ltrace.mk @@ -5,7 +5,14 @@ ################################################################################ LTRACE_VERSION = c22d359433b333937ee3d803450dc41998115685 -LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git +#LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git + +# Upstream is dead: the git reporistory for ltrace did not follow during the +# migration from alioth to gitlab, and there is no longer any official +# upstream repository with the expected sha1, except for the tarball cached on +# s.b.o., so we go fetch it there. +LTRACE_SITE = http://sources.buildroot.org/ltrace + LTRACE_DEPENDENCIES = elfutils LTRACE_CONF_OPTS = --disable-werror LTRACE_LICENSE = GPL-2.0 diff --git a/buildroot/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch b/buildroot/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch deleted file mode 100644 index d19947f09..000000000 --- a/buildroot/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7e1b6aafeb9fe6558da7506b304c0efb5ea82281 Mon Sep 17 00:00:00 2001 -From: Ryan Coe -Date: Fri, 13 Dec 2019 17:13:26 -0800 -Subject: [PATCH] add sysroot path to mariadb_config - -Upstream: https://github.com/mariadb-corporation/mariadb-connector-c/commit/b787c0d69cc00af98cd4ee5bc205e1c7ddaf427a -Signed-off-by: Ryan Coe ---- - libmariadb/mariadb_config/mariadb_config.c.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in -index 703c9466a1d9214a85f3638d2e3b4ecfef0c7bd6..f5513333e670373f060a3c2574d1d42facfd0337 100644 ---- a/libmariadb/mariadb_config/mariadb_config.c.in -+++ b/libmariadb/mariadb_config/mariadb_config.c.in -@@ -5,8 +5,8 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" -+#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" -+#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" --- -2.24.1 - diff --git a/buildroot/package/mariadb/mariadb.hash b/buildroot/package/mariadb/mariadb.hash index 679643887..9de97360a 100644 --- a/buildroot/package/mariadb/mariadb.hash +++ b/buildroot/package/mariadb/mariadb.hash @@ -1,9 +1,9 @@ -# From https://downloads.mariadb.org/mariadb/10.3.22 -md5 f712a5e6fde038d0c9c6d2a2cd88b84e mariadb-10.3.22.tar.gz -sha1 f92f517fc2ea893ffb3d599ade219bf0a0045265 mariadb-10.3.22.tar.gz -sha256 3200055dbdc27746981b3bb4bc182e2cb79dcf28ea88014b641a5b81280ccec7 mariadb-10.3.22.tar.gz -sha512 57a6551b8939f54742963202d50a537e69e8ab9b2dca42ce3d2a09c0f7af368fded71f36af26f6cbd956d54fe43853981ba8fe28b7a3ba97c7d52ea4a0d233f6 mariadb-10.3.22.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.23 +md5 473950893d29805d9384ec0ed5d7c276 mariadb-10.3.23.tar.gz +sha1 c95b6d4cff5e6d63eed05da20561802b9c83e717 mariadb-10.3.23.tar.gz +sha256 fc405022457d8eec5991b870cc1c9a07b83b551d6165c414c4d8f31523aa86ae mariadb-10.3.23.tar.gz +sha512 535cd2ce80a95b6c0a1aa559cc3275dfcd559c3a4f958fab3382923190a16e6bc5b4ad79acaa518244512ff618568c239c0edef8a701d958362ede19a29c2986 mariadb-10.3.23.tar.gz # Hash for license files -sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md -sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING +sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md +sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/buildroot/package/mariadb/mariadb.mk b/buildroot/package/mariadb/mariadb.mk index d5f4ef6bb..1d0be060d 100644 --- a/buildroot/package/mariadb/mariadb.mk +++ b/buildroot/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.22 +MARIADB_VERSION = 10.3.23 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text diff --git a/buildroot/package/mesa3d/Config.in b/buildroot/package/mesa3d/Config.in index 16d77f42c..ade13ec03 100644 --- a/buildroot/package/mesa3d/Config.in +++ b/buildroot/package/mesa3d/Config.in @@ -112,6 +112,12 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO bool "Gallium freedreno driver" + depends on BR2_arm || BR2_aarch64 || BR2_aarch64_be # libdrm-freedreno + # libdrm's freedreno option depends on LIBDRM_HAS_ATOMIC. Propagating + # that dependency here causes a circular dependency that Kconfig + # can't see is just spurious. However, that dependency is about + # the toolchain having sync4 primitives, which is always a given + # for arm/aarch64. select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO help diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index e742c4982..000ec1c1e 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -168,7 +168,23 @@ endef MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_HEADERS endif -MESA3D_PLATFORMS = surfaceless +ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y) +MESA3D_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXdamage \ + xlib_libXfixes \ + xlib_libXrandr \ + xlib_libXxf86vm \ + xorgproto \ + libxcb +MESA3D_PLATFORMS += x11 +endif +ifeq ($(BR2_PACKAGE_WAYLAND),y) +MESA3D_DEPENDENCIES += wayland wayland-protocols +MESA3D_PLATFORMS += wayland +MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner +endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) MESA3D_PLATFORMS += drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D),y) @@ -190,23 +206,7 @@ MESA3D_PLATFORMS += drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI),y) MESA3D_PLATFORMS += drm endif -ifeq ($(BR2_PACKAGE_WAYLAND),y) -MESA3D_DEPENDENCIES += wayland wayland-protocols -MESA3D_PLATFORMS += wayland -MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner -endif -ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y) -MESA3D_DEPENDENCIES += \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXdamage \ - xlib_libXfixes \ - xlib_libXrandr \ - xlib_libXxf86vm \ - xorgproto \ - libxcb -MESA3D_PLATFORMS += x11 -endif +MESA3D_PLATFORMS += surfaceless MESA3D_CONF_OPTS += \ -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) diff --git a/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch b/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch index 90222c10a..4e39be4a7 100644 --- a/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch +++ b/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch @@ -10,6 +10,7 @@ no encoding parameters ppEncodingParams will be returned as a pointer to an empty string rather than as a null pointer Signed-off-by: Peter Korsgaard +[Upstream status: https://github.com/TechSmith/mp4v2/pull/36] --- src/rtphint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch b/buildroot/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch new file mode 100644 index 000000000..72bae463c --- /dev/null +++ b/buildroot/package/mp4v2/0002-src-mp4track.cpp-replace-nullptr-by-NULL.patch @@ -0,0 +1,50 @@ +From 78cf76b5d661e37e958163c37c0ad95940c09591 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 30 May 2020 11:42:19 +0200 +Subject: [PATCH] src/mp4track.cpp: replace nullptr by NULL + +Commit 15ec11166ba9ee7b77631d0d9234522f656cfd66 added code that uses +nullptr. nullptr is C++11, it will break the build with gcc < 5. + +Semantically, NULL and nullptr are different, so should not be mixed. +In this situaiton, m_File.FindAtom() indeed does not return nullptr, +but NULL (on error, that is). + +Switch back to comparing against NULL. + +Fixes: + - http://autobuild.buildroot.org/results/14937c96a82fb3d10e5d83bd7b2905b846fb09f9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + src/mp4track.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mp4track.cpp b/src/mp4track.cpp +index 4b8fc9d..42489eb 100644 +--- a/src/mp4track.cpp ++++ b/src/mp4track.cpp +@@ -908,16 +908,16 @@ File* MP4Track::GetSampleFile( MP4SampleId sampleId ) + MP4FtypAtom *pFtypAtom = reinterpret_cast( m_File.FindAtom( "ftyp" ) ); + + // MOV spec does not require "ftyp" atom... +- if ( pFtypAtom == nullptr ) ++ if ( pFtypAtom == NULL ) + { +- return nullptr; ++ return NULL; + } + else + { + // ... but most often it is present with a "qt " value + const char *majorBrand = pFtypAtom->majorBrand.GetValue(); + if ( ::strcmp( pFtypAtom->majorBrand.GetValue(), "qt " ) == 0 ) +- return nullptr; ++ return NULL; + } + throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ ); + } +-- +2.26.2 + diff --git a/buildroot/package/mp4v2/Config.in b/buildroot/package/mp4v2/Config.in index 490ebac9f..172d1baab 100644 --- a/buildroot/package/mp4v2/Config.in +++ b/buildroot/package/mp4v2/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_MP4V2 The MP4v2 library provides functions to read, create, and modify mp4 files. - https://code.google.com/archive/p/mp4v2/ + https://github.com/TechSmith/mp4v2/ if BR2_PACKAGE_MP4V2 diff --git a/buildroot/package/mp4v2/mp4v2.hash b/buildroot/package/mp4v2/mp4v2.hash index d75c1994d..85fce4938 100644 --- a/buildroot/package/mp4v2/mp4v2.hash +++ b/buildroot/package/mp4v2/mp4v2.hash @@ -1,4 +1,3 @@ -# From https://code.google.com/p/mp4v2/downloads/detail?name=mp4v2-2.0.0.tar.bz2 -sha1 193260cfb7201e6ec250137bcca1468d4d20e2f0 mp4v2-2.0.0.tar.bz2 # Locally computed +sha256 e3ad6c2dc451b0875dbe34bfe7f51f4fe278b391434c886083e6d3ecd5fa08c2 mp4v2-4.1.3.tar.gz sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING diff --git a/buildroot/package/mp4v2/mp4v2.mk b/buildroot/package/mp4v2/mp4v2.mk index b6b7d9ae5..478d10d47 100644 --- a/buildroot/package/mp4v2/mp4v2.mk +++ b/buildroot/package/mp4v2/mp4v2.mk @@ -4,9 +4,9 @@ # ################################################################################ -MP4V2_VERSION = 2.0.0 -MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 -MP4V2_SITE = https://mp4v2.googlecode.com/files +MP4V2_VERSION = 4.1.3 +MP4V2_SITE = \ + $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) MP4V2_INSTALL_STAGING = YES MP4V2_LICENSE = MPL-1.1 MP4V2_LICENSE_FILES = COPYING diff --git a/buildroot/package/openldap/openldap.hash b/buildroot/package/openldap/openldap.hash index 7f159cb6d..6790e8b7a 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.49.md5 -md5 2a47a6bb4319357ea7b032c45283e79e openldap-2.4.49.tgz -# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.49.sha1 -sha1 f0caeca122e6f90e6ac5cc8ba36fe9cec13826da openldap-2.4.49.tgz +# 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 # Locally computed -sha256 e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e openldap-2.4.49.tgz -sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 5cb57d958bf5c55a678c6a0f06821e0e5504d5a92e6a33240841fbca1db586b8 openldap-2.4.50.tgz +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/openldap/openldap.mk b/buildroot/package/openldap/openldap.mk index a5f606749..a9e71be59 100644 --- a/buildroot/package/openldap/openldap.mk +++ b/buildroot/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.49 +OPENLDAP_VERSION = 2.4.50 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/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch b/buildroot/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch new file mode 100644 index 000000000..cf8351524 --- /dev/null +++ b/buildroot/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch @@ -0,0 +1,37 @@ +From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001 +From: Andreas Fritiofson +Date: Fri, 17 Apr 2020 13:49:28 +0200 +Subject: [PATCH] bitbang: Fix FTBFS with GCC 10 + +GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd +struct between bitbang drivers due to a missing extern. + +Change-Id: I2b4122f7939cec91a72284006748f99a23548324 +Signed-off-by: Andreas Fritiofson +Reviewed-on: http://openocd.zylin.com/5592 +Tested-by: jenkins +Reviewed-by: Antonio Borneo +Reviewed-by: Jonathan McDowell + +Patch taken from upstream: https://github.com/ntfreak/openocd/commit/c60252ac2b636c4d99b766a574b9df0966151696 +Signed-off-by: Heiko Thiery +--- + src/jtag/drivers/bitbang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h +index edb779ca..bbbc693d 100644 +--- a/src/jtag/drivers/bitbang.h ++++ b/src/jtag/drivers/bitbang.h +@@ -56,7 +56,7 @@ struct bitbang_interface { + void (*swdio_drive)(bool on); + }; + +-const struct swd_driver bitbang_swd; ++extern const struct swd_driver bitbang_swd; + + extern bool swd_mode; + +-- +2.20.1 + diff --git a/buildroot/package/perl/perl.hash b/buildroot/package/perl/perl.hash index 161a4fd61..7c153fedb 100644 --- a/buildroot/package/perl/perl.hash +++ b/buildroot/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: http://www.cpan.org/src/5.0/perl-5.30.1.tar.xz.{md5,sha1,sha256}.txt -md5 f399f3aaee90ddcff5eadd3bccdaacc0 perl-5.30.1.tar.xz -sha1 4bc190b6ac368f573e6a028f91430f831d40d30a perl-5.30.1.tar.xz -sha256 7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 perl-5.30.1.tar.xz +# Hashes from: http://www.cpan.org/src/5.0/perl-5.30.2.tar.xz.{md5,sha1,sha256}.txt +md5 4bfa12b528522a50de0470b8b70b9b3b perl-5.30.2.tar.xz +sha1 d82cdaa610a3e749e821fc77004b1b4bfd5ebd28 perl-5.30.2.tar.xz +sha256 a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 perl-5.30.2.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.hash -sha256 edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d perl-cross-1.3.1.tar.gz +# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.hash +sha256 defa12f0ad7be0b6c48b4f76e2fb5b37c1b37fbeb6e9ebe938279cd539a0c20c perl-cross-1.3.2.tar.gz # Locally calculated -sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic -sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 4a39adc445d79e213df5c2028c5432806dfcdfe69a5bc31ba5c83071a0097877 README +sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic +sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying +sha256 4916e95d32b84e07c045d839646f74996f577e5f497bbba8177a94b31415cee7 README diff --git a/buildroot/package/perl/perl.mk b/buildroot/package/perl/perl.mk index 0ab81ddb3..c865fc768 100644 --- a/buildroot/package/perl/perl.mk +++ b/buildroot/package/perl/perl.mk @@ -6,14 +6,14 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 30 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2 PERL_SITE = http://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ PERL_LICENSE_FILES = Artistic Copying README PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.1 +PERL_CROSS_VERSION = 1.3.2 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index a0b8fd468..0267375f6 100644 --- a/buildroot/package/php/php.hash +++ b/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 d059fd7f55bdc4d2eada15a00a2976697010d3631ef6f83149cc5289e1f23c2c php-7.4.5.tar.xz +sha256 d740322f84f63019622b9f369d64ea5ab676547d2bdcf12be77a5a4cffd06832 php-7.4.6.tar.xz # License file -sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE +sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index 4d2f1b8f6..73be57a8a 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.5 +PHP_VERSION = 7.4.6 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES diff --git a/buildroot/package/prosody/Config.in b/buildroot/package/prosody/Config.in index c32ca20e2..0b0154710 100644 --- a/buildroot/package/prosody/Config.in +++ b/buildroot/package/prosody/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PROSODY depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on !BR2_PACKAGE_LUA_5_3 depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem - select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime + select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 # runtime select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime diff --git a/buildroot/package/python-pycrypto/0001-remove-incorrect-header-path.patch b/buildroot/package/python-pycrypto/0001-remove-incorrect-header-path.patch deleted file mode 100644 index 9268d311d..000000000 --- a/buildroot/package/python-pycrypto/0001-remove-incorrect-header-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -Do not use /usr/include for headers - -Using /usr/include is wrong when doing cross-compilation, so get rid -of it, and rely on the compiler to use the appropriate default paths -for headers. - -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -370,7 +370,7 @@ - 'ext_modules': plat_ext + [ - # _fastmath (uses GNU mp library) - Extension("Crypto.PublicKey._fastmath", -- include_dirs=['src/','/usr/include/'], -+ include_dirs=['src/'], - libraries=['gmp'], - sources=["src/_fastmath.c"]), - diff --git a/buildroot/package/python-pycrypto/Config.in b/buildroot/package/python-pycrypto/Config.in deleted file mode 100644 index e998ecf89..000000000 --- a/buildroot/package/python-pycrypto/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCRYPTO - bool "python-pycrypto" - select BR2_PACKAGE_GMP - help - PyCrypto is a collection of cryptographic algorithms and - protocols, implemented for use from Python. - - http://www.pycrypto.org/ diff --git a/buildroot/package/python-pycrypto/python-pycrypto.hash b/buildroot/package/python-pycrypto/python-pycrypto.hash deleted file mode 100644 index a16a44608..000000000 --- a/buildroot/package/python-pycrypto/python-pycrypto.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c pycrypto-2.6.1.tar.gz -# Locally computed -sha256 15925a98d05c6d086c30943e4eacdbd361bcf76daa109b6e6dfc9d0c4ad9ed64 COPYRIGHT -sha256 10c41e1aaf84bd3546d1ff7ef89454817744fd2c18cdd80a137e802095448016 LEGAL/copy/LICENSE.libtom -sha256 253a271c681cd4b3f9503659fe754ee305efe68ebb6e8733b7f436d73845a32c LEGAL/copy/LICENSE.python-2.2 -sha256 96f9a25274a59843715a26986e4a2427c312a1d86b9207f26fcafcea47a417fe LEGAL/copy/LICENSE.original diff --git a/buildroot/package/python-pycrypto/python-pycrypto.mk b/buildroot/package/python-pycrypto/python-pycrypto.mk deleted file mode 100644 index 927ba918a..000000000 --- a/buildroot/package/python-pycrypto/python-pycrypto.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# python-pycrypto -# -################################################################################ - -PYTHON_PYCRYPTO_VERSION = 2.6.1 -PYTHON_PYCRYPTO_SOURCE = pycrypto-$(PYTHON_PYCRYPTO_VERSION).tar.gz -PYTHON_PYCRYPTO_SITE = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto -PYTHON_PYCRYPTO_SETUP_TYPE = distutils - -PYTHON_PYCRYPTO_LICENSE = Public Domain, Python 2.2 License (HMAC.py, setup.py) -PYTHON_PYCRYPTO_LICENSE_FILES = \ - COPYRIGHT LEGAL/copy/LICENSE.libtom \ - LEGAL/copy/LICENSE.python-2.2 - -# The pycrypto package contains a LICENSE.orig file, but our patching -# infrastrucure removes all .orig file, so we must rename that license -# file prior to patching, so it is still available to the legal-info -# infrastructure -define PYTHON_PYCRYPTO_RENAME_LICENSE - mv $(@D)/LEGAL/copy/LICENSE.orig $(@D)/LEGAL/copy/LICENSE.original -endef -PYTHON_PYCRYPTO_POST_EXTRACT_HOOKS += PYTHON_PYCRYPTO_RENAME_LICENSE -HOST_PYTHON_PYCRYPTO_POST_EXTRACT_HOOKS += PYTHON_PYCRYPTO_RENAME_LICENSE -PYTHON_PYCRYPTO_LICENSE_FILES += LEGAL/copy/LICENSE.original - -PYTHON_PYCRYPTO_DEPENDENCIES = gmp -HOST_PYTHON_PYCRYPTO_DEPENDENCIES = host-gmp - -# The configure step needs to be run outside of the setup.py since it isn't -# run correctly for cross-compiling -define PYTHON_PYCRYPTO_CONFIGURE_CMDS - (cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="" \ - ) -endef - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk index 3d3b97ca4..05239e10e 100644 --- a/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/buildroot/package/python-pycryptodomex/python-pycryptodomex.mk @@ -15,3 +15,4 @@ PYTHON_PYCRYPTODOMEX_LICENSE = \ PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/buildroot/package/python-pyqt5/python-pyqt5.mk b/buildroot/package/python-pyqt5/python-pyqt5.mk index 260a93af9..9b5e9089f 100644 --- a/buildroot/package/python-pyqt5/python-pyqt5.mk +++ b/buildroot/package/python-pyqt5/python-pyqt5.mk @@ -65,7 +65,10 @@ endif ifeq ($(BR2_PACKAGE_QT5LOCATION),y) PYTHON_PYQT5_DEPENDENCIES += qt5location -PYTHON_PYQT5_MODULES += QtLocation QtPositioning +PYTHON_PYQT5_MODULES += QtPositioning +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +PYTHON_PYQT5_MODULES += QtLocation +endif endif ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y) diff --git a/buildroot/package/qemu/4.2.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch similarity index 100% rename from buildroot/package/qemu/4.2.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch rename to buildroot/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch diff --git a/buildroot/package/qemu/4.2.0/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/buildroot/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch similarity index 100% rename from buildroot/package/qemu/4.2.0/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch rename to buildroot/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch diff --git a/buildroot/package/qemu/4.2.0/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch b/buildroot/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch similarity index 100% rename from buildroot/package/qemu/4.2.0/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch rename to buildroot/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch diff --git a/buildroot/package/qemu/Config.in.host b/buildroot/package/qemu/Config.in.host index 5ed160159..7ccf768d1 100644 --- a/buildroot/package/qemu/Config.in.host +++ b/buildroot/package/qemu/Config.in.host @@ -3,7 +3,6 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_arm default y if BR2_armeb default y if BR2_aarch64 - default y if BR2_csky default y if BR2_i386 default y if BR2_m68k default y if BR2_microblazeel diff --git a/buildroot/package/qemu/qemu.hash b/buildroot/package/qemu/qemu.hash index dae11cb3f..322b4fdf1 100644 --- a/buildroot/package/qemu/qemu.hash +++ b/buildroot/package/qemu/qemu.hash @@ -2,6 +2,3 @@ sha256 d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 qemu-4.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB - -# Locally computed -sha256 61091767ffd16002e77f005155d096208094e69dee35e6d5ddcaa6c8a13b5e26 qemu-b517e1dc3125a57555d67a8deed9eac7b42288e2.tar.gz diff --git a/buildroot/package/qemu/qemu.mk b/buildroot/package/qemu/qemu.mk index 0bb29f936..7fe64e360 100644 --- a/buildroot/package/qemu/qemu.mk +++ b/buildroot/package/qemu/qemu.mk @@ -4,14 +4,9 @@ # ################################################################################ -ifeq ($(BR2_csky),y) -QEMU_VERSION = b517e1dc3125a57555d67a8deed9eac7b42288e2 -QEMU_SITE = $(call github,c-sky,qemu,$(QEMU_VERSION)) -else QEMU_VERSION = 4.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org -endif QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; @@ -238,13 +233,6 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif -ifeq ($(HOST_QEMU_ARCH),csky) -ifeq ($(BR2_ck610),y) -HOST_QEMU_ARCH = cskyv1 -else -HOST_QEMU_ARCH = cskyv2 -endif -endif HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) HOST_QEMU_CFLAGS = $(HOST_CFLAGS) diff --git a/buildroot/package/rpi-firmware/Config.in b/buildroot/package/rpi-firmware/Config.in index 7cebc5e7c..cced53f01 100644 --- a/buildroot/package/rpi-firmware/Config.in +++ b/buildroot/package/rpi-firmware/Config.in @@ -85,6 +85,8 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS default y depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \ || BR2_LINUX_KERNEL_DTS_SUPPORT + select BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT \ + if BR2_LINUX_KERNEL_DTS_SUPPORT help Say 'y' here if you need to load one or more of the DTB overlays, to support HATs (Hardware Attached on Top, add-on diff --git a/buildroot/package/rpi-firmware/config.txt b/buildroot/package/rpi-firmware/config.txt index cc7905aff..58cc966a8 100644 --- a/buildroot/package/rpi-firmware/config.txt +++ b/buildroot/package/rpi-firmware/config.txt @@ -4,8 +4,6 @@ # See http://buildroot.org/manual.html#rootfs-custom # and http://elinux.org/RPiconfig for a description of config.txt syntax -# If your system doesn't work anymore after changing overlays, please report this to the Raspberry Pi kernel project - kernel=zImage # To use an external initramfs file diff --git a/buildroot/package/rustc/Config.in.host b/buildroot/package/rustc/Config.in.host index d595efbc6..1df25ae32 100644 --- a/buildroot/package/rustc/Config.in.host +++ b/buildroot/package/rustc/Config.in.host @@ -49,6 +49,9 @@ choice config BR2_PACKAGE_HOST_RUST bool "host rust" + # RUSTC_TARGET_NAME must be set for building host-rust + # otherwise config.toml is broken. + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # triggers ICE on trunc_int_for_mode, at explow.c:56 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64 help diff --git a/buildroot/package/speexdsp/speexdsp.mk b/buildroot/package/speexdsp/speexdsp.mk index 901f22b9e..35c06dd83 100644 --- a/buildroot/package/speexdsp/speexdsp.mk +++ b/buildroot/package/speexdsp/speexdsp.mk @@ -5,7 +5,7 @@ ################################################################################ SPEEXDSP_VERSION = SpeexDSP-1.2.0 -SPEEXDSP_SITE = https://git.xiph.org/speexdsp.git +SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp.git SPEEXDSP_SITE_METHOD = git SPEEXDSP_LICENSE = BSD-3-Clause SPEEXDSP_LICENSE_FILES = COPYING diff --git a/buildroot/package/sysrepo/S51sysrepo-plugind b/buildroot/package/sysrepo/S51sysrepo-plugind index 74b68396b..60ea3ba7a 100644 --- a/buildroot/package/sysrepo/S51sysrepo-plugind +++ b/buildroot/package/sysrepo/S51sysrepo-plugind @@ -1,7 +1,7 @@ #!/bin/sh DAEMON="sysrepo-plugind" -PIDFILE="/var/run/$DAEMON.pid" +EXECUTABLE="/usr/bin/$DAEMON" SYSREPO_PLUGIND_ARGS="" @@ -10,7 +10,7 @@ SYSREPO_PLUGIND_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -q -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -x "$EXECUTABLE" \ -- $SYSREPO_PLUGIND_ARGS status=$? if [ "$status" -eq 0 ]; then @@ -23,7 +23,7 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p $PIDFILE + start-stop-daemon -K -q -x "$EXECUTABLE" status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index ca2174e5f..16ef131ba 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -434,37 +434,42 @@ define SYSTEMD_USERS endef ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) -# systemd needs getty.service for VTs and serial-getty.service for serial ttys -# note that console-getty.service should be used on /dev/console as it should not have dependencies -# also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that +# systemd provides multiple units to autospawn getty as neede +# * getty@.service to start a getty on normal TTY +# * sertial-getty@.service to start a getty on serial lines +# * console-getty.service for generic /dev/console +# * container-getty@.service for a getty on /dev/pts/* # -# systemd defaults to only have getty@tty.service enabled -# * DefaultInstance=tty1 in getty@service -# * no DefaultInstance in serial-getty@.service -# * WantedBy=getty.target in console-getty.service -# * console-getty is not enabled because of 90-systemd.preset -# We want "systemctl preset-all" to do the right thing, even when run on the target after boot -# * remove the default instance of getty@.service via a drop-in in /usr/lib -# * set a new DefaultInstance for getty@.service instead, if needed -# * set a new DefaultInstance for serial-getty@.service, if needed -# * override the systemd-provided preset for console-getty.service if needed +# the generator systemd-getty-generator will +# * read the console= kernel command line parameter +# * enable one of the above units depending on what it finds +# +# Systemd defaults to enablinb getty@tty1.service +# +# What we want to do +# * Enable a getty on $BR2_TARGET_GENERIC_TTY_PATH +# * Set the baudrate for all units according to BR2_TARGET_GENERIC_GETTY_BAUDRATE +# * Always enable a getty on the console using systemd-getty-generator +# (backward compatibility with previous releases of buildroot) +# +# What we do +# * disable getty@tty1 (enabled by upstream systemd) +# * enable getty@xxx if $BR2_TARGET_GENERIC_TTY_PATH is a tty +# * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_TTY_PATH +# * rewrite baudrates if a baudrate is provided define SYSTEMD_INSTALL_SERVICE_TTY mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ printf '[Install]\nDefaultInstance=\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ then \ - TARGET="console-getty.service"; \ - printf 'enable console-getty.service\n' \ - >$(TARGET_DIR)/usr/lib/systemd/system-preset/81-buildroot-tty.preset; \ + : ; \ elif echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \ then \ - TARGET="getty@.service"; \ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ else \ - TARGET="serial-getty@.service"; \ mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ @@ -472,7 +477,10 @@ define SYSTEMD_INSTALL_SERVICE_TTY fi; \ if [ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -gt 0 ] ; \ then \ - $(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${TARGET}; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/getty@.service; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/serial-getty@.service; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/console-getty@.service; \ + $(SED) 's/115200/$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),115200/' $(TARGET_DIR)/lib/systemd/system/container-getty@.service; \ fi endef endif diff --git a/buildroot/package/tremor/tremor.mk b/buildroot/package/tremor/tremor.mk index 835fe3617..a865e681d 100644 --- a/buildroot/package/tremor/tremor.mk +++ b/buildroot/package/tremor/tremor.mk @@ -5,7 +5,7 @@ ################################################################################ TREMOR_VERSION = 7c30a66346199f3f09017a09567c6c8a3a0eedc8 -TREMOR_SITE = https://git.xiph.org/tremor.git +TREMOR_SITE = https://gitlab.xiph.org/xiph/tremor.git TREMOR_SITE_METHOD = git TREMOR_LICENSE = BSD-3-Clause TREMOR_LICENSE_FILES = COPYING diff --git a/buildroot/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch b/buildroot/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch new file mode 100644 index 000000000..6a3929f3c --- /dev/null +++ b/buildroot/package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch @@ -0,0 +1,50 @@ +From df4d2000a22db673a788b8e57e8e7c0cc3cee777 Mon Sep 17 00:00:00 2001 +From: Leonard Chan +Date: Thu, 3 Oct 2019 18:53:04 -0700 +Subject: [PATCH] Make vboot_version extern in header + +When enabling `-fno-common` in Fuchsia, we get a bunch of linker errors +when linking futility: + +``` +ld.lld: error: duplicate symbol: vboot_version +>>> defined at futility.h:43 (../../third_party/vboot_reference/futility/futility.h:43) +>>> host_x63-asan_no_detect_leaks/obj/third_party/vboot_reference/futility/futility.cmd_bdb.c.o:(vboot_version) +>>> defined at futility.h:43 (../../third_party/vboot_reference/futility/futility.h:43) +>>> host_x64-asan_no_detect_leaks/obj/third_party/vboot_reference/futility/futility.cmd_create.c.o:(.bss.vboot_version+0x0) +``` + +and think this is because -fno-common places vboot_version for +unitialized global variables in the BSS section of each object file. +Making it extern instead resolves each reference to its definition in +futility/misc.c. + +Change-Id: I591f07abd1f975a8a9d078bb4366e2e0861390b4 +Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1839207 +Reviewed-by: Julius Werner +Reviewed-by: Joel Kitching +Commit-Queue: Julius Werner +Tested-by: Julius Werner + +Patch taken from upstream: https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/df4d2000a22db673a788b8e57e8e7c0cc3cee777 +Signed-off-by: Heiko Thiery +--- + futility/futility.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/futility/futility.h b/futility/futility.h +index 3bce1106..5dc426dd 100644 +--- a/futility/futility.h ++++ b/futility/futility.h +@@ -41,7 +41,7 @@ enum vboot_version { + }; + + /* What's our preferred API & data format? */ +-enum vboot_version vboot_version; ++extern enum vboot_version vboot_version; + + /* Here's a structure to define the commands that futility implements. */ + struct futil_cmd_t { +-- +2.20.1 + diff --git a/buildroot/package/wireshark/wireshark.hash b/buildroot/package/wireshark/wireshark.hash index d4d0c9e48..57b496282 100644 --- a/buildroot/package/wireshark/wireshark.hash +++ b/buildroot/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.3.txt -sha1 4656856a40b294f183900ba47651b0fc8e3950fd wireshark-3.2.3.tar.xz -sha256 f007e4b88c86d95e33af03e057ecc03635f54466d02371bc26489eabb274faba wireshark-3.2.3.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.4.txt +sha1 bb4157b57c1bcdbac948a1282dafad027d57be9b wireshark-3.2.4.tar.xz +sha256 d17d461e849e2d0b033431c45f71d8ee8ec3c8faa232a6ad63069a47927db8aa wireshark-3.2.4.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/buildroot/package/wireshark/wireshark.mk b/buildroot/package/wireshark/wireshark.mk index c262891dc..0d72f9dd9 100644 --- a/buildroot/package/wireshark/wireshark.mk +++ b/buildroot/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.2.3 +WIRESHARK_VERSION = 3.2.4 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/xen/xen.hash b/buildroot/package/xen/xen.hash index 422492465..ab5f9d908 100644 --- a/buildroot/package/xen/xen.hash +++ b/buildroot/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c69ae21b2ddeaf25532a81a448fcc6a218bc56f93c8907b2d416b2d4339c0afe xen-4.13.0.tar.gz +sha256 b97ce363e55b12c992063f4466c43cba0a6386ceb7a747b4dc670311f337ef01 xen-4.13.1.tar.gz sha256 36b91794c6d4a678137c70c41e384c03b552c7efba82c0d73e6be842e41ab3d3 COPYING diff --git a/buildroot/package/xen/xen.mk b/buildroot/package/xen/xen.mk index fa49f5996..15742b512 100644 --- a/buildroot/package/xen/xen.mk +++ b/buildroot/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.13.0 +XEN_VERSION = 4.13.1 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING diff --git a/scripts/patches.sh b/scripts/patches.sh deleted file mode 100755 index 58ddd9434..000000000 --- a/scripts/patches.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e - -for patch_file in buildroot-patches/*; do - patch -d buildroot/ -p1 < "${patch_file}"; -done diff --git a/scripts/update-buildroot.sh b/scripts/update-buildroot.sh new file mode 100755 index 000000000..bac3d234e --- /dev/null +++ b/scripts/update-buildroot.sh @@ -0,0 +1,26 @@ +#!/bin/bash +set -e + +if [ -z "$1" ]; then + echo "Need a buildroot version!" + exit 1 +fi + +rm -rf /tmp/buildroot-new +mkdir -p /tmp/buildroot-new + +echo "Download new buildroot" +curl -L https://buildroot.org/downloads/buildroot-${1}.tar.bz2 \ + | tar xvpjf - --strip 1 -C /tmp/buildroot-new + +echo "Install patches" +for patch_file in buildroot-patches/*; do + echo "Patch: ${patch_file}" + patch -d /tmp/buildroot-new -p 1 < "${patch_file}"; +done + +rm -rf buildroot +mv /tmp/buildroot-new buildroot + +git add buildroot +git commit -sam "Update buildroot to ${1}"