diff --git a/buildroot/CHANGES b/buildroot/CHANGES index ab34fde9a..f7b69af80 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,23 @@ +2021.02, released March 6th, 2021 + + Various fixes. + + Toolchain: Correct Bootlin xtensa-lx60 dependencies + + Updated/fixed packages: asterisk, belle-sip, bustle, dhcpcd, + dovecot, dovecot-pigeonhole, gnuchess, gnuradio, + gst1-plugins-bad, haproxy, jasper, kismet, libebml, + libeXosip2, libgeos, libhtp, libjpeg, libopenssl, libshout, + libstrophe, mosquitto, openblas, openssh, perl, privoxy, + prosody, python-pyyaml, python3-pyyaml, quagga, redis, + rust-bin, sox, suricata, tpm2-pkcs11, uclibc-ng-test, ushare, + util-linux, wolfssl, wpa_supplicant + + Issues resolved (http://bugs.uclibc.org): + + #13501: 2021.02.rc2: Unicode not work on qt 5.15.2 + #13581: jpegsrc.v9d.tar.gz has changed hash + 2021.02-rc3, released February 27th, 2021 Fixes all over the tree. diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index b019fe04d..0c48236da 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -492,8 +492,8 @@ F: board/friendlyarm/nanopi-m1 F: board/friendlyarm/nanopi-m1-plus F: board/olimex/a13_olinuxino F: board/orangepi/orangepi-plus -F: configs/nanopi_m1_defconfig -F: configs/nanopi_m1_plus_defconfig +F: configs/friendlyarm_nanopi_m1_defconfig +F: configs/friendlyarm_nanopi_m1_plus_defconfig F: configs/olimex_a13_olinuxino_defconfig F: configs/orangepi_plus_defconfig @@ -662,7 +662,7 @@ F: package/ev3dev-linux-drivers/ N: Davide Viti F: board/friendlyarm/nanopi-r1/ -F: configs/nanopi_r1_defconfig +F: configs/friendlyarm_nanopi_r1_defconfig F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ @@ -1642,7 +1642,7 @@ F: utils/diffconfig N: Marek Belisko F: board/friendlyarm/nanopi-neo4/ -F: configs/nanopi_neo4_defconfig +F: configs/friendlyarm_nanopi_neo4_defconfig F: package/libatasmart/ F: package/polkit/ F: package/sg3_utils/ @@ -2483,8 +2483,8 @@ F: board/pine64/rockpro64 F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 F: board/radxa/rockpi-n10 -F: configs/nanopc_t4_defconfig -F: configs/nanopi_m4_defconfig +F: configs/friendlyarm_nanopc_t4_defconfig +F: configs/friendlyarm_nanopi_m4_defconfig F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig F: configs/rock_pi_4_defconfig @@ -2722,7 +2722,7 @@ F: package/open62541/ N: Yann E. MORIN F: board/friendlyarm/nanopi-neo/ -F: configs/nanopi_neo_defconfig +F: configs/friendlyarm_nanopi_neo_defconfig F: fs/squashfs/ F: package/asterisk/ F: package/cegui/ diff --git a/buildroot/Makefile b/buildroot/Makefile index 13e98e85b..9d6b96247 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02-rc3 +export BR2_VERSION := 2021.02 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1614447000 +BR2_VERSION_EPOCH = 1615065000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/board/friendlyarm/nanopc-t4/readme.txt b/buildroot/board/friendlyarm/nanopc-t4/readme.txt index 6259c9e75..0989c6cc1 100644 --- a/buildroot/board/friendlyarm/nanopc-t4/readme.txt +++ b/buildroot/board/friendlyarm/nanopc-t4/readme.txt @@ -3,7 +3,7 @@ FriendlyARM NANOPC-T4 Build: - $ make nanopc_t4_defconfig + $ make friendlyarm_nanopc_t4_defconfig $ make Files created in output directory diff --git a/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt b/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt index 3e16c8afa..0327dec80 100644 --- a/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt +++ b/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt @@ -12,7 +12,7 @@ How to build it Configure Buildroot: - $ make nanopi_m1_plus_defconfig + $ make friendlyarm_nanopi_m1_plus_defconfig Compile everything and build the SD card image: diff --git a/buildroot/board/friendlyarm/nanopi-m1/readme.txt b/buildroot/board/friendlyarm/nanopi-m1/readme.txt index 8b10e4b7c..6a34c4239 100644 --- a/buildroot/board/friendlyarm/nanopi-m1/readme.txt +++ b/buildroot/board/friendlyarm/nanopi-m1/readme.txt @@ -12,7 +12,7 @@ How to build it Configure Buildroot: - $ make nanopi_m1_defconfig + $ make friendlyarm_nanopi_m1_defconfig Compile everything and build the SD card image: diff --git a/buildroot/board/friendlyarm/nanopi-m4/readme.txt b/buildroot/board/friendlyarm/nanopi-m4/readme.txt index 4a606cf97..0553bf837 100644 --- a/buildroot/board/friendlyarm/nanopi-m4/readme.txt +++ b/buildroot/board/friendlyarm/nanopi-m4/readme.txt @@ -3,7 +3,7 @@ FriendlyARM NANOPI-M4 Build: - $ make nanopi_m4_defconfig + $ make friendlyarm_nanopi_m4_defconfig $ make Files created in output directory diff --git a/buildroot/board/friendlyarm/nanopi-neo/readme.txt b/buildroot/board/friendlyarm/nanopi-neo/readme.txt index 539df541d..84fb9cc48 100644 --- a/buildroot/board/friendlyarm/nanopi-neo/readme.txt +++ b/buildroot/board/friendlyarm/nanopi-neo/readme.txt @@ -24,7 +24,7 @@ yet upstream, but are being actively worked on. How to build ============ - $ make nanopi_neo_defconfig + $ make friendlyarm_nanopi_neo_defconfig $ make Note: you will need access to the internet to download the required diff --git a/buildroot/board/friendlyarm/nanopi-neo4/readme.txt b/buildroot/board/friendlyarm/nanopi-neo4/readme.txt index 07e349145..7c04a5280 100644 --- a/buildroot/board/friendlyarm/nanopi-neo4/readme.txt +++ b/buildroot/board/friendlyarm/nanopi-neo4/readme.txt @@ -12,7 +12,7 @@ Build Run NanoPi Neo4 configuration - $ make nanopi_neo4_defconfig + $ make friendlyarm_nanopi_neo4_defconfig To build, run make comamnd. diff --git a/buildroot/board/friendlyarm/nanopi-r1/readme.txt b/buildroot/board/friendlyarm/nanopi-r1/readme.txt index 0ff63df3c..fa3114fc8 100644 --- a/buildroot/board/friendlyarm/nanopi-r1/readme.txt +++ b/buildroot/board/friendlyarm/nanopi-r1/readme.txt @@ -12,7 +12,7 @@ How to build it Configure Buildroot: - $ make nanopi_r1_defconfig + $ make friendlyarm_nanopi_r1_defconfig Compile everything and build the SD card image: diff --git a/buildroot/configs/nanopc_t4_defconfig b/buildroot/configs/friendlyarm_nanopc_t4_defconfig similarity index 100% rename from buildroot/configs/nanopc_t4_defconfig rename to buildroot/configs/friendlyarm_nanopc_t4_defconfig diff --git a/buildroot/configs/nanopi_m1_defconfig b/buildroot/configs/friendlyarm_nanopi_m1_defconfig similarity index 100% rename from buildroot/configs/nanopi_m1_defconfig rename to buildroot/configs/friendlyarm_nanopi_m1_defconfig diff --git a/buildroot/configs/nanopi_m1_plus_defconfig b/buildroot/configs/friendlyarm_nanopi_m1_plus_defconfig similarity index 100% rename from buildroot/configs/nanopi_m1_plus_defconfig rename to buildroot/configs/friendlyarm_nanopi_m1_plus_defconfig diff --git a/buildroot/configs/nanopi_m4_defconfig b/buildroot/configs/friendlyarm_nanopi_m4_defconfig similarity index 100% rename from buildroot/configs/nanopi_m4_defconfig rename to buildroot/configs/friendlyarm_nanopi_m4_defconfig diff --git a/buildroot/configs/nanopi_neo4_defconfig b/buildroot/configs/friendlyarm_nanopi_neo4_defconfig similarity index 100% rename from buildroot/configs/nanopi_neo4_defconfig rename to buildroot/configs/friendlyarm_nanopi_neo4_defconfig diff --git a/buildroot/configs/nanopi_neo_defconfig b/buildroot/configs/friendlyarm_nanopi_neo_defconfig similarity index 100% rename from buildroot/configs/nanopi_neo_defconfig rename to buildroot/configs/friendlyarm_nanopi_neo_defconfig diff --git a/buildroot/configs/nanopi_r1_defconfig b/buildroot/configs/friendlyarm_nanopi_r1_defconfig similarity index 100% rename from buildroot/configs/nanopi_r1_defconfig rename to buildroot/configs/friendlyarm_nanopi_r1_defconfig diff --git a/buildroot/docs/manual/adding-packages-generic.txt b/buildroot/docs/manual/adding-packages-generic.txt index 75af18b70..2201d4385 100644 --- a/buildroot/docs/manual/adding-packages-generic.txt +++ b/buildroot/docs/manual/adding-packages-generic.txt @@ -528,14 +528,8 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321 + If any of those variables is defined, then the generic package infrastructure assumes the package provides valid CPE information. In -this case, +LIBFOO_CPE_ID_VALID = YES+ will be set, and the generic -package infrastructure will define +LIBFOO_CPE_ID+. -+ -Alternatively, a package can also explicitly set +LIBFOO_CPE_ID_VALID -= YES+ if the default values for +LIBFOO_CPE_ID_PREFIX+, -+LIBFOO_CPE_ID_VENDOR+, +LIBFOO_CPE_ID_PRODUCT+, -+LIBFOO_CPE_ID_VERSION+, +LIBFOO_CPE_ID_UPDATE+ are all correct for -this package and don't need to be explicitly overridden. +this case, the generic package infrastructure will define ++LIBFOO_CPE_ID+. + For a host package, if its +LIBFOO_CPE_ID_*+ variables are not defined, it inherits the value of those variables from the diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 96c29da0b..862a205a0 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Details about packages
8.9. Graphing the dependencies between packages
8.10. Graphing the build duration
8.11. Graphing the filesystem size contribution of packages
8.12. Top-level parallel build
8.13. Integration with Eclipse
8.14. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Using SELinux in Buildroot
10.1. Enabling SELinux support
10.2. SELinux policy tweaking
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The documentation
16.4. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. Infrastructure for packages with specific build systems
18.6. Infrastructure for autotools-based packages
18.7. Infrastructure for CMake-based packages
18.8. Infrastructure for Python packages
18.9. Infrastructure for LuaRocks-based packages
18.10. Infrastructure for Perl/CPAN packages
18.11. Infrastructure for virtual packages
18.12. Infrastructure for packages using kconfig for configuration files
18.13. Infrastructure for rebar-based packages
18.14. Infrastructure for Waf-based packages
18.15. Infrastructure for Meson-based packages
18.16. Integration of Cargo-based packages
18.17. Infrastructure for Go packages
18.18. Infrastructure for QMake-based packages
18.19. Infrastructure for packages building kernel modules
18.20. Infrastructure for asciidoc documents
18.21. Infrastructure specific to the Linux kernel package
18.22. Hooks available in the various build steps
18.23. Gettext integration and interaction with packages
18.24. Tips and tricks
18.25. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Integrating patches found on the Web
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the run-tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
27. Migrating from older Buildroot versions
27.1. Migrating to 2016.11
27.2. Migrating to 2017.08

List of Examples

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

Buildroot 2021.02-rc3 manual generated on 2021-02-27 -17:36:58 UTC from git revision 4c5b27fbef

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

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Details about packages
8.9. Graphing the dependencies between packages
8.10. Graphing the build duration
8.11. Graphing the filesystem size contribution of packages
8.12. Top-level parallel build
8.13. Integration with Eclipse
8.14. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Using SELinux in Buildroot
10.1. Enabling SELinux support
10.2. SELinux policy tweaking
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The documentation
16.4. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. Infrastructure for packages with specific build systems
18.6. Infrastructure for autotools-based packages
18.7. Infrastructure for CMake-based packages
18.8. Infrastructure for Python packages
18.9. Infrastructure for LuaRocks-based packages
18.10. Infrastructure for Perl/CPAN packages
18.11. Infrastructure for virtual packages
18.12. Infrastructure for packages using kconfig for configuration files
18.13. Infrastructure for rebar-based packages
18.14. Infrastructure for Waf-based packages
18.15. Infrastructure for Meson-based packages
18.16. Integration of Cargo-based packages
18.17. Infrastructure for Go packages
18.18. Infrastructure for QMake-based packages
18.19. Infrastructure for packages building kernel modules
18.20. Infrastructure for asciidoc documents
18.21. Infrastructure specific to the Linux kernel package
18.22. Hooks available in the various build steps
18.23. Gettext integration and interaction with packages
18.24. Tips and tricks
18.25. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Integrating patches found on the Web
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the run-tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
27. Migrating from older Buildroot versions
27.1. Migrating to 2016.11
27.2. Migrating to 2017.08

List of Examples

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

Buildroot 2021.02 manual generated on 2021-03-06 +21:24:22 UTC from git revision e2fba6457b

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 @@ -3346,12 +3346,8 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321

    *.

If any of those variables is defined, then the generic package infrastructure assumes the package provides valid CPE information. In -this case, LIBFOO_CPE_ID_VALID = YES will be set, and the generic -package infrastructure will define LIBFOO_CPE_ID.

Alternatively, a package can also explicitly set LIBFOO_CPE_ID_VALID -= YES if the default values for LIBFOO_CPE_ID_PREFIX, -LIBFOO_CPE_ID_VENDOR, LIBFOO_CPE_ID_PRODUCT, -LIBFOO_CPE_ID_VERSION, LIBFOO_CPE_ID_UPDATE are all correct for -this package and don’t need to be explicitly overridden.

For a host package, if its LIBFOO_CPE_ID_* variables are not +this case, the generic package infrastructure will define +LIBFOO_CPE_ID.

For a host package, if its LIBFOO_CPE_ID_* variables are not defined, it inherits the value of those variables from the corresponding target package.

The recommended way to define these variables is to use the following syntax:

LIBFOO_VERSION = 2.32

Now, the variables that define what should be performed at the @@ -5422,7 +5418,7 @@ large number of commits in the series;

  • deep impact of the changes in the rest of the project;
  • -RFC [4]; +RFC [4];
  • whenever you feel it will help presenting your work, your choices, the review process, etc. @@ -5636,7 +5632,7 @@ to trigger all run-test test case jobs: 
    •  $ git push gitlab HEAD:<name>-runtime-tests
    • to trigger one test case job, a specific branch naming string is used that includes the full test case name. -
     $ git push gitlab HEAD:<name>-<test case name>

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

    Chapter 23. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that +

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

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

    Chapter 23. DEVELOPERS file and get-developers

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

    • Calculate the list of developers to whom patches should be sent, by diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index 15e68bb4e..6004a9d85 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 d5137cc80..a6ecc2dbc 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -174,13 +174,13 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2021.02-rc3 manual generated on 2021-02-27 17:37:02 UTC -from git revision 4c5b27fbef +Buildroot 2021.02 manual generated on 2021-03-06 21:24:27 UTC from +git revision e2fba6457b 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= -4c5b27fbef3db3a3dc3628e90d452493729f51aa] file in the Buildroot +e2fba6457bd9d9c720540332eaf0c1f8c29eab00] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers @@ -4872,15 +4872,8 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321 If any of those variables is defined, then the generic package infrastructure assumes the package provides valid CPE - information. In this case, LIBFOO_CPE_ID_VALID = YES will be set, - and the generic package infrastructure will define LIBFOO_CPE_ID. - - Alternatively, a package can also explicitly set - LIBFOO_CPE_ID_VALID = YES if the default values for - LIBFOO_CPE_ID_PREFIX, LIBFOO_CPE_ID_VENDOR, - LIBFOO_CPE_ID_PRODUCT, LIBFOO_CPE_ID_VERSION, - LIBFOO_CPE_ID_UPDATE are all correct for this package and don’t - need to be explicitly overridden. + information. In this case, the generic package infrastructure + will define LIBFOO_CPE_ID. For a host package, if its LIBFOO_CPE_ID_* variables are not defined, it inherits the value of those variables from the diff --git a/buildroot/docs/website/download.html b/buildroot/docs/website/download.html index 1bc7104a4..bd6499dfc 100644 --- a/buildroot/docs/website/download.html +++ b/buildroot/docs/website/download.html @@ -8,40 +8,40 @@
      Download
      -

      Latest long term support release: 2020.02.11

      +

      Latest stable / long term support release: 2021.02

      - +
      - +
      -

      buildroot-2020.02.11.tar.gz

      -

      PGP signature

      +

      buildroot-2021.02.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2020.02.11.tar.bz2

      -

      PGP signature

      +

      buildroot-2021.02.tar.bz2

      +

      PGP signature

      - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
      diff --git a/buildroot/docs/website/news.html b/buildroot/docs/website/news.html index c10230c41..c882664c7 100644 --- a/buildroot/docs/website/news.html +++ b/buildroot/docs/website/news.html @@ -9,6 +9,27 @@

      News

        +
      • +
        +
        +
        +

        2021.02 released

        +

        6 March 2021

        +
        +
        +

        The stable 2021.02 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2021.02 release.

        + +

        Notice that this is a long term support release which will be + supported with security and other important fixes until March 2022.

        +
        +
        +
        • +
      • diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index f0515632e..5b3a62687 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.19" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index 5200c53a3..6ab7a6989 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 06698c0ce35ceefa9b79ceb108ec7fb86de05f51fe615f3ae5cc82e293dfe1f2 linux-5.10.13.tar.xz -sha256 030ae544f346bfa2ce619dd9e17e93d10ec393632d3b6d6cf5d1fc84b914d449 linux-5.4.95.tar.xz +sha256 27e7bbb0de7f0acc29c3c2e0a70c9a5fafc5fcf250993ce48713f809862ab4d6 linux-5.10.19.tar.xz +sha256 4e118c072dbe3209ddeaff32ecc558f7e809d54e661550342079f1ee76d9349d linux-5.4.101.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 2f3830ed4767b27dc6ead9af5c802eed7258b28c527efe90ce188cc6bd668550 linux-4.4.255.tar.xz -sha256 afdf2d03c920f6b12f4e207ab18e45fbe2d7f4a61c066eff0d9916fc5d00c118 linux-4.9.255.tar.xz -sha256 75eecaa731c091fcf3bc2ec914b01d299a447d78041cb66a11a2ab169eb801dd linux-4.14.219.tar.xz -sha256 d2fdd236e6f31aa8e939f4a686c95417d8571bde3d091fc6a2535937c144195f linux-4.19.173.tar.xz +sha256 0c41611ae151b80723eb68c75f8a3366756f93e8748ab0892255344f38d76665 linux-4.4.258.tar.xz +sha256 d478f8e069f6d8b86b0a69f99252ea9e7cd7070bf6bdd0e9b3773ee418e5c8cd linux-4.9.258.tar.xz +sha256 734082b03d9f8e43b123b0061f08045b70c34e3a4b09f8a8da6a287686dac744 linux-4.14.222.tar.xz +sha256 ac0eb3794e01eac66bea3ab39b8776dadf15c418ddc534ccfd95a0270302357d linux-4.19.177.tar.xz # Locally computed sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz sha256 bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c linux-cip-4.19.152-cip37-rt16.tar.gz diff --git a/buildroot/package/apr-util/apr-util.mk b/buildroot/package/apr-util/apr-util.mk index 53b633b15..db4df9156 100644 --- a/buildroot/package/apr-util/apr-util.mk +++ b/buildroot/package/apr-util/apr-util.mk @@ -9,6 +9,8 @@ APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = http://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 APR_UTIL_LICENSE_FILES = LICENSE +APR_UTIL_CPE_ID_VENDOR = apache +APR_UTIL_CPE_ID_PRODUCT = portable_runtime_utility APR_UTIL_INSTALL_STAGING = YES APR_UTIL_DEPENDENCIES = apr expat APR_UTIL_CONF_OPTS = \ diff --git a/buildroot/package/asn1c/asn1c.mk b/buildroot/package/asn1c/asn1c.mk index e76a9f84f..a5fb9ccf1 100644 --- a/buildroot/package/asn1c/asn1c.mk +++ b/buildroot/package/asn1c/asn1c.mk @@ -8,6 +8,6 @@ ASN1C_VERSION = 0.9.28 ASN1C_SITE = https://github.com/vlm/asn1c/releases/download/v$(ASN1C_VERSION) ASN1C_LICENSE = BSD-2-Clause ASN1C_LICENSE_FILES = LICENSE -ASN1C_CPE_ID_VALID = YES +ASN1C_CPE_ID_VENDOR = asn1c_project $(eval $(host-autotools-package)) diff --git a/buildroot/package/asterisk/asterisk.mk b/buildroot/package/asterisk/asterisk.mk index b220b5418..67b6da56d 100644 --- a/buildroot/package/asterisk/asterisk.mk +++ b/buildroot/package/asterisk/asterisk.mk @@ -280,6 +280,17 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ASTERISK_MAKE_OPTS += ASTLDFLAGS="-latomic" endif +# Remove default -O3 optimization flag +ASTERISK_MAKE_OPTS += OPTIMIZE="" + +ASTERISK_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),y) +ASTERISK_CFLAGS += -O0 +endif + +ASTERISK_CONF_OPTS += CFLAGS="$(ASTERISK_CFLAGS)" + # We want to install sample configuration files, too. ASTERISK_INSTALL_TARGET_OPTS = \ $(ASTERISK_DIRS) \ diff --git a/buildroot/package/atftp/atftp.mk b/buildroot/package/atftp/atftp.mk index de67a4c68..a2df4af05 100644 --- a/buildroot/package/atftp/atftp.mk +++ b/buildroot/package/atftp/atftp.mk @@ -8,7 +8,7 @@ ATFTP_VERSION = 0.7.4 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE -ATFTP_CPE_ID_VALID = YES +ATFTP_CPE_ID_VENDOR = atftp_project ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp # For static we need to explicitly link against libpthread ATFTP_LIBS = -lpthread diff --git a/buildroot/package/atop/atop.mk b/buildroot/package/atop/atop.mk index acbaf2995..88f292b6b 100644 --- a/buildroot/package/atop/atop.mk +++ b/buildroot/package/atop/atop.mk @@ -8,7 +8,7 @@ ATOP_VERSION = 2.6.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING -ATOP_CPE_ID_VALID = YES +ATOP_CPE_ID_VENDOR = atop_project ATOP_DEPENDENCIES = ncurses zlib ATOP_CFLAGS = $(TARGET_CFLAGS) diff --git a/buildroot/package/attr/attr.mk b/buildroot/package/attr/attr.mk index 13f3f0db3..b6b46453c 100644 --- a/buildroot/package/attr/attr.mk +++ b/buildroot/package/attr/attr.mk @@ -8,7 +8,7 @@ ATTR_VERSION = 2.4.48 ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -ATTR_CPE_ID_VALID = YES +ATTR_CPE_ID_VENDOR = attr_project ATTR_INSTALL_STAGING = YES diff --git a/buildroot/package/axel/axel.mk b/buildroot/package/axel/axel.mk index 8dbf277b8..8e3d7679e 100644 --- a/buildroot/package/axel/axel.mk +++ b/buildroot/package/axel/axel.mk @@ -9,7 +9,7 @@ AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/ AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING -AXEL_CPE_ID_VALID = YES +AXEL_CPE_ID_VENDOR = axel_project AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test diff --git a/buildroot/package/bdwgc/bdwgc.mk b/buildroot/package/bdwgc/bdwgc.mk index 4a720dbfd..57dd82cab 100644 --- a/buildroot/package/bdwgc/bdwgc.mk +++ b/buildroot/package/bdwgc/bdwgc.mk @@ -10,7 +10,7 @@ BDWGC_SITE = http://www.hboehm.info/gc/gc_source BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK -BDWGC_CPE_ID_VALID = YES +BDWGC_CPE_ID_VENDOR = bdwgc_project BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf diff --git a/buildroot/package/beecrypt/beecrypt.mk b/buildroot/package/beecrypt/beecrypt.mk index 20e1a122d..78c3c2ebb 100644 --- a/buildroot/package/beecrypt/beecrypt.mk +++ b/buildroot/package/beecrypt/beecrypt.mk @@ -10,7 +10,7 @@ BEECRYPT_AUTORECONF = YES BEECRYPT_INSTALL_STAGING = YES BEECRYPT_LICENSE = LGPL-2.1+ BEECRYPT_LICENSE_FILES = COPYING.LIB -BEECRYPT_CPE_ID_VALID = YES +BEECRYPT_CPE_ID_VENDOR = beecrypt_project BEECRYPT_CONF_OPTS = \ --disable-expert-mode \ diff --git a/buildroot/package/belle-sip/belle-sip.mk b/buildroot/package/belle-sip/belle-sip.mk index b5169be48..23b60e51f 100644 --- a/buildroot/package/belle-sip/belle-sip.mk +++ b/buildroot/package/belle-sip/belle-sip.mk @@ -32,4 +32,12 @@ else ifeq ($(BR2_SHARED_LIBS),y) BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF endif +BELLE_SIP_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99140),y) +BELLE_SIP_CFLAGS += -O0 +endif + +BELLE_SIP_CONF_OPTS += -DCMAKE_C_FLAGS="$(BELLE_SIP_CFLAGS)" + $(eval $(cmake-package)) diff --git a/buildroot/package/bootstrap/bootstrap.mk b/buildroot/package/bootstrap/bootstrap.mk index c9f6003b5..eba1244ad 100644 --- a/buildroot/package/bootstrap/bootstrap.mk +++ b/buildroot/package/bootstrap/bootstrap.mk @@ -9,6 +9,7 @@ BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRA BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip BOOTSTRAP_LICENSE = MIT BOOTSTRAP_LICENSE_FILES = css/bootstrap.css +BOOTSTRAP_CPE_ID_VENDOR = getbootstrap define BOOTSTRAP_EXTRACT_CMDS $(UNZIP) $(BOOTSTRAP_DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D) diff --git a/buildroot/package/botan/botan.mk b/buildroot/package/botan/botan.mk index c3af4a45d..2e3f99b49 100644 --- a/buildroot/package/botan/botan.mk +++ b/buildroot/package/botan/botan.mk @@ -9,7 +9,7 @@ BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt -BOTAN_CPE_ID_VALID = YES +BOTAN_CPE_ID_VENDOR = botan_project BOTAN_INSTALL_STAGING = YES diff --git a/buildroot/package/bubblewrap/bubblewrap.mk b/buildroot/package/bubblewrap/bubblewrap.mk index 388f64880..18c175951 100644 --- a/buildroot/package/bubblewrap/bubblewrap.mk +++ b/buildroot/package/bubblewrap/bubblewrap.mk @@ -11,6 +11,7 @@ BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap BUBBLEWRAP_LICENSE = LGPL-2.0+ BUBBLEWRAP_LICENSE_FILES = COPYING +BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ --enable-require-userns=no \ diff --git a/buildroot/package/bustle/bustle.mk b/buildroot/package/bustle/bustle.mk index c6c3a72a9..b92d1a3ea 100644 --- a/buildroot/package/bustle/bustle.mk +++ b/buildroot/package/bustle/bustle.mk @@ -9,7 +9,12 @@ BUSTLE_SITE = https://hackage.haskell.org/package/bustle-$(BUSTLE_VERSION) BUSTLE_LICENSE = LGPL-2.1+ BUSTLE_LICENSE_FILES = LICENSE BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf -BUSTLE_MAKE_OPTS = PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config + +ifeq ($(BR2_STATIC_LIBS),y) +BUSTLE_MAKE_OPTS += PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config --static" +else +BUSTLE_MAKE_OPTS += PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config" +endif define BUSTLE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ diff --git a/buildroot/package/c-icap/c-icap.mk b/buildroot/package/c-icap/c-icap.mk index 5548fb4b9..fb66c75e6 100644 --- a/buildroot/package/c-icap/c-icap.mk +++ b/buildroot/package/c-icap/c-icap.mk @@ -9,7 +9,7 @@ C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ C_ICAP_LICENSE_FILES = COPYING -C_ICAP_CPE_ID_VALID = YES +C_ICAP_CPE_ID_VENDOR = c-icap_project C_ICAP_INSTALL_STAGING = YES C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config C_ICAP_CONF_OPTS = \ diff --git a/buildroot/package/civetweb/civetweb.mk b/buildroot/package/civetweb/civetweb.mk index 2cabee373..94fbb4f9d 100644 --- a/buildroot/package/civetweb/civetweb.mk +++ b/buildroot/package/civetweb/civetweb.mk @@ -8,7 +8,7 @@ CIVETWEB_VERSION = 1.13 CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md -CIVETWEB_CPE_ID_VALID = YES +CIVETWEB_CPE_ID_VENDOR = civetweb_project CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1) diff --git a/buildroot/package/cjson/cjson.mk b/buildroot/package/cjson/cjson.mk index 4bfab3b64..47f8ecfd1 100644 --- a/buildroot/package/cjson/cjson.mk +++ b/buildroot/package/cjson/cjson.mk @@ -9,7 +9,7 @@ CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE -CJSON_CPE_ID_VALID = YES +CJSON_CPE_ID_VENDOR = cjson_project # Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable # -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP CJSON_CONF_OPTS += \ diff --git a/buildroot/package/cryptsetup/cryptsetup.mk b/buildroot/package/cryptsetup/cryptsetup.mk index 34981282b..719885b59 100644 --- a/buildroot/package/cryptsetup/cryptsetup.mk +++ b/buildroot/package/cryptsetup/cryptsetup.mk @@ -15,7 +15,7 @@ CRYPTSETUP_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL -CRYPTSETUP_CPE_ID_VALID = YES +CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 diff --git a/buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32.patch b/buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32-21.patch similarity index 70% rename from buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32.patch rename to buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32-21.patch index 89dd3c763..5d28fca51 100644 --- a/buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32.patch +++ b/buildroot/package/dhcpcd/0001-src-privsep-linux.c-add-support-for-nds32-21.patch @@ -1,7 +1,7 @@ -From bc59536c202ba134422a42fe4dfdfe0643806c8f Mon Sep 17 00:00:00 2001 +From 92dc3bd959681cf65d4a3466c89233cf0411b693 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine -Date: Fri, 29 Jan 2021 22:21:00 +0100 -Subject: [PATCH] src/privsep-linux.c: add support for nds32 +Date: Sat, 30 Jan 2021 12:10:08 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for nds32 (#21) Fix the following build failure: @@ -13,17 +13,22 @@ privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a fu BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), ^~~~~~~~~~~~~~~~~~ +It should be noted that AUDIT_ARCH_NDS32 is only defined since kernel +5.2 and +https://github.com/torvalds/linux/commit/fa562447e154334523daa44c0b60625d71a345f5 + Fixes: - http://autobuild.buildroot.org/results/af8ba07ea0c12ab8cd24d528ef98db05521f3d36 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/rsmarples/dhcpcd/pull/21] +(cherry picked from commit 3848e7204f23bb78eb42dcde4898c70aca67d58d) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- src/privsep-linux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 2226659b..e81689bb 100644 +index d31d720d..8716032c 100644 --- a/src/privsep-linux.c +++ b/src/privsep-linux.c @@ -182,6 +182,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) diff --git a/buildroot/package/dhcpcd/0002-src-privsep-linux.c-add-support-for-xtensa-22.patch b/buildroot/package/dhcpcd/0002-src-privsep-linux.c-add-support-for-xtensa-22.patch new file mode 100644 index 000000000..f1789b13f --- /dev/null +++ b/buildroot/package/dhcpcd/0002-src-privsep-linux.c-add-support-for-xtensa-22.patch @@ -0,0 +1,42 @@ +From 1a77d82b0020ff4c71ffe55262676c3403978bd5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 31 Jan 2021 03:35:10 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for xtensa (#22) + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +It should be noted that AUDIT_ARCH_XTENSA is only defined since kernel +5.0 and +https://github.com/torvalds/linux/commit/98c3115a4ec56f03056efd9295e0fcb4c5c57a85 + +Signed-off-by: Fabrice Fontaine +(cherry picked from commit 19c3d9209a834e02918a17e011afd9da3e5be38d) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 8716032c..f1b33f91 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -204,6 +204,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # else + # define AUDIT_ARCH_SPARC + # endif ++#elif defined(__xtensa__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA + #else + # error "Platform does not support seccomp filter yet" + #endif +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0003-Linux-Add-support-for-NDS32BE-SECCOMP.patch b/buildroot/package/dhcpcd/0003-Linux-Add-support-for-NDS32BE-SECCOMP.patch new file mode 100644 index 000000000..de9526884 --- /dev/null +++ b/buildroot/package/dhcpcd/0003-Linux-Add-support-for-NDS32BE-SECCOMP.patch @@ -0,0 +1,31 @@ +From 4d2ef61b8b4abcb446699b9d3c29b422f2cf9826 Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Sun, 31 Jan 2021 07:37:03 +0000 +Subject: [PATCH] Linux: Add support for NDS32BE SECCOMP + +(cherry picked from commit 8253ef16e11db8b52af1ed8021cd2517046165d6) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index f1b33f91..04950ed2 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -183,7 +183,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_MIPS + # endif + #elif defined(__nds32__) +-# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32 ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32 ++#ele ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32BE ++#endif + #elif defined(__powerpc64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 + #elif defined(__powerpc__) +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0004-Typo-with-prior.patch b/buildroot/package/dhcpcd/0004-Typo-with-prior.patch new file mode 100644 index 000000000..9c9889571 --- /dev/null +++ b/buildroot/package/dhcpcd/0004-Typo-with-prior.patch @@ -0,0 +1,27 @@ +From 59f67be640881eaf56cc30c304362af00523ff5d Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Sun, 31 Jan 2021 10:08:11 +0000 +Subject: [PATCH] Typo with prior + +(cherry picked from commit d8d7f68001db3f084dfbb6e5b8ea4491088b55ba) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 04950ed2..1660447c 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -185,7 +185,7 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + #elif defined(__nds32__) + # if (BYTE_ORDER == LITTLE_ENDIAN) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32 +-#ele ++#else + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32BE + #endif + #elif defined(__powerpc64__) +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0005-src-privsep-linux.c-add-support-for-nios2-23.patch b/buildroot/package/dhcpcd/0005-src-privsep-linux.c-add-support-for-nios2-23.patch new file mode 100644 index 000000000..ac1ef071a --- /dev/null +++ b/buildroot/package/dhcpcd/0005-src-privsep-linux.c-add-support-for-nios2-23.patch @@ -0,0 +1,42 @@ +From 24ca5bdd409dd811a088bc702a2b6f99ea05ad19 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 31 Jan 2021 11:12:21 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for nios2 (#23) + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +It should be noted that AUDIT_ARCH_NIOS2 is only defined since kernel +5.2 and +https://github.com/torvalds/linux/commit/1660aac45e5b49a5ace29fb5b73254617533fcbd + +Signed-off-by: Fabrice Fontaine +(cherry picked from commit d670866ce008c21cbf6d5b20c4d4af6460ec35d2) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 1660447c..e374c068 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -188,6 +188,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + #else + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32BE + #endif ++#elif defined(__nios2__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NIOS2 + #elif defined(__powerpc64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 + #elif defined(__powerpc__) +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0006-src-privsep-linux.c-add-support-for-microblaze-24.patch b/buildroot/package/dhcpcd/0006-src-privsep-linux.c-add-support-for-microblaze-24.patch new file mode 100644 index 000000000..245faed47 --- /dev/null +++ b/buildroot/package/dhcpcd/0006-src-privsep-linux.c-add-support-for-microblaze-24.patch @@ -0,0 +1,42 @@ +From 89a2f250ed978950aecf4854d1cee16f57946759 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 31 Jan 2021 21:57:40 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for microblaze (#24) + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +It should be noted that AUDIT_ARCH_MICROBLAZE is only defined since +kernel 3.18 and +https://github.com/torvalds/linux/commit/ce5d112827e5c2e9864323d0efd7ec2a62c6dce0 + +Signed-off-by: Fabrice Fontaine +(cherry picked from commit e3a40586dbb584774d0a17bc277e69cb500cfa38) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index e374c068..a861a836 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -170,6 +170,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # endif + #elif defined(__ia64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_IA64 ++#elif defined(__microblaze__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_MICROBLAZE + #elif defined(__mips__) + # if defined(__MIPSEL__) + # if defined(__LP64__) +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0007-src-privsep-linux.c-add-support-for-sh-25.patch b/buildroot/package/dhcpcd/0007-src-privsep-linux.c-add-support-for-sh-25.patch new file mode 100644 index 000000000..b9c023805 --- /dev/null +++ b/buildroot/package/dhcpcd/0007-src-privsep-linux.c-add-support-for-sh-25.patch @@ -0,0 +1,54 @@ +From 10acecc0583b7301cb539ba6875618956fa3d13b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 5 Feb 2021 09:05:54 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for sh (#25) + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +It should be noted that AUDIT_ARCH_{SH,SHEL,SH64,SHEL64} are defined at +least since kernel 3.7 and +https://github.com/torvalds/linux/commit/607ca46e97a1b6594b29647d98a32d545c24bdff + +Signed-off-by: Fabrice Fontaine +(cherry picked from commit 166491c2953546a677073694036f43a65fc25063) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index a861a836..428ea4b0 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -206,6 +206,20 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_S390X + #elif defined(__s390__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_S390 ++#elif defined(__sh__) ++# if defined(__LP64__) ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SHEL64 ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SH64 ++# endif ++# else ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SHEL ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SH ++# endif ++# endif + #elif defined(__sparc__) + # if defined(__arch64__) + # define AUDIT_ARCH_SPARC64 +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0008-src-privsep-linux-fix-build-on-sparc-26.patch b/buildroot/package/dhcpcd/0008-src-privsep-linux-fix-build-on-sparc-26.patch new file mode 100644 index 000000000..06199228c --- /dev/null +++ b/buildroot/package/dhcpcd/0008-src-privsep-linux-fix-build-on-sparc-26.patch @@ -0,0 +1,45 @@ +From be36eccb1ae53422f2aa9b42f257baeb21bd8be7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 5 Feb 2021 09:25:12 +0100 +Subject: [PATCH] src/privsep-linux: fix build on sparc (#26) + +Fix the following build failure: + +privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined + 203 | # define AUDIT_ARCH_SPARC64 + | +In file included from privsep-linux.c:35: +/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition + 392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT) + | +In file included from privsep-linux.c:36: +privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + 215 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + | ^~~~~~~~~~~~~~~~~~ + +Signed-off-by: Fabrice Fontaine +(cherry picked from commit dcfd7a23f002793a855156255e81662ef84064d3) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 428ea4b0..8093740a 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # endif + #elif defined(__sparc__) + # if defined(__arch64__) +-# define AUDIT_ARCH_SPARC64 ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64 + # else +-# define AUDIT_ARCH_SPARC ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC + # endif + #elif defined(__xtensa__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0009-src-privsep-linux.c-add-support-for-or1k-27.patch b/buildroot/package/dhcpcd/0009-src-privsep-linux.c-add-support-for-or1k-27.patch new file mode 100644 index 000000000..3756cac7e --- /dev/null +++ b/buildroot/package/dhcpcd/0009-src-privsep-linux.c-add-support-for-or1k-27.patch @@ -0,0 +1,41 @@ +From 617e3a44137cbba55afae24f6754580916bb770b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 7 Feb 2021 09:43:14 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for or1k (#27) + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +It should be noted that AUDIT_ARCH_OPENRISC is defined since kernel 3.7: +https://github.com/torvalds/linux/commit/e2bebb4ae6d9ac4ffc524db67f7ecb205a173f77 + +Signed-off-by: Fabrice Fontaine +(cherry picked from commit f3f7332001d5d5722239f6b7279f32923e4eedd0) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 8093740a..58df5c30 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -192,6 +192,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + #endif + #elif defined(__nios2__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NIOS2 ++#elif defined(__or1k__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC + #elif defined(__powerpc64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 + #elif defined(__powerpc__) +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0010-src-privsep-linux.c-add-support-for-arc-28.patch b/buildroot/package/dhcpcd/0010-src-privsep-linux.c-add-support-for-arc-28.patch new file mode 100644 index 000000000..b7b3e153e --- /dev/null +++ b/buildroot/package/dhcpcd/0010-src-privsep-linux.c-add-support-for-arc-28.patch @@ -0,0 +1,62 @@ +From 1b6b6329daf70e29221f341ef1946717f158ec8a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 8 Feb 2021 07:23:54 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for arc (#28) + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined +since kernel 5.2 and +https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84 + +Detection of arc compact and arc v2 have been "copy/pasted" from +https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2 + +Fixes: + - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3 + +Signed-off-by: Fabrice Fontaine +(cherry picked from commit 82386110e67cf75c224e9817fce55e6b0f143266) +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/privsep-linux.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 58df5c30..fc269a5c 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 + #elif defined(__x86_64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64 ++#elif defined(__arc__) ++# if defined(__A7__) ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE ++# endif ++# elif defined(__HS__) ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2 ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE ++# endif ++# else ++# error "Platform does not support seccomp filter yet" ++# endif + #elif defined(__arm__) + # ifndef EM_ARM + # define EM_ARM 40 +-- +2.29.2 + diff --git a/buildroot/package/dhcpcd/0011-src-privsep-linux.c-add-support-for-m68k.patch b/buildroot/package/dhcpcd/0011-src-privsep-linux.c-add-support-for-m68k.patch new file mode 100644 index 000000000..8fe80d426 --- /dev/null +++ b/buildroot/package/dhcpcd/0011-src-privsep-linux.c-add-support-for-m68k.patch @@ -0,0 +1,37 @@ +From f7721a6728bfd786604474df051f463a12dd0335 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 5 Mar 2021 12:22:13 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for m68k + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rsmarples/dhcpcd/pull/29] +--- + src/privsep-linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 21d41a9a..7dc92083 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -188,6 +188,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_IA64 + #elif defined(__microblaze__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_MICROBLAZE ++#elif defined(__m68k__) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_M68K + #elif defined(__mips__) + # if defined(__MIPSEL__) + # if defined(__LP64__) +-- +2.30.0 + diff --git a/buildroot/package/dhcpcd/dhcpcd.mk b/buildroot/package/dhcpcd/dhcpcd.mk index cb269f113..f040610de 100644 --- a/buildroot/package/dhcpcd/dhcpcd.mk +++ b/buildroot/package/dhcpcd/dhcpcd.mk @@ -16,8 +16,23 @@ DHCPCD_CONFIG_OPTS = \ --os=linux \ --privsepuser=dhcpcd -# AUDIT_ARCH_NDS32 is only available since kernel >= 5.2 -ifeq ($(BR2_nds32):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:) +# AUDIT_ARCH_{OPENRISC,SH,SHEL,SH64,SHEL64} are only available with kernel >= 3.7 +ifeq ($(BR2_or1k)$(BR2_sh):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + +# AUDIT_ARCH_MICROBLAZE is only available with kernel >= 3.18 +ifeq ($(BR2_microblazeel)$(BR2_microblazebe):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + +# AUDIT_ARCH_XTENSA is only available with kernel >= 5.0 +ifeq ($(BR2_xtensa):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y:) +DHCPCD_CONFIG_OPTS += --disable-privsep +endif + +# AUDIT_ARCH_{ARCOMPACT,ARCV2,NDS32,NIOS2} are only available with kernel >= 5.2 +ifeq ($(BR2_arceb)$(BR2_arcle)$(BR2_nds32)$(BR2_nios2):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:) DHCPCD_CONFIG_OPTS += --disable-privsep endif diff --git a/buildroot/package/dosfstools/dosfstools.mk b/buildroot/package/dosfstools/dosfstools.mk index fdf973af9..b5da490db 100644 --- a/buildroot/package/dosfstools/dosfstools.mk +++ b/buildroot/package/dosfstools/dosfstools.mk @@ -9,6 +9,7 @@ DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) DOSFSTOOLS_LICENSE = GPL-3.0+ DOSFSTOOLS_LICENSE_FILES = COPYING +DOSFSTOOLS_CPE_ID_VENDOR = dosfstools_project DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/ HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks diff --git a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index f2c76a05f..cf3ebdbf5 100644 --- a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17 dovecot-2.3-pigeonhole-0.5.13.tar.gz +sha256 68ca0f78a3caa6b090a469f45c395c44cf16da8fcb3345755b1ca436c9ffb2d2 dovecot-2.3-pigeonhole-0.5.14.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 5c4cdb633..35a1e1ef5 100644 --- a/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,11 +4,13 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.13 +DOVECOT_PIGEONHOLE_VERSION = 0.5.14 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING +DOVECOT_PIGEONHOLE_CPE_ID_VENDOR = dovecot +DOVECOT_PIGEONHOLE_CPE_ID_PRODUCT = pigeonhole DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib diff --git a/buildroot/package/dovecot/dovecot.hash b/buildroot/package/dovecot/dovecot.hash index 4d69f3abd..edb9d20e6 100644 --- a/buildroot/package/dovecot/dovecot.hash +++ b/buildroot/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4 dovecot-2.3.13.tar.gz +sha256 c8b3d7f3af1e558a3ff0f970309d4013a4d3ce136f8c02a53a3b05f345b9a34a dovecot-2.3.14.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/buildroot/package/dovecot/dovecot.mk b/buildroot/package/dovecot/dovecot.mk index 8635ea5c4..a38cf1941 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).13 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).14 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 diff --git a/buildroot/package/e2fsprogs/e2fsprogs.mk b/buildroot/package/e2fsprogs/e2fsprogs.mk index eb82a55ce..eb127b42d 100644 --- a/buildroot/package/e2fsprogs/e2fsprogs.mk +++ b/buildroot/package/e2fsprogs/e2fsprogs.mk @@ -9,6 +9,7 @@ E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h +E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project E2FSPROGS_INSTALL_STAGING = YES # Use libblkid and libuuid from util-linux for host and target packages. diff --git a/buildroot/package/elfutils/elfutils.mk b/buildroot/package/elfutils/elfutils.mk index 42f2f8b30..b76b06bcb 100644 --- a/buildroot/package/elfutils/elfutils.mk +++ b/buildroot/package/elfutils/elfutils.mk @@ -10,6 +10,7 @@ ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 +ELFUTILS_CPE_ID_VENDOR = elfutils_project ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES) HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz diff --git a/buildroot/package/erlang/erlang.mk b/buildroot/package/erlang/erlang.mk index 9cedb62e0..59fcdba93 100644 --- a/buildroot/package/erlang/erlang.mk +++ b/buildroot/package/erlang/erlang.mk @@ -12,6 +12,8 @@ ERLANG_DEPENDENCIES = host-erlang ERLANG_LICENSE = Apache-2.0 ERLANG_LICENSE_FILES = LICENSE.txt +ERLANG_CPE_ID_VENDOR = erlang +ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES # Remove the leftover deps directory from the ssl app diff --git a/buildroot/package/expat/expat.mk b/buildroot/package/expat/expat.mk index 201e18ae6..4acbade2c 100644 --- a/buildroot/package/expat/expat.mk +++ b/buildroot/package/expat/expat.mk @@ -12,7 +12,8 @@ EXPAT_DEPENDENCIES = host-pkgconf HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING -EXPAT_CPE_ID_VENDOR = libexpat +EXPAT_CPE_ID_VENDOR = libexpat_project +EXPAT_CPE_ID_PRODUCT = libexpat EXPAT_CONF_OPTS = --without-docbook HOST_EXPAT_CONF_OPTS = --without-docbook diff --git a/buildroot/package/file/file.mk b/buildroot/package/file/file.mk index fa7daa8e0..c41a8eb3a 100644 --- a/buildroot/package/file/file.mk +++ b/buildroot/package/file/file.mk @@ -12,7 +12,7 @@ FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c -FILE_CPE_ID_VALID = YES +FILE_CPE_ID_VENDOR = file_project # We're patching configure.ac FILE_AUTORECONF = YES HOST_FILE_CONF_OPTS = --disable-libseccomp diff --git a/buildroot/package/flac/flac.mk b/buildroot/package/flac/flac.mk index f2922ffef..880c176f6 100644 --- a/buildroot/package/flac/flac.mk +++ b/buildroot/package/flac/flac.mk @@ -11,6 +11,7 @@ FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL +FLAC_CPE_ID_VENDOR = flac_project # patch touching configure.ac FLAC_AUTORECONF = YES diff --git a/buildroot/package/flex/flex.mk b/buildroot/package/flex/flex.mk index 52a15ca49..2d0096966 100644 --- a/buildroot/package/flex/flex.mk +++ b/buildroot/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VALID = YES +FLEX_CPE_ID_VENDOR = flex_project FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4 HOST_FLEX_DEPENDENCIES = host-m4 diff --git a/buildroot/package/fontconfig/fontconfig.mk b/buildroot/package/fontconfig/fontconfig.mk index ee82cc1de..33218ed63 100644 --- a/buildroot/package/fontconfig/fontconfig.mk +++ b/buildroot/package/fontconfig/fontconfig.mk @@ -15,6 +15,7 @@ HOST_FONTCONFIG_DEPENDENCIES = \ host-freetype host-expat host-pkgconf host-gperf host-util-linux FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING +FONTCONFIG_CPE_ID_VENDOR = fontconfig_project FONTCONFIG_CONF_OPTS = \ --with-arch=$(GNU_TARGET_NAME) \ diff --git a/buildroot/package/gd/gd.mk b/buildroot/package/gd/gd.mk index f54c2b37a..c7037f8db 100644 --- a/buildroot/package/gd/gd.mk +++ b/buildroot/package/gd/gd.mk @@ -10,6 +10,8 @@ GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION) GD_INSTALL_STAGING = YES GD_LICENSE = GD license GD_LICENSE_FILES = COPYING +GD_CPE_ID_VENDOR = libgd +GD_CPE_ID_PRODUCT = libgd GD_CONF_OPTS = --without-x --disable-rpath --disable-werror GD_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/giflib/giflib.mk b/buildroot/package/giflib/giflib.mk index 3dd17972e..d47edfaa8 100644 --- a/buildroot/package/giflib/giflib.mk +++ b/buildroot/package/giflib/giflib.mk @@ -9,6 +9,7 @@ GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING +GIFLIB_CPE_ID_VENDOR = giflib_project ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib diff --git a/buildroot/package/gnuchess/gnuchess.hash b/buildroot/package/gnuchess/gnuchess.hash index 9342fc3eb..1641a7d8f 100644 --- a/buildroot/package/gnuchess/gnuchess.hash +++ b/buildroot/package/gnuchess/gnuchess.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802 gnuchess-6.2.5.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 e536675a61abe82e61b919f6b786755441d9fcd4c21e1c82fb9e5340dd229846 gnuchess-6.2.7.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/gnuchess/gnuchess.mk b/buildroot/package/gnuchess/gnuchess.mk index 4d91706de..60327dfe0 100644 --- a/buildroot/package/gnuchess/gnuchess.mk +++ b/buildroot/package/gnuchess/gnuchess.mk @@ -4,10 +4,12 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.5 +GNUCHESS_VERSION = 6.2.7 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPL-3.0+ GNUCHESS_LICENSE_FILES = COPYING +GNUCHESS_CPE_ID_VENDOR = gnu +GNUCHESS_CPE_ID_PRODUCT = chess GNUCHESS_DEPENDENCIES = host-flex flex GNUCHESS_DEPENDENCIES += $(if $(BR2_PACKAGE_READLINE),readline) \ diff --git a/buildroot/package/gnuplot/gnuplot.mk b/buildroot/package/gnuplot/gnuplot.mk index 8d096c610..9a72a4714 100644 --- a/buildroot/package/gnuplot/gnuplot.mk +++ b/buildroot/package/gnuplot/gnuplot.mk @@ -8,7 +8,7 @@ GNUPLOT_VERSION = 5.4.1 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -GNUPLOT_CPE_ID_VALID = YES +GNUPLOT_CPE_ID_VENDOR = gnuplot_project GNUPLOT_AUTORECONF = YES diff --git a/buildroot/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch b/buildroot/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch new file mode 100644 index 000000000..034c10c5c --- /dev/null +++ b/buildroot/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch @@ -0,0 +1,55 @@ +From 268b1a599304f58bd56c86ff09041b5912c24a0c Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Sun, 1 Nov 2020 17:24:36 +0100 +Subject: [PATCH] gr-qtgui: dont't add examples/c++ subdirectory when gr-analog + is disabled + +gr-qtgui examples needs to have gr-analog enabled, without this dependency +compile crash with: + +In file included from +/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.cc:22: +/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.h:24:10: +fatal error: gnuradio/analog/noise_source.h: No such file or directory +24 | #include +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +compilation terminated. +make[3]: *** [gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/build.make:67: +gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/display_qt.cc.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +In file included from +/somewhere/gnuradio/build/gr-qtgui/examples/c++/moc_display_qt.cpp:10: +/somewhere/gnuradio/build/gr-qtgui/examples/c++/../../../../gr-qtgui/examples/c++/display_qt.h:24:10: +fatal error: gnuradio/analog/noise_source.h: No such file or directory +24 | #include +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +compilation terminated. + +GR_ANALOG is not an explicit dependency of GR_QTGUI, so disable c++ examples if +user has not selected this option. + +[backported from 7470a7a3771dd90defb826b464dfe62977cb1eb6] + +Signed-off-by: Gwenhael Goavec-Merou +--- + gr-qtgui/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt +index 8831f3ad9..561186fbd 100644 +--- a/gr-qtgui/CMakeLists.txt ++++ b/gr-qtgui/CMakeLists.txt +@@ -68,7 +68,9 @@ if(ENABLE_GR_QTGUI) + add_subdirectory(include/gnuradio/qtgui) + add_subdirectory(lib) + add_subdirectory(docs) +-add_subdirectory(examples/c++) ++if (ENABLE_GR_ANALOG) ++ add_subdirectory(examples/c++) ++endif(ENABLE_GR_ANALOG) + if(ENABLE_PYTHON) + add_subdirectory(swig) + add_subdirectory(python/qtgui) +-- +2.26.2 + diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in index 191820df1..628a9df42 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in @@ -577,6 +577,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC bool "sbc" select BR2_PACKAGE_SBC +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCTP + bool "sctp" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrinsics + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM bool "shm" help diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 83abc7fab..e8cea5bb3 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -691,6 +691,16 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCTP),y) +GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dsctp=enabled \ + -Dsctp-internal-usrsctp=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += \ + -Dsctp=disabled \ + -Dsctp-internal-usrsctp=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=enabled else diff --git a/buildroot/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash index 0e293e854..956949275 100644 --- a/buildroot/package/haproxy/haproxy.hash +++ b/buildroot/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.8.tar.gz.sha256 -sha256 61f90e3e2a36bd8800a5bee31cba7eef37c9aa8a353b6c741edaa411510b14be haproxy-2.2.8.tar.gz +# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.9.tar.gz.sha256 +sha256 21680459b08b9ba21c8cc9f5dbd0ee6e1842f57a3a67f87179871e1c13ebd4e3 haproxy-2.2.9.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk index 7c05decf2..45c62f7c2 100644 --- a/buildroot/package/haproxy/haproxy.mk +++ b/buildroot/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.2 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt diff --git a/buildroot/package/harfbuzz/harfbuzz.mk b/buildroot/package/harfbuzz/harfbuzz.mk index a17283bea..f1ef7ee95 100644 --- a/buildroot/package/harfbuzz/harfbuzz.mk +++ b/buildroot/package/harfbuzz/harfbuzz.mk @@ -9,6 +9,7 @@ HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZ HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING +HARFBUZZ_CPE_ID_VENDOR = harfbuzz_project HARFBUZZ_INSTALL_STAGING = YES HARFBUZZ_CONF_OPTS = \ -Dfontconfig=disabled \ diff --git a/buildroot/package/heimdal/heimdal.mk b/buildroot/package/heimdal/heimdal.mk index 5c0570fdd..9a1a68f04 100644 --- a/buildroot/package/heimdal/heimdal.mk +++ b/buildroot/package/heimdal/heimdal.mk @@ -31,6 +31,7 @@ HOST_HEIMDAL_CONF_OPTS = \ HOST_HEIMDAL_CONF_ENV = MAKEINFO=true HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE +HEIMDAL_CPE_ID_VENDOR = heimdal_project # We need asn1_compile in the PATH for samba4 define HOST_HEIMDAL_MAKE_SYMLINK diff --git a/buildroot/package/hostapd/Config.in b/buildroot/package/hostapd/Config.in index 54d2086c0..38cead90c 100644 --- a/buildroot/package/hostapd/Config.in +++ b/buildroot/package/hostapd/Config.in @@ -76,6 +76,7 @@ config BR2_PACKAGE_HOSTAPD_WPS config BR2_PACKAGE_HOSTAPD_WPA3 bool "Enable WPA3 support" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help diff --git a/buildroot/package/ibm-sw-tpm2/Config.in b/buildroot/package/ibm-sw-tpm2/Config.in index b402ba715..57781a54b 100644 --- a/buildroot/package/ibm-sw-tpm2/Config.in +++ b/buildroot/package/ibm-sw-tpm2/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_IBM_SW_TPM2 bool "ibm-sw-tpm2" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # ibm-sw-tpm2 + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL - # libressl is not supported select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help This project is an implementation of the TCG TPM 2.0 @@ -14,4 +14,5 @@ config BR2_PACKAGE_IBM_SW_TPM2 https://sourceforge.net/projects/ibmswtpm2/ comment "ibm-sw-tpm2 needs a toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/buildroot/package/icu/icu.mk b/buildroot/package/icu/icu.mk index 8d0288578..4d67831c7 100644 --- a/buildroot/package/icu/icu.mk +++ b/buildroot/package/icu/icu.mk @@ -13,6 +13,9 @@ ICU_SITE = \ https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION) ICU_LICENSE = ICU License ICU_LICENSE_FILES = LICENSE +ICU_CPE_ID_VENDOR = icu-project +ICU_CPE_ID_PRODUCT = international_components_for_unicode +ICU_CPE_ID_VERSION = $(subst -,.,$(ICU_VERSION)) ICU_DEPENDENCIES = host-icu ICU_INSTALL_STAGING = YES diff --git a/buildroot/package/ima-evm-utils/Config.in b/buildroot/package/ima-evm-utils/Config.in index 6c29c9de2..59df58e5b 100644 --- a/buildroot/package/ima-evm-utils/Config.in +++ b/buildroot/package/ima-evm-utils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_IMA_EVM_UTILS bool "ima-evm-utils" depends on BR2_USE_MMU # keyutils + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # keyutils, tpm2-tss select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_KEYUTILS @@ -13,4 +14,5 @@ config BR2_PACKAGE_IMA_EVM_UTILS comment "ima-evm-utils needs dynamic library support" depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS diff --git a/buildroot/package/imlib2/imlib2.mk b/buildroot/package/imlib2/imlib2.mk index a684ec5b5..a88558575 100644 --- a/buildroot/package/imlib2/imlib2.mk +++ b/buildroot/package/imlib2/imlib2.mk @@ -9,6 +9,7 @@ IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) IMLIB2_LICENSE = Imlib2 IMLIB2_LICENSE_FILES = COPYING COPYING-PLAIN +IMLIB2_CPE_ID_VENDOR = enlightenment IMLIB2_INSTALL_STAGING = YES IMLIB2_DEPENDENCIES = host-pkgconf freetype diff --git a/buildroot/package/ipmitool/ipmitool.mk b/buildroot/package/ipmitool/ipmitool.mk index 29a047658..facd97a0b 100644 --- a/buildroot/package/ipmitool/ipmitool.mk +++ b/buildroot/package/ipmitool/ipmitool.mk @@ -9,7 +9,7 @@ IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2 IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING -IPMITOOL_CPE_ID_VALID = YES +IPMITOOL_CPE_ID_VENDOR = ipmitool_project # 0008-fru-Fix-buffer-overflow-vulnerabilities.patch # 0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch diff --git a/buildroot/package/irssi/irssi.mk b/buildroot/package/irssi/irssi.mk index 4d7268d29..c64690c59 100644 --- a/buildroot/package/irssi/irssi.mk +++ b/buildroot/package/irssi/irssi.mk @@ -11,6 +11,7 @@ IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPL-2.0+ IRSSI_LICENSE_FILES = COPYING +IRSSI_CPE_ID_VENDOR = irssi IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl IRSSI_CONF_OPTS = \ diff --git a/buildroot/package/iucode-tool/iucode-tool.mk b/buildroot/package/iucode-tool/iucode-tool.mk index bddc37295..568692c46 100644 --- a/buildroot/package/iucode-tool/iucode-tool.mk +++ b/buildroot/package/iucode-tool/iucode-tool.mk @@ -12,6 +12,7 @@ IUCODE_TOOL_DEPENDENCIES = argp-standalone endif IUCODE_TOOL_LICENSE = GPL-2.0+ IUCODE_TOOL_LICENSE_FILES = COPYING +IUCODE_TOOL_CPE_ID_VENDOR = iucode-tool_project define IUCODE_TOOL_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \ diff --git a/buildroot/package/jansson/jansson.mk b/buildroot/package/jansson/jansson.mk index 4ac64b69e..2761ce9b1 100644 --- a/buildroot/package/jansson/jansson.mk +++ b/buildroot/package/jansson/jansson.mk @@ -8,7 +8,7 @@ JANSSON_VERSION = 2.13.1 JANSSON_SITE = http://www.digip.org/jansson/releases JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE -JANSSON_CPE_ID_VALID = YES +JANSSON_CPE_ID_VENDOR = jansson_project JANSSON_INSTALL_STAGING = YES JANSSON_CONF_ENV = LIBS="-lm" diff --git a/buildroot/package/jasper/jasper.hash b/buildroot/package/jasper/jasper.hash index d4ed191f9..c1f1b4f60 100644 --- a/buildroot/package/jasper/jasper.hash +++ b/buildroot/package/jasper/jasper.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f5bc48e2884bcabd2aca1737baff4ca962ec665b6eb673966ced1f7adea07edb jasper-2.0.25.tar.gz +sha256 a82a119e85b7d1f448e61309777fa5f79053a9adca4a2b5bfe44be5439fb8fea jasper-2.0.26.tar.gz sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE diff --git a/buildroot/package/jasper/jasper.mk b/buildroot/package/jasper/jasper.mk index d487e8e2d..b9cbe5749 100644 --- a/buildroot/package/jasper/jasper.mk +++ b/buildroot/package/jasper/jasper.mk @@ -4,12 +4,12 @@ # ################################################################################ -JASPER_VERSION = 2.0.25 +JASPER_VERSION = 2.0.26 JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE -JASPER_CPE_ID_VALID = YES +JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO JASPER_CONF_OPTS = \ -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ diff --git a/buildroot/package/jbig2dec/jbig2dec.mk b/buildroot/package/jbig2dec/jbig2dec.mk index 59fcddfc1..8d881136a 100644 --- a/buildroot/package/jbig2dec/jbig2dec.mk +++ b/buildroot/package/jbig2dec/jbig2dec.mk @@ -9,6 +9,7 @@ JBIG2DEC_SITE = \ https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530 JBIG2DEC_LICENSE = AGPL-3.0+ JBIG2DEC_LICENSE_FILES = LICENSE +JBIG2DEC_CPE_ID_VENDOR = artifex JBIG2DEC_INSTALL_STAGING = YES # tarball is missing install-sh, install.sh, or shtool JBIG2DEC_AUTORECONF = YES diff --git a/buildroot/package/jhead/jhead.mk b/buildroot/package/jhead/jhead.mk index 9c0d4d123..49cb03da6 100644 --- a/buildroot/package/jhead/jhead.mk +++ b/buildroot/package/jhead/jhead.mk @@ -8,7 +8,7 @@ JHEAD_VERSION = 3.04 JHEAD_SITE = http://www.sentex.net/~mwandel/jhead JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt -JHEAD_CPE_ID_VALID = YES +JHEAD_CPE_ID_VENDOR = jhead_project define JHEAD_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/buildroot/package/jpeg-turbo/jpeg-turbo.mk b/buildroot/package/jpeg-turbo/jpeg-turbo.mk index cd1275661..5c977dc02 100644 --- a/buildroot/package/jpeg-turbo/jpeg-turbo.mk +++ b/buildroot/package/jpeg-turbo/jpeg-turbo.mk @@ -9,6 +9,8 @@ JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) JPEG_TURBO_LICENSE_FILES = LICENSE.md README.ijg +JPEG_TURBO_CPE_ID_VENDOR = libjpeg-turbo +JPEG_TURBO_CPE_ID_PRODUCT = libjpeg-turbo JPEG_TURBO_INSTALL_STAGING = YES JPEG_TURBO_PROVIDES = jpeg JPEG_TURBO_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/jq/jq.mk b/buildroot/package/jq/jq.mk index f3a0493b8..7f890f899 100644 --- a/buildroot/package/jq/jq.mk +++ b/buildroot/package/jq/jq.mk @@ -8,6 +8,7 @@ JQ_VERSION = a17dd3248a666d01be75f6b16be37e80e20b0954 JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION)) JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING +JQ_CPE_ID_VENDOR = jq_project JQ_INSTALL_STAGING = YES # currently using git version directly diff --git a/buildroot/package/json-c/json-c.mk b/buildroot/package/json-c/json-c.mk index a55831432..3639bad25 100644 --- a/buildroot/package/json-c/json-c.mk +++ b/buildroot/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VALID = YES +JSON_C_CPE_ID_VENDOR = json-c_project $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/buildroot/package/jsoncpp/jsoncpp.mk b/buildroot/package/jsoncpp/jsoncpp.mk index a8d863a3e..829459df4 100644 --- a/buildroot/package/jsoncpp/jsoncpp.mk +++ b/buildroot/package/jsoncpp/jsoncpp.mk @@ -8,7 +8,7 @@ JSONCPP_VERSION = 1.9.4 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE -JSONCPP_CPE_ID_VALID = YES +JSONCPP_CPE_ID_VENDOR = jsoncpp_project JSONCPP_INSTALL_STAGING = YES JSONCPP_CONF_OPTS = -Dtests=false diff --git a/buildroot/package/kismet/0001-Add-getter-to-read-database-values-as-long-long.patch b/buildroot/package/kismet/0001-Add-getter-to-read-database-values-as-long-long.patch new file mode 100644 index 000000000..564cba87b --- /dev/null +++ b/buildroot/package/kismet/0001-Add-getter-to-read-database-values-as-long-long.patch @@ -0,0 +1,28 @@ +From 1d36faad18e34b43ac8ea3e7f6a44315f827a2db Mon Sep 17 00:00:00 2001 +From: George Hopkins +Date: Mon, 4 Jan 2021 13:59:41 +0100 +Subject: [PATCH] Add getter to read database values as long long + +[Retrieved from: +https://github.com/kismetwireless/kismet/commit/1d36faad18e34b43ac8ea3e7f6a44315f827a2db] +Signed-off-by: Fabrice Fontaine +--- + sqlite3_cpp11.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sqlite3_cpp11.cc b/sqlite3_cpp11.cc +index 7974bde8c..5c92dfa87 100644 +--- a/sqlite3_cpp11.cc ++++ b/sqlite3_cpp11.cc +@@ -411,6 +411,11 @@ namespace kissqlite3 { + return (unsigned long) sqlite3_column_int64(stmt.get(), column); + } + ++ template<> ++ long long sqlite3_column_as(std::shared_ptr stmt, unsigned int column) { ++ return (long long) sqlite3_column_int64(stmt.get(), column); ++ } ++ + template<> + unsigned long long sqlite3_column_as(std::shared_ptr stmt, unsigned int column) { + return (unsigned long long) sqlite3_column_int64(stmt.get(), column); diff --git a/buildroot/package/kismet/0002-boost-asio-Use-eventfd-function-with-uClibc.patch b/buildroot/package/kismet/0002-boost-asio-Use-eventfd-function-with-uClibc.patch new file mode 100644 index 000000000..eb5fb2ec2 --- /dev/null +++ b/buildroot/package/kismet/0002-boost-asio-Use-eventfd-function-with-uClibc.patch @@ -0,0 +1,66 @@ +From 9330d34ced1d7d0e56d579bb55a9ed1286d324f0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 4 Mar 2021 13:36:52 +0100 +Subject: [PATCH] boost/asio: Use eventfd() function with uClibc + +Fix build with uclibc thanks to +https://github.com/boostorg/asio/commit/b2ee39aee0b186c5bcabb051b7a536ab1517616a + +Fixes: + - http://autobuild.buildroot.org/results/1c2885d75219aabadbb66ab66fe0dc4b4346ff1e + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/kismetwireless/kismet/commit/9330d34ced1d7d0e56d579bb55a9ed1286d324f0] +--- + .../asio/detail/impl/eventfd_select_interrupter.ipp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/boost/asio/detail/impl/eventfd_select_interrupter.ipp b/boost/asio/detail/impl/eventfd_select_interrupter.ipp +index 38d4b2a6..8bdb3c20 100644 +--- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp ++++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp +@@ -23,11 +23,11 @@ + #include + #include + #include +-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + # include +-#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + # include +-#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + #include + #include + #include +@@ -46,14 +46,14 @@ eventfd_select_interrupter::eventfd_select_interrupter() + + void eventfd_select_interrupter::open_descriptors() + { +-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0); + if (read_descriptor_ != -1) + { + ::fcntl(read_descriptor_, F_SETFL, O_NONBLOCK); + ::fcntl(read_descriptor_, F_SETFD, FD_CLOEXEC); + } +-#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + # if defined(EFD_CLOEXEC) && defined(EFD_NONBLOCK) + write_descriptor_ = read_descriptor_ = + ::eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); +@@ -70,7 +70,7 @@ void eventfd_select_interrupter::open_descriptors() + ::fcntl(read_descriptor_, F_SETFD, FD_CLOEXEC); + } + } +-#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + + if (read_descriptor_ == -1) + { +-- +2.30.0 + diff --git a/buildroot/package/kismet/Config.in b/buildroot/package/kismet/Config.in index 02046e7ef..d9f8ebe03 100644 --- a/buildroot/package/kismet/Config.in +++ b/buildroot/package/kismet/Config.in @@ -59,14 +59,16 @@ config BR2_PACKAGE_KISMET_SERVER default y depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF -comment "server needs a toolchain w/ dynamic library, gcc >= 4.8" +comment "server needs a toolchain w/ dynamic library, wchar, gcc >= 4.8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "server needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/buildroot/package/lame/lame.mk b/buildroot/package/lame/lame.mk index 3d76ab93a..3a57cffe3 100644 --- a/buildroot/package/lame/lame.mk +++ b/buildroot/package/lame/lame.mk @@ -12,6 +12,7 @@ LAME_CONF_ENV = GTK_CONFIG=/bin/false LAME_CONF_OPTS = --enable-dynamic-frontends LAME_LICENSE = LGPL-2.0+ LAME_LICENSE_FILES = COPYING +LAME_CPE_ID_VENDOR = lame_project ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LAME_DEPENDENCIES += libsndfile diff --git a/buildroot/package/lftp/lftp.mk b/buildroot/package/lftp/lftp.mk index 483ca298c..00b33b91f 100644 --- a/buildroot/package/lftp/lftp.mk +++ b/buildroot/package/lftp/lftp.mk @@ -9,7 +9,7 @@ LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ LFTP_LICENSE_FILES = COPYING -LFTP_CPE_ID_VALID = YES +LFTP_CPE_ID_VENDOR = lftp_project LFTP_DEPENDENCIES = readline zlib host-pkgconf # Help lftp finding readline and zlib diff --git a/buildroot/package/libass/libass.mk b/buildroot/package/libass/libass.mk index 8bdfd9dd4..48e70a52c 100644 --- a/buildroot/package/libass/libass.mk +++ b/buildroot/package/libass/libass.mk @@ -12,7 +12,7 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSIO LIBASS_INSTALL_STAGING = YES LIBASS_LICENSE = ISC LIBASS_LICENSE_FILES = COPYING -LIBASS_CPE_ID_VALID = YES +LIBASS_CPE_ID_VENDOR = libass_project LIBASS_DEPENDENCIES = \ host-pkgconf \ freetype \ diff --git a/buildroot/package/libbsd/libbsd.mk b/buildroot/package/libbsd/libbsd.mk index 27bac6838..256a75f15 100644 --- a/buildroot/package/libbsd/libbsd.mk +++ b/buildroot/package/libbsd/libbsd.mk @@ -10,6 +10,7 @@ LIBBSD_SITE = https://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, BSD-5-Clause, \ MIT, ISC, Beerware LIBBSD_LICENSE_FILES = COPYING +LIBBSD_CPE_ID_VENDOR = freedesktop LIBBSD_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libcap-ng/libcap-ng.mk b/buildroot/package/libcap-ng/libcap-ng.mk index d4c9336e2..4fb0cf477 100644 --- a/buildroot/package/libcap-ng/libcap-ng.mk +++ b/buildroot/package/libcap-ng/libcap-ng.mk @@ -8,7 +8,7 @@ LIBCAP_NG_VERSION = 0.8.2 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB -LIBCAP_NG_CPE_ID_VALID = YES +LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no diff --git a/buildroot/package/libconfuse/libconfuse.mk b/buildroot/package/libconfuse/libconfuse.mk index 516c0056d..2beb0e4fb 100644 --- a/buildroot/package/libconfuse/libconfuse.mk +++ b/buildroot/package/libconfuse/libconfuse.mk @@ -11,6 +11,7 @@ LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPTS = --disable-rpath LIBCONFUSE_LICENSE = ISC LIBCONFUSE_LICENSE_FILES = LICENSE +LIBCONFUSE_CPE_ID_VENDOR = libconfuse_project LIBCONFUSE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) $(eval $(autotools-package)) diff --git a/buildroot/package/libeXosip2/0001-src-eXtls_dtls.c-fix-build-with-libressl.patch b/buildroot/package/libeXosip2/0001-src-eXtls_dtls.c-fix-build-with-libressl.patch new file mode 100644 index 000000000..b153eee65 --- /dev/null +++ b/buildroot/package/libeXosip2/0001-src-eXtls_dtls.c-fix-build-with-libressl.patch @@ -0,0 +1,34 @@ +From 178632fa5530a72f50376a60d59be2a07e65c28b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 6 Mar 2021 15:20:51 +0100 +Subject: [PATCH] src/eXtls_dtls.c: fix build with libressl + +Build with libressl is broken since +https://git.savannah.nongnu.org/cgit/exosip.git/commit/?id=d7488b7bbf59870192372384ef338a44be23e888 +because libressl does not define SSL_set0_rbio + +Fixes: + - http://autobuild.buildroot.org/results/89d8d4ba99d6dcc1618cf6b5302c124a92d75be9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to amoizard@antisip.com] +--- + src/eXtl_dtls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/eXtl_dtls.c b/src/eXtl_dtls.c +index 40fa658..8ac3a13 100644 +--- a/src/eXtl_dtls.c ++++ b/src/eXtl_dtls.c +@@ -70,7 +70,7 @@ + #define RANDOM "random.pem" + #define DHFILE "dh1024.pem" + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + static void + SSL_set0_rbio (SSL * s, BIO * rbio) +-- +2.30.0 + diff --git a/buildroot/package/libebml/libebml.hash b/buildroot/package/libebml/libebml.hash index f06924076..32ca1e3dd 100644 --- a/buildroot/package/libebml/libebml.hash +++ b/buildroot/package/libebml/libebml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 80abc9a82549615018798ee704997270a39b43de9a6e7e0d23b62f8ce682c4b3 libebml-1.4.0.tar.xz +sha256 41c7237ce05828fb220f62086018b080af4db4bb142f31bec0022c925889b9f2 libebml-1.4.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/buildroot/package/libebml/libebml.mk b/buildroot/package/libebml/libebml.mk index 7ae31d3e2..056cf888e 100644 --- a/buildroot/package/libebml/libebml.mk +++ b/buildroot/package/libebml/libebml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEBML_VERSION = 1.4.0 +LIBEBML_VERSION = 1.4.2 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.xz LIBEBML_SITE = http://dl.matroska.org/downloads/libebml LIBEBML_INSTALL_STAGING = YES diff --git a/buildroot/package/libesmtp/libesmtp.mk b/buildroot/package/libesmtp/libesmtp.mk index ad896fc94..dcffacedd 100644 --- a/buildroot/package/libesmtp/libesmtp.mk +++ b/buildroot/package/libesmtp/libesmtp.mk @@ -12,6 +12,6 @@ LIBESMTP_CONFIG_SCRIPTS = libesmtp-config LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB -LIBESMTP_CPE_ID_VALID = YES +LIBESMTP_CPE_ID_VENDOR = libesmtp_project $(eval $(autotools-package)) diff --git a/buildroot/package/libevent/libevent.mk b/buildroot/package/libevent/libevent.mk index 5d02191a5..93ba88ca8 100644 --- a/buildroot/package/libevent/libevent.mk +++ b/buildroot/package/libevent/libevent.mk @@ -10,6 +10,7 @@ LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE +LIBEVENT_CPE_ID_VENDOR = libevent_project LIBEVENT_CONF_OPTS = \ --disable-libevent-regress \ --disable-samples diff --git a/buildroot/package/libexif/libexif.mk b/buildroot/package/libexif/libexif.mk index 9d29cbf59..9a25e90d2 100644 --- a/buildroot/package/libexif/libexif.mk +++ b/buildroot/package/libexif/libexif.mk @@ -12,7 +12,7 @@ LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING -LIBEXIF_CPE_ID_VALID = YES +LIBEXIF_CPE_ID_VENDOR = libexif_project # 0001-fixed-another-unsigned-integer-overflow.patch LIBEXIF_IGNORE_CVES += CVE-2020-0198 # 0002-fixed-a-incorrect-overflow-check.patch diff --git a/buildroot/package/libfribidi/libfribidi.mk b/buildroot/package/libfribidi/libfribidi.mk index 055620ae0..97e875b4a 100644 --- a/buildroot/package/libfribidi/libfribidi.mk +++ b/buildroot/package/libfribidi/libfribidi.mk @@ -9,6 +9,8 @@ LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ LIBFRIBIDI_LICENSE_FILES = COPYING +LIBFRIBIDI_CPE_ID_VENDOR = gnu +LIBFRIBIDI_CPE_ID_PRODUCT = fribidi LIBFRIBIDI_INSTALL_STAGING = YES LIBFRIBIDI_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/libgeos/Config.in b/buildroot/package/libgeos/Config.in index 9f02c8b13..2caf6d1d5 100644 --- a/buildroot/package/libgeos/Config.in +++ b/buildroot/package/libgeos/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGEOS bool "libgeos" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on !BR2_nios2 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -13,3 +14,4 @@ config BR2_PACKAGE_LIBGEOS comment "libgeos needs a toolchain w/ C++, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + depends on !BR2_nios2 diff --git a/buildroot/package/libgit2/libgit2.mk b/buildroot/package/libgit2/libgit2.mk index 14709a093..e5d17fa3d 100644 --- a/buildroot/package/libgit2/libgit2.mk +++ b/buildroot/package/libgit2/libgit2.mk @@ -8,7 +8,7 @@ LIBGIT2_VERSION = 1.1.0 LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION) LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) LIBGIT2_LICENSE_FILES = COPYING -LIBGIT2_CPE_ID_VALID = YES +LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ diff --git a/buildroot/package/libhtp/libhtp.hash b/buildroot/package/libhtp/libhtp.hash index 8bc150618..805cd4f1f 100644 --- a/buildroot/package/libhtp/libhtp.hash +++ b/buildroot/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b libhtp-0.5.36.tar.gz +sha256 0f8296ce9db815bbedc1c8a0b738dd25146fdaf910995a8c5f8e147799902b7e libhtp-0.5.37.tar.gz sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/buildroot/package/libhtp/libhtp.mk b/buildroot/package/libhtp/libhtp.mk index de82caaa5..752034603 100644 --- a/buildroot/package/libhtp/libhtp.mk +++ b/buildroot/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.36 +LIBHTP_VERSION = 0.5.37 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libjpeg/libjpeg.mk b/buildroot/package/libjpeg/libjpeg.mk index 389ecb629..6b55aba7e 100644 --- a/buildroot/package/libjpeg/libjpeg.mk +++ b/buildroot/package/libjpeg/libjpeg.mk @@ -5,7 +5,11 @@ ################################################################################ LIBJPEG_VERSION = 9d -LIBJPEG_SITE = http://www.ijg.org/files +# 9d was released 2020-01-12, but the tarball was replaced upstream circa +# 2021-03, causing hash mismatch. Until there is a new version released, +# use our cached copy from s.b.o. +#LIBJPEG_SITE = http://www.ijg.org/files +LIBJPEG_SITE = http://sources.buildroot.org/libjpeg LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG LIBJPEG_LICENSE_FILES = README diff --git a/buildroot/package/libksba/libksba.mk b/buildroot/package/libksba/libksba.mk index 2ad9bee06..bb02391a3 100644 --- a/buildroot/package/libksba/libksba.mk +++ b/buildroot/package/libksba/libksba.mk @@ -9,7 +9,7 @@ LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 -LIBKSBA_CPE_ID_VALID = YES +LIBKSBA_CPE_ID_VENDOR = libksba_project LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr diff --git a/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/buildroot/package/libmicrohttpd/libmicrohttpd.mk index e3469df42..6eee597c3 100644 --- a/buildroot/package/libmicrohttpd/libmicrohttpd.mk +++ b/buildroot/package/libmicrohttpd/libmicrohttpd.mk @@ -7,6 +7,7 @@ LIBMICROHTTPD_VERSION = 0.9.72 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING +LIBMICROHTTPD_CPE_ID_VENDOR = gnu LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 diff --git a/buildroot/package/libminiupnpc/libminiupnpc.mk b/buildroot/package/libminiupnpc/libminiupnpc.mk index 50b3c6604..551a6767c 100644 --- a/buildroot/package/libminiupnpc/libminiupnpc.mk +++ b/buildroot/package/libminiupnpc/libminiupnpc.mk @@ -4,11 +4,17 @@ # ################################################################################ -LIBMINIUPNPC_VERSION = 2.1.20201016 +LIBMINIUPNPC_VERSION_MAJOR = 2.1 +LIBMINIUPNPC_VERSION_MINOR = 20201016 +LIBMINIUPNPC_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR).$(LIBMINIUPNPC_VERSION_MINOR) LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES LIBMINIUPNPC_LICENSE = BSD-3-Clause LIBMINIUPNPC_LICENSE_FILES = LICENSE +LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project +LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc +LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) +LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) $(eval $(cmake-package)) diff --git a/buildroot/package/libmodplug/libmodplug.mk b/buildroot/package/libmodplug/libmodplug.mk index 05786ce81..98c38a3b0 100644 --- a/buildroot/package/libmodplug/libmodplug.mk +++ b/buildroot/package/libmodplug/libmodplug.mk @@ -9,5 +9,6 @@ LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodpl LIBMODPLUG_INSTALL_STAGING = YES LIBMODPLUG_LICENSE = Public Domain LIBMODPLUG_LICENSE_FILES = COPYING +LIBMODPLUG_CPE_ID_VENDOR = konstanty_bialkowski $(eval $(autotools-package)) diff --git a/buildroot/package/libmodsecurity/libmodsecurity.mk b/buildroot/package/libmodsecurity/libmodsecurity.mk index 063f969fc..a84cd27b3 100644 --- a/buildroot/package/libmodsecurity/libmodsecurity.mk +++ b/buildroot/package/libmodsecurity/libmodsecurity.mk @@ -10,6 +10,8 @@ LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/downloa LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE +LIBMODSECURITY_CPE_ID_VENDOR = trustwave +LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity # 0002-test-for-uClinux-in-configure-script.patch LIBMODSECURITY_AUTORECONF = YES # libinjection uses AC_CHECK_FILE, not available in cross-compile diff --git a/buildroot/package/libopenh264/libopenh264.mk b/buildroot/package/libopenh264/libopenh264.mk index 5a1000a6d..0c1757997 100644 --- a/buildroot/package/libopenh264/libopenh264.mk +++ b/buildroot/package/libopenh264/libopenh264.mk @@ -8,6 +8,8 @@ LIBOPENH264_VERSION = 2.1.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE +LIBOPENH264_CPE_ID_VENDOR = cisco +LIBOPENH264_CPE_ID_PRODUCT = openh264 LIBOPENH264_INSTALL_STAGING = YES ifeq ($(BR2_aarch64),y) diff --git a/buildroot/package/libosip2/libosip2.mk b/buildroot/package/libosip2/libosip2.mk index d28027c13..b86a72479 100644 --- a/buildroot/package/libosip2/libosip2.mk +++ b/buildroot/package/libosip2/libosip2.mk @@ -9,6 +9,8 @@ LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ LIBOSIP2_LICENSE_FILES = COPYING +LIBOSIP2_CPE_ID_VENDOR = gnu +LIBOSIP2_CPE_ID_PRODUCT = osip ifeq ($(BR2_arc),y) # toolchain __arc__ define conflicts with libosip2 source diff --git a/buildroot/package/libpam-tacplus/libpam-tacplus.mk b/buildroot/package/libpam-tacplus/libpam-tacplus.mk index b9630d8b3..ff0dce9c0 100644 --- a/buildroot/package/libpam-tacplus/libpam-tacplus.mk +++ b/buildroot/package/libpam-tacplus/libpam-tacplus.mk @@ -8,6 +8,8 @@ LIBPAM_TACPLUS_VERSION = 1.6.1 LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,v$(LIBPAM_TACPLUS_VERSION)) LIBPAM_TACPLUS_LICENSE = GPL-2.0+ LIBPAM_TACPLUS_LICENSE_FILES = COPYING +LIBPAM_TACPLUS_CPE_ID_VENDOR = pam_tacplus_project +LIBPAM_TACPLUS_CPE_ID_PRODUCT = pam_tacplus LIBPAM_TACPLUS_DEPENDENCIES = \ linux-pam \ $(if $(BR2_PACKAGE_OPENSSL),openssl) diff --git a/buildroot/package/libpjsip/libpjsip.mk b/buildroot/package/libpjsip/libpjsip.mk index f0956d11a..8feec9bcb 100644 --- a/buildroot/package/libpjsip/libpjsip.mk +++ b/buildroot/package/libpjsip/libpjsip.mk @@ -12,6 +12,8 @@ LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING +LIBPJSIP_CPE_ID_VENDOR = pjsip +LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) diff --git a/buildroot/package/libpng/libpng.mk b/buildroot/package/libpng/libpng.mk index 1a83c7e71..e4e629bbb 100644 --- a/buildroot/package/libpng/libpng.mk +++ b/buildroot/package/libpng/libpng.mk @@ -10,6 +10,7 @@ LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) LIBPNG_LICENSE = Libpng-2.0 LIBPNG_LICENSE_FILES = LICENSE +LIBPNG_CPE_ID_VENDOR = libpng LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib diff --git a/buildroot/package/librsvg/librsvg.mk b/buildroot/package/librsvg/librsvg.mk index 6a45fc97e..5eeb68f9b 100644 --- a/buildroot/package/librsvg/librsvg.mk +++ b/buildroot/package/librsvg/librsvg.mk @@ -19,6 +19,7 @@ LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf host-rustc libglib2 libx HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml2 host-pango host-rustc LIBRSVG_LICENSE = LGPL-2.1+ LIBRSVG_LICENSE_FILES = COPYING.LIB +LIBRSVG_CPE_ID_VENDOR = gnome ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBRSVG_CONF_OPTS += --enable-introspection diff --git a/buildroot/package/librsync/librsync.mk b/buildroot/package/librsync/librsync.mk index fbe56d4a2..bb36cb657 100644 --- a/buildroot/package/librsync/librsync.mk +++ b/buildroot/package/librsync/librsync.mk @@ -8,6 +8,7 @@ LIBRSYNC_VERSION = 2.3.1 LIBRSYNC_SITE = $(call github,librsync,librsync,v$(LIBRSYNC_VERSION)) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING +LIBRSYNC_CPE_ID_VENDOR = librsync_project LIBRSYNC_INSTALL_STAGING = YES LIBRSYNC_DEPENDENCIES = host-pkgconf zlib bzip2 popt diff --git a/buildroot/package/libseccomp/libseccomp.mk b/buildroot/package/libseccomp/libseccomp.mk index cea3d2860..e7512730d 100644 --- a/buildroot/package/libseccomp/libseccomp.mk +++ b/buildroot/package/libseccomp/libseccomp.mk @@ -8,6 +8,7 @@ LIBSECCOMP_VERSION = 2.4.4 LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE +LIBSECCOMP_CPE_ID_VENDOR = libseccomp_project LIBSECCOMP_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/buildroot/package/libshout/0001-configure.ac-add-an-option-to-disable-tools.patch b/buildroot/package/libshout/0001-configure.ac-add-an-option-to-disable-tools.patch new file mode 100644 index 000000000..5c20db72e --- /dev/null +++ b/buildroot/package/libshout/0001-configure.ac-add-an-option-to-disable-tools.patch @@ -0,0 +1,51 @@ +From 148b56bf894192cef6dd133715e295260b934a71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 5 Mar 2021 15:50:32 +0100 +Subject: [PATCH] configure.ac: add an option to disable tools + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.xiph.org/xiph/icecast-libshout/-/issues/2331] +--- + Makefile.am | 5 ++++- + configure.ac | 5 +++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ea855cf..79241f1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,10 +3,13 @@ + AUTOMAKE_OPTIONS = 1.6 foreign + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = include src doc win32 tools ++SUBDIRS = include src doc win32 + if HAVE_EXAMPLES + SUBDIRS += examples + endif ++if HAVE_TOOLS ++SUBDIRS += tools ++endif + + EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \ + m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \ +diff --git a/configure.ac b/configure.ac +index 264b9b0..34f971c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,6 +100,11 @@ AC_ARG_ENABLE([examples], + AS_HELP_STRING([--disable-examples],[Do not build example code])) + AM_CONDITIONAL([HAVE_EXAMPLES],[test "${enable_examples}" != "no"]) + ++dnl Allow tools not to be build ++AC_ARG_ENABLE([tools], ++ AS_HELP_STRING([--disable-tools],[Do not build tools])) ++AM_CONDITIONAL([HAVE_TOOLS],[test "${enable_tools}" != "no"]) ++ + dnl Module checks + XIPH_NET + +-- +2.30.0 + diff --git a/buildroot/package/libshout/libshout.mk b/buildroot/package/libshout/libshout.mk index 01ccf22e2..57d26390c 100644 --- a/buildroot/package/libshout/libshout.mk +++ b/buildroot/package/libshout/libshout.mk @@ -10,7 +10,11 @@ LIBSHOUT_LICENSE = LGPL-2.0+ LIBSHOUT_LICENSE_FILES = COPYING LIBSHOUT_INSTALL_STAGING = YES LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis -LIBSHOUT_CONF_OPTS = --disable-examples +# We're patching configure.ac +LIBSHOUT_AUTORECONF = YES +LIBSHOUT_CONF_OPTS = \ + --disable-examples \ + --disable-tools ifeq ($(BR2_PACKAGE_LIBTHEORA),y) LIBSHOUT_CONF_OPTS += --enable-theora diff --git a/buildroot/package/libsndfile/libsndfile.mk b/buildroot/package/libsndfile/libsndfile.mk index 7d1dca059..eb1542614 100644 --- a/buildroot/package/libsndfile/libsndfile.mk +++ b/buildroot/package/libsndfile/libsndfile.mk @@ -9,6 +9,7 @@ LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING +LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project # 0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch LIBSNDFILE_IGNORE_CVES += CVE-2017-14634 diff --git a/buildroot/package/libsoup/libsoup.mk b/buildroot/package/libsoup/libsoup.mk index 07c9d787b..44808225e 100644 --- a/buildroot/package/libsoup/libsoup.mk +++ b/buildroot/package/libsoup/libsoup.mk @@ -10,6 +10,7 @@ LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ LIBSOUP_LICENSE_FILES = COPYING +LIBSOUP_CPE_ID_VENDOR = gnome LIBSOUP_INSTALL_STAGING = YES LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no diff --git a/buildroot/package/libsrtp/libsrtp.mk b/buildroot/package/libsrtp/libsrtp.mk index f816f4c3e..5cbd97957 100644 --- a/buildroot/package/libsrtp/libsrtp.mk +++ b/buildroot/package/libsrtp/libsrtp.mk @@ -9,6 +9,7 @@ LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause LIBSRTP_LICENSE_FILES = LICENSE +LIBSRTP_CPE_ID_VENDOR = cisco ifeq ($(BR2_STATIC_LIBS),y) LIBSRTP_MAKE_OPTS = libsrtp2.a diff --git a/buildroot/package/libstrophe/libstrophe.hash b/buildroot/package/libstrophe/libstrophe.hash index 5f3b098c8..d5f151660 100644 --- a/buildroot/package/libstrophe/libstrophe.hash +++ b/buildroot/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8d804e4c74cea1133203cc95a59a88f700fbdaead076e7959b495d734dd7936d libstrophe-0.10.0.tar.gz -sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt +sha256 5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39 libstrophe-0.10.1.tar.gz +sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/buildroot/package/libstrophe/libstrophe.mk b/buildroot/package/libstrophe/libstrophe.mk index 81fc1b9f9..e078eb25c 100644 --- a/buildroot/package/libstrophe/libstrophe.mk +++ b/buildroot/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.10.0 +LIBSTROPHE_VERSION = 0.10.1 LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION)) LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf # Doesn't ship configure diff --git a/buildroot/package/libtirpc/libtirpc.mk b/buildroot/package/libtirpc/libtirpc.mk index e0c3d0e3f..0f44aaffb 100644 --- a/buildroot/package/libtirpc/libtirpc.mk +++ b/buildroot/package/libtirpc/libtirpc.mk @@ -9,7 +9,7 @@ LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause LIBTIRPC_LICENSE_FILES = COPYING -LIBTIRPC_CPE_ID_VALID = YES +LIBTIRPC_CPE_ID_VENDOR = libtirpc_project LIBTIRPC_DEPENDENCIES = host-nfs-utils LIBTIRPC_INSTALL_STAGING = YES diff --git a/buildroot/package/libupnp/libupnp.mk b/buildroot/package/libupnp/libupnp.mk index ebc5e8376..0b36881e1 100644 --- a/buildroot/package/libupnp/libupnp.mk +++ b/buildroot/package/libupnp/libupnp.mk @@ -12,7 +12,7 @@ LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3-Clause LIBUPNP_LICENSE_FILES = COPYING -LIBUPNP_CPE_ID_VALID = YES +LIBUPNP_CPE_ID_VENDOR = libupnp_project LIBUPNP_DEPENDENCIES = host-pkgconf # Bind the internal miniserver socket with reuseaddr to allow clean restarts. diff --git a/buildroot/package/liburiparser/liburiparser.mk b/buildroot/package/liburiparser/liburiparser.mk index e333354ec..4ba1e051e 100644 --- a/buildroot/package/liburiparser/liburiparser.mk +++ b/buildroot/package/liburiparser/liburiparser.mk @@ -9,6 +9,8 @@ LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause LIBURIPARSER_LICENSE_FILES = COPYING +LIBURIPARSER_CPE_ID_VENDOR = uriparser_project +LIBURIPARSER_CPE_ID_PRODUCT = uriparser LIBURIPARSER_INSTALL_STAGING = YES LIBURIPARSER_CONF_OPTS = -DURIPARSER_BUILD_DOCS=OFF -DURIPARSER_BUILD_TESTS=OFF diff --git a/buildroot/package/libvncserver/libvncserver.mk b/buildroot/package/libvncserver/libvncserver.mk index db38e7d3c..ead809d19 100644 --- a/buildroot/package/libvncserver/libvncserver.mk +++ b/buildroot/package/libvncserver/libvncserver.mk @@ -9,7 +9,7 @@ LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE_FILES = COPYING -LIBVNCSERVER_CPE_ID_VALID = YES +LIBVNCSERVER_CPE_ID_VENDOR = libvncserver_project LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON diff --git a/buildroot/package/libvorbis/libvorbis.mk b/buildroot/package/libvorbis/libvorbis.mk index 95c43d959..c1baa1851 100644 --- a/buildroot/package/libvorbis/libvorbis.mk +++ b/buildroot/package/libvorbis/libvorbis.mk @@ -12,5 +12,6 @@ LIBVORBIS_CONF_OPTS = --disable-oggtest LIBVORBIS_DEPENDENCIES = host-pkgconf libogg LIBVORBIS_LICENSE = BSD-3-Clause LIBVORBIS_LICENSE_FILES = COPYING +LIBVORBIS_CPE_ID_VENDOR = xiph.org $(eval $(autotools-package)) diff --git a/buildroot/package/libyaml/libyaml.mk b/buildroot/package/libyaml/libyaml.mk index f65317aab..cf3d44cac 100644 --- a/buildroot/package/libyaml/libyaml.mk +++ b/buildroot/package/libyaml/libyaml.mk @@ -10,6 +10,7 @@ LIBYAML_SITE = http://pyyaml.org/download/libyaml LIBYAML_INSTALL_STAGING = YES LIBYAML_LICENSE = MIT LIBYAML_LICENSE_FILES = License +LIBYAML_CPE_ID_VENDOR = pyyaml $(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 8da119cfa..2ddee289d 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -346,12 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.255" if BR2_KERNEL_HEADERS_4_4 - default "4.9.255" if BR2_KERNEL_HEADERS_4_9 - default "4.14.219" if BR2_KERNEL_HEADERS_4_14 - default "4.19.173" if BR2_KERNEL_HEADERS_4_19 - default "5.4.95" if BR2_KERNEL_HEADERS_5_4 - default "5.10.13" if BR2_KERNEL_HEADERS_5_10 + default "4.4.258" if BR2_KERNEL_HEADERS_4_4 + default "4.9.258" if BR2_KERNEL_HEADERS_4_9 + default "4.14.222" if BR2_KERNEL_HEADERS_4_14 + default "4.19.177" if BR2_KERNEL_HEADERS_4_19 + default "5.4.101" if BR2_KERNEL_HEADERS_5_4 + default "5.10.19" if BR2_KERNEL_HEADERS_5_10 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/live555/live555.mk b/buildroot/package/live555/live555.mk index 621812695..9a5c1c7c0 100644 --- a/buildroot/package/live555/live555.mk +++ b/buildroot/package/live555/live555.mk @@ -13,6 +13,8 @@ LIVE555_SITE = http://www.live555.com/liveMedia/public # http://live555.com/liveMedia/faq.html#copyright-and-license LIVE555_LICENSE = LGPL-3.0+ LIVE555_LICENSE_FILES = COPYING.LESSER +LIVE555_CPE_ID_VENDOR = live555 +LIVE555_CPE_ID_PRODUCT = streaming_media LIVE555_INSTALL_STAGING = YES LIVE555_CFLAGS = $(TARGET_CFLAGS) diff --git a/buildroot/package/logrotate/logrotate.mk b/buildroot/package/logrotate/logrotate.mk index ee2ab7509..df79da677 100644 --- a/buildroot/package/logrotate/logrotate.mk +++ b/buildroot/package/logrotate/logrotate.mk @@ -9,7 +9,7 @@ LOGROTATE_SOURCE = logrotate-3.18.0.tar.xz LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING -LOGROTATE_CPE_ID_VALID = YES +LOGROTATE_CPE_ID_VENDOR = logrotate_project LOGROTATE_DEPENDENCIES = popt host-pkgconf LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" diff --git a/buildroot/package/lzo/lzo.mk b/buildroot/package/lzo/lzo.mk index 0ead92725..0682d8d0f 100644 --- a/buildroot/package/lzo/lzo.mk +++ b/buildroot/package/lzo/lzo.mk @@ -8,6 +8,7 @@ LZO_VERSION = 2.10 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_LICENSE = GPL-2.0+ LZO_LICENSE_FILES = COPYING +LZO_CPE_ID_VENDOR = lzo_project LZO_INSTALL_STAGING = YES LZO_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot/package/matio/matio.mk b/buildroot/package/matio/matio.mk index eb8363274..0ebba1343 100644 --- a/buildroot/package/matio/matio.mk +++ b/buildroot/package/matio/matio.mk @@ -8,7 +8,7 @@ MATIO_VERSION = 1.5.18 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING -MATIO_CPE_ID_VALID = YES +MATIO_CPE_ID_VENDOR = matio_project MATIO_DEPENDENCIES = zlib MATIO_INSTALL_STAGING = YES diff --git a/buildroot/package/minicom/minicom.mk b/buildroot/package/minicom/minicom.mk index 1e1272598..b81ee5212 100644 --- a/buildroot/package/minicom/minicom.mk +++ b/buildroot/package/minicom/minicom.mk @@ -10,6 +10,7 @@ MINICOM_SITE = \ https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING +MINICOM_CPE_ID_VENDOR = minicom_project MINICOM_AUTORECONF = YES MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \ diff --git a/buildroot/package/mosquitto/mosquitto.hash b/buildroot/package/mosquitto/mosquitto.hash index 225d4f2b3..fa83af771 100644 --- a/buildroot/package/mosquitto/mosquitto.hash +++ b/buildroot/package/mosquitto/mosquitto.hash @@ -1,6 +1,6 @@ # Locally calculated after checking gpg signature -# from https://mosquitto.org/files/source/mosquitto-2.0.7.tar.gz.asc -sha256 a98054f0b8161588975ef24e1d467550d3935f4c16ccee63ecb623248a28356e mosquitto-2.0.7.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.8.tar.gz.asc +sha256 b15da8fc4edcb91d554e1259e220ea0173ef639ceaa4b465e06feb7e125b84bf mosquitto-2.0.8.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/buildroot/package/mosquitto/mosquitto.mk b/buildroot/package/mosquitto/mosquitto.mk index 7dfdf5945..be9d88597 100644 --- a/buildroot/package/mosquitto/mosquitto.mk +++ b/buildroot/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.7 +MOSQUITTO_VERSION = 2.0.8 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 diff --git a/buildroot/package/mpg123/mpg123.mk b/buildroot/package/mpg123/mpg123.mk index 5e3b7fd94..588a4ffc3 100644 --- a/buildroot/package/mpg123/mpg123.mk +++ b/buildroot/package/mpg123/mpg123.mk @@ -11,6 +11,7 @@ MPG123_CONF_OPTS = --disable-lfs-alias MPG123_INSTALL_STAGING = YES MPG123_LICENSE = LGPL-2.1 MPG123_LICENSE_FILES = COPYING +MPG123_CPE_ID_VENDOR = mpg123 MPG123_DEPENDENCIES = host-pkgconf MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu) diff --git a/buildroot/package/ncmpc/ncmpc.mk b/buildroot/package/ncmpc/ncmpc.mk index c229fd298..0cc976564 100644 --- a/buildroot/package/ncmpc/ncmpc.mk +++ b/buildroot/package/ncmpc/ncmpc.mk @@ -16,7 +16,7 @@ NCMPC_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING -NCMPC_CPE_ID_VALID = YES +NCMPC_CPE_ID_VENDOR = ncmpc_project NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ diff --git a/buildroot/package/neon/neon.mk b/buildroot/package/neon/neon.mk index 2c00e6a8b..da53735d0 100644 --- a/buildroot/package/neon/neon.mk +++ b/buildroot/package/neon/neon.mk @@ -8,6 +8,7 @@ NEON_VERSION = 0.30.2 NEON_SITE = http://www.webdav.org/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README +NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES NEON_CONF_OPTS = --without-gssapi --disable-rpath NEON_CONFIG_SCRIPTS = neon-config diff --git a/buildroot/package/netatalk/netatalk.mk b/buildroot/package/netatalk/netatalk.mk index 1214fc3bf..0c219a231 100644 --- a/buildroot/package/netatalk/netatalk.mk +++ b/buildroot/package/netatalk/netatalk.mk @@ -14,6 +14,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT +NETATALK_CPE_ID_VENDOR = netatalk_project # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ diff --git a/buildroot/package/netcat/netcat.mk b/buildroot/package/netcat/netcat.mk index c9d7952e5..939c9fa9f 100644 --- a/buildroot/package/netcat/netcat.mk +++ b/buildroot/package/netcat/netcat.mk @@ -8,6 +8,6 @@ NETCAT_VERSION = 0.7.1 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING -NETCAT_CPE_ID_VALID = YES +NETCAT_CPE_ID_VENDOR = netcat_project $(eval $(autotools-package)) diff --git a/buildroot/package/nettle/nettle.mk b/buildroot/package/nettle/nettle.mk index 68844976e..fef68375d 100644 --- a/buildroot/package/nettle/nettle.mk +++ b/buildroot/package/nettle/nettle.mk @@ -10,7 +10,7 @@ NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 -NETTLE_CPE_ID_VALID = YES +NETTLE_CPE_ID_VENDOR = nettle_project # don't include openssl support for (unused) examples as it has problems # with static linking NETTLE_CONF_OPTS = --disable-openssl diff --git a/buildroot/package/nmap/nmap.mk b/buildroot/package/nmap/nmap.mk index aed278ccb..13414a56e 100644 --- a/buildroot/package/nmap/nmap.mk +++ b/buildroot/package/nmap/nmap.mk @@ -12,6 +12,7 @@ NMAP_CONF_OPTS = --without-liblua --without-zenmap \ --with-libdnet=included NMAP_LICENSE = nmap license NMAP_LICENSE_FILES = LICENSE +NMAP_CPE_ID_VENDOR = nmap NMAP_SELINUX_MODULES = netutils # needed by libpcap diff --git a/buildroot/package/oniguruma/oniguruma.mk b/buildroot/package/oniguruma/oniguruma.mk index ef63a5e8a..6ea5e1e69 100644 --- a/buildroot/package/oniguruma/oniguruma.mk +++ b/buildroot/package/oniguruma/oniguruma.mk @@ -10,7 +10,7 @@ ONIGURUMA_SITE = \ ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING -ONIGURUMA_CPE_ID_VALID = YES +ONIGURUMA_CPE_ID_VENDOR = oniguruma_project ONIGURUMA_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/buildroot/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch b/buildroot/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch new file mode 100644 index 000000000..72b387b93 --- /dev/null +++ b/buildroot/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch @@ -0,0 +1,47 @@ +From 4d3829fa52240c2b7e48770ab19584db33ba7863 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Fri, 5 Mar 2021 11:17:59 +0100 +Subject: [PATCH] Makefile: fix support for passing FFLAGS on the make + command line + +When openblas is built while passing FFLAGS on the make command line, the +compilation of lapack objects will not contain the flags specified in +Makefile but _only_ those passed in FFLAGS. + +This can lead to build failure, e.g. because -fPIC is not passed to the +compilation of most lapack objects, but is given to the link command: + +.../buildroot/output/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -O2 -DMAX_STACK_ALLOC=2048 -Wall -m64 -DF_INTERFACE_GFORT -fPIC -DNO_WARMUP -DMAX_CPU_NUMBER=4 -DMAX_PARALLEL_NUMBER=1 -DVERSION=\"0.3.9\" -DASMNAME= -DASMFNAME=_ -DNAME=_ -DCNAME= -DCHAR_NAME=\"_\" -DCHAR_CNAME=\"\" -DNO_AFFINITY -I.. -shared -o ../libopenblas_nehalem-r0.3.9.so \ +-Wl,--whole-archive ../libopenblas_nehalem-r0.3.9.a -Wl,--no-whole-archive \ +-Wl,-soname,libopenblas.so.0 -lm -lgfortran -lm -lgfortran +.../buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/9.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: ../libopenblas_nehalem-r0.3.9.a(sbdsvdx.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC + +In the initial support for this principle, added in commit +d0e731e8b825e7a554f245aa8f1118dcec9e2728, the flags specified in the +makefile were appended to the flags specified on the command-line. + +Fix this situation by using 'override' for 'FFLAGS' in +lapack-netlib/make.inc. The flags passed on the command-line are already +part of the LAPACK_FFLAGS variable, so no '+=' is needed here. + +Signed-off-by: Thomas De Schampheleire +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index fc5fe3f5..8ae1ff47 100644 +--- a/Makefile ++++ b/Makefile +@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild + lapack_prebuild : + ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) + -@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc +- -@echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc ++ -@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc + -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc + -@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc + -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc +-- +2.26.2 + diff --git a/buildroot/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/buildroot/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch new file mode 100644 index 000000000..f9278bd09 --- /dev/null +++ b/buildroot/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch @@ -0,0 +1,31 @@ +From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Fri, 5 Mar 2021 11:15:52 +0100 +Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags + +gcc also supports -O, -Og and -Os as optimization flags. +They may be given on the make command-line by users. + +For the calculation of LAPACK_NOOPT, all such flags should be considered. + +Signed-off-by: Thomas De Schampheleire +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index a22e16ba..fc5fe3f5 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,7 +32,7 @@ export NOFORTRAN + export NO_LAPACK + endif + +-LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) ++LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) + + SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test + +-- +2.26.2 + diff --git a/buildroot/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch b/buildroot/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch new file mode 100644 index 000000000..bcc3e0eb6 --- /dev/null +++ b/buildroot/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch @@ -0,0 +1,40 @@ +From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Fri, 5 Mar 2021 14:09:23 +0100 +Subject: [PATCH] Makefile.system: don't specify optimization level + [buildroot-specific] + +Buildroot will pass an optimization level, but it is ignored because the +openblas makefiles _append_ to the flags passed on the command-line. + +The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. + +Remove the optimization level specified in openblas itself. + +Signed-off-by: Thomas De Schampheleire + +--- + Makefile.system | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.system b/Makefile.system +index 1e30d05a..04b0be16 100644 +--- a/Makefile.system ++++ b/Makefile.system +@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g + endif + + ifndef COMMON_OPT +-COMMON_OPT = -O2 ++COMMON_OPT = + endif + + ifndef FCOMMON_OPT +-FCOMMON_OPT = -O2 -frecursive ++FCOMMON_OPT = -frecursive + endif + + override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) +-- +2.26.2 + diff --git a/buildroot/package/openrc/openrc.mk b/buildroot/package/openrc/openrc.mk index e9e35c4d1..d9010a60b 100644 --- a/buildroot/package/openrc/openrc.mk +++ b/buildroot/package/openrc/openrc.mk @@ -8,7 +8,7 @@ OPENRC_VERSION = 0.42.1 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE -OPENRC_CPE_ID_VALID = YES +OPENRC_CPE_ID_VENDOR = openrc_project # 0007-checkpath-fix-CVE-2018-21269.patch OPENRC_IGNORE_CVES += CVE-2018-21269 diff --git a/buildroot/package/openssh/openssh.hash b/buildroot/package/openssh/openssh.hash index 1d7dc14fb..840467f50 100644 --- a/buildroot/package/openssh/openssh.hash +++ b/buildroot/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.3 (base64 encoded) -sha256 f2befbe0472fe7eb75d23340eb17531cb6b3aac24075e2066b41f814e12387b2 openssh-8.3p1.tar.gz +# From https://www.openssh.com/txt/release-8.4 (base64 encoded) +sha256 5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24 openssh-8.4p1.tar.gz # Locally calculated sha256 73d0db766229670c7b4e1ec5e6baed54977a0694a565e7cc878c45ee834045d7 LICENCE diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk index edcbfc2f6..64e3084ca 100644 --- a/buildroot/package/openssh/openssh.mk +++ b/buildroot/package/openssh/openssh.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENSSH_VERSION = 8.3p1 -OPENSSH_CPE_ID_VERSION = 8.3 +OPENSSH_VERSION = 8.4p1 +OPENSSH_CPE_ID_VERSION = 8.4 OPENSSH_CPE_ID_UPDATE = p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain diff --git a/buildroot/package/openssl/Config.in b/buildroot/package/openssl/Config.in index 5ce91cb80..dd4709130 100644 --- a/buildroot/package/openssl/Config.in +++ b/buildroot/package/openssl/Config.in @@ -1,5 +1,11 @@ +config BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS + bool + default y + depends on !BR2_RISCV_32 + config BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL bool + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS config BR2_PACKAGE_OPENSSL bool "openssl support" @@ -11,12 +17,12 @@ if BR2_PACKAGE_OPENSSL choice prompt "ssl library" - default BR2_PACKAGE_LIBOPENSSL help Select OpenSSL or LibreSSL. config BR2_PACKAGE_LIBOPENSSL bool "openssl" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB help A collaborative effort to develop a robust, commercial-grade, diff --git a/buildroot/package/p11-kit/p11-kit.mk b/buildroot/package/p11-kit/p11-kit.mk index 977150f57..284eb0fa3 100644 --- a/buildroot/package/p11-kit/p11-kit.mk +++ b/buildroot/package/p11-kit/p11-kit.mk @@ -13,7 +13,7 @@ P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ ac_cv_have_decl___progname=no P11_KIT_LICENSE = BSD-3-Clause P11_KIT_LICENSE_FILES = COPYING -P11_KIT_CPE_ID_VALID = YES +P11_KIT_CPE_ID_VENDOR = p11-kit_project ifeq ($(BR2_PACKAGE_LIBFFI),y) P11_KIT_DEPENDENCIES += host-pkgconf libffi diff --git a/buildroot/package/pango/pango.mk b/buildroot/package/pango/pango.mk index d719b7659..803e46f19 100644 --- a/buildroot/package/pango/pango.mk +++ b/buildroot/package/pango/pango.mk @@ -11,6 +11,7 @@ PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES PANGO_LICENSE = LGPL-2.0+ PANGO_LICENSE_FILES = COPYING +PANGO_CPE_ID_VENDOR = pango PANGO_CONF_OPTS = -Duse_fontconfig=true HOST_PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=disabled diff --git a/buildroot/package/perl/perl.mk b/buildroot/package/perl/perl.mk index ec1cfd4d0..0ff288db0 100644 --- a/buildroot/package/perl/perl.mk +++ b/buildroot/package/perl/perl.mk @@ -11,6 +11,7 @@ PERL_SITE = https://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_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES PERL_CROSS_VERSION = 1.3.5 @@ -50,7 +51,7 @@ PERL_CONF_OPTS = \ --prefix=/usr \ -Dld="$(TARGET_CC)" \ -Dccflags="$(TARGET_CFLAGS)" \ - -Dldflags="$(TARGET_LDFLAGS) -lm" \ + -Dldflags="$(TARGET_LDFLAGS) -lm $(TARGET_NLS_LIBS)" \ -Dmydomain="" \ -Dmyhostname="noname" \ -Dmyuname="Buildroot $(BR2_VERSION_FULL)" \ diff --git a/buildroot/package/polkit/polkit.mk b/buildroot/package/polkit/polkit.mk index e3fad5318..bf9b5a711 100644 --- a/buildroot/package/polkit/polkit.mk +++ b/buildroot/package/polkit/polkit.mk @@ -8,7 +8,7 @@ POLKIT_VERSION = 0.116 POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING -POLKIT_CPE_ID_VALID = YES +POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES diff --git a/buildroot/package/poppler/poppler.mk b/buildroot/package/poppler/poppler.mk index aba8602e0..44ad04bf7 100644 --- a/buildroot/package/poppler/poppler.mk +++ b/buildroot/package/poppler/poppler.mk @@ -10,6 +10,7 @@ POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf POPPLER_LICENSE = GPL-2.0+ POPPLER_LICENSE_FILES = COPYING +POPPLER_CPE_ID_VENDOR = freedesktop POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = \ diff --git a/buildroot/package/powerpc-utils/powerpc-utils.mk b/buildroot/package/powerpc-utils/powerpc-utils.mk index 2f8b7d3b9..b12194ae8 100644 --- a/buildroot/package/powerpc-utils/powerpc-utils.mk +++ b/buildroot/package/powerpc-utils/powerpc-utils.mk @@ -10,7 +10,7 @@ POWERPC_UTILS_DEPENDENCIES = zlib POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ POWERPC_UTILS_LICENSE_FILES = COPYING -POWERPC_UTILS_CPE_ID_VALID = YES +POWERPC_UTILS_CPE_ID_VENDOR = powerpc-utils_project POWERPC_UTILS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) diff --git a/buildroot/package/privoxy/privoxy.hash b/buildroot/package/privoxy/privoxy.hash index 00c0f33bd..92ecd1dd2 100644 --- a/buildroot/package/privoxy/privoxy.hash +++ b/buildroot/package/privoxy/privoxy.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.31%20%28stable%29/ -md5 014cc371d00e84b2db34d0e2b05c77d4 privoxy-3.0.31-stable-src.tar.gz -sha1 4f0e0c36d55f72f6b33e4c645a9c5d4f40026abd privoxy-3.0.31-stable-src.tar.gz +# From https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/ +md5 3a0a8ebdf80e0a29154683e74cbf510b privoxy-3.0.32-stable-src.tar.gz +sha1 3a298ab2599fc92555c86dc29a37742d7396a0d3 privoxy-3.0.32-stable-src.tar.gz # Locally computed -sha256 077729a3aac79222a4e8d88a650d9028d16fd4b0d6038da8f5f5e47120d004eb privoxy-3.0.31-stable-src.tar.gz +sha256 c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7 privoxy-3.0.32-stable-src.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/buildroot/package/privoxy/privoxy.mk b/buildroot/package/privoxy/privoxy.mk index 7f0e5bb3a..adb5af28a 100644 --- a/buildroot/package/privoxy/privoxy.mk +++ b/buildroot/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.31 +PRIVOXY_VERSION = 3.0.32 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped diff --git a/buildroot/package/procps-ng/procps-ng.mk b/buildroot/package/procps-ng/procps-ng.mk index 5bafc7ee9..84ada1b13 100644 --- a/buildroot/package/procps-ng/procps-ng.mk +++ b/buildroot/package/procps-ng/procps-ng.mk @@ -9,6 +9,7 @@ PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB +PROCPS_NG_CPE_ID_VENDOR = procps-ng_project PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) diff --git a/buildroot/package/prosody/prosody.hash b/buildroot/package/prosody/prosody.hash index dc4e567d4..309ae0181 100644 --- a/buildroot/package/prosody/prosody.hash +++ b/buildroot/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 a9bf18a713804b5cc9d0322d1bf5d5d8 prosody-0.11.7.tar.gz -sha1 425e1c7ca37464b31711da8eb4a4c9444a70360f prosody-0.11.7.tar.gz -sha256 28ffc07653485cb63e22b387d3ea4825ee2baaee0c5827de4d6053a35b1c8747 prosody-0.11.7.tar.gz -sha512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20 prosody-0.11.7.tar.gz +md5 24cd3c1f7ab16a6b3726423d2fff802d prosody-0.11.8.tar.gz +sha1 f1f030c75abde6e3c7232fedbe8371f5cb913245 prosody-0.11.8.tar.gz +sha256 830f183b98d5742d81e908d2d8e3258f1b538dad7411f06fda5b2cc5c75068f8 prosody-0.11.8.tar.gz +sha512 b0b7e1d3e41f47f0f88ad5b76444e4959b20f4c7a937f3cc605ba6ed5d92e713a3054dcb61ee6629063883a8f9ff1a03952893de4a0d840dcec4e5e42079eb57 prosody-0.11.8.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/buildroot/package/prosody/prosody.mk b/buildroot/package/prosody/prosody.mk index ad51f6797..a4482ad3c 100644 --- a/buildroot/package/prosody/prosody.mk +++ b/buildroot/package/prosody/prosody.mk @@ -4,10 +4,11 @@ # ################################################################################ -PROSODY_VERSION = 0.11.7 +PROSODY_VERSION = 0.11.8 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING +PROSODY_CPE_ID_VENDOR = prosody PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl PROSODY_CFLAGS = $(TARGET_CFLAGS) -fPIC -std=c99 \ diff --git a/buildroot/package/putty/putty.mk b/buildroot/package/putty/putty.mk index 8f9564bc3..c40cac9dc 100644 --- a/buildroot/package/putty/putty.mk +++ b/buildroot/package/putty/putty.mk @@ -8,6 +8,7 @@ PUTTY_VERSION = 0.74 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE +PUTTY_CPE_ID_VENDOR = putty PUTTY_CONF_OPTS = --disable-gtktest PUTTY_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -Wno-error" diff --git a/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk b/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk index 8fcd8e21b..fa724fdb8 100644 --- a/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/buildroot/package/python-aiohttp-session/python-aiohttp-session.mk @@ -10,5 +10,7 @@ PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/f8/fe/53df PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE +PYTHON_AIOHTTP_SESSION_CPE_ID_VENDOR = aiohttp-session_project +PYTHON_AIOHTTP_SESSION_CPE_ID_PRODUCT = aiohttp-session $(eval $(python-package)) diff --git a/buildroot/package/python-pyyaml/python-pyyaml.hash b/buildroot/package/python-pyyaml/python-pyyaml.hash index 90e1f2199..82b2f4f88 100644 --- a/buildroot/package/python-pyyaml/python-pyyaml.hash +++ b/buildroot/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 d3590b85917362e837298e733321962b PyYAML-5.3.1.tar.gz -sha256 b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d PyYAML-5.3.1.tar.gz +md5 46e25294c7efec23d4072ed6a7777f46 PyYAML-5.4.1.tar.gz +sha256 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e PyYAML-5.4.1.tar.gz # Locally computed sha256 checksums -sha256 c40112449f254b9753045925248313e9270efa36d226b22d82d4cc6c43c57f29 LICENSE +sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/buildroot/package/python-pyyaml/python-pyyaml.mk b/buildroot/package/python-pyyaml/python-pyyaml.mk index 7bbae309c..c9013de8e 100644 --- a/buildroot/package/python-pyyaml/python-pyyaml.mk +++ b/buildroot/package/python-pyyaml/python-pyyaml.mk @@ -5,12 +5,14 @@ ################################################################################ # Please keep in sync package/python3-pyyaml/python3-pyyaml.mk -PYTHON_PYYAML_VERSION = 5.3.1 +PYTHON_PYYAML_VERSION = 5.4.1 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c -PYTHON_PYYAML_SETUP_TYPE = distutils +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE +PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml +PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = libyaml HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml diff --git a/buildroot/package/python-simplejson/python-simplejson.mk b/buildroot/package/python-simplejson/python-simplejson.mk index 3e875015a..cf5bd3a48 100644 --- a/buildroot/package/python-simplejson/python-simplejson.mk +++ b/buildroot/package/python-simplejson/python-simplejson.mk @@ -9,6 +9,8 @@ PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/98/87/a7b98aa9256c8843f92878966dc3d8d914c14aad97e2c5ce4798d5743e07 PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt +PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project +PYTHON_SIMPLEJSON_CPE_ID_PRODUCT = simplejson PYTHON_SIMPLEJSON_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-twisted/python-twisted.mk b/buildroot/package/python-twisted/python-twisted.mk index 2478972f8..49d97af09 100644 --- a/buildroot/package/python-twisted/python-twisted.mk +++ b/buildroot/package/python-twisted/python-twisted.mk @@ -10,6 +10,8 @@ PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE +PYTHON_TWISTED_CPE_ID_VENDOR = twistedmatrix +PYTHON_TWISTED_CPE_ID_PRODUCT = twisted PYTHON_TWISTED_DEPENDENCIES = python-incremental host-python-incremental $(eval $(python-package)) diff --git a/buildroot/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk index 1f212ec69..82db02fcc 100644 --- a/buildroot/package/python-urllib3/python-urllib3.mk +++ b/buildroot/package/python-urllib3/python-urllib3.mk @@ -9,6 +9,8 @@ PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/29/e6/d1a1d78c439cad688757b70f26c50a53332167c364edb0134cadd280e234 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt +PYTHON_URLLIB3_CPE_ID_VENDOR = python +PYTHON_URLLIB3_CPE_ID_PRODUCT = urllib3 PYTHON_URLLIB3_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot/package/python-werkzeug/python-werkzeug.mk b/buildroot/package/python-werkzeug/python-werkzeug.mk index 1013f8af8..fe9b87af1 100644 --- a/buildroot/package/python-werkzeug/python-werkzeug.mk +++ b/buildroot/package/python-werkzeug/python-werkzeug.mk @@ -10,5 +10,7 @@ PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/10/27/a3332915014 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst +PYTHON_WERKZEUG_CPE_ID_VENDOR = palletsprojects +PYTHON_WERKZEUG_CPE_ID_PRODUCT = werkzeug $(eval $(python-package)) diff --git a/buildroot/package/python3-pyyaml/python3-pyyaml.mk b/buildroot/package/python3-pyyaml/python3-pyyaml.mk index c0dcebf4f..f75834150 100644 --- a/buildroot/package/python3-pyyaml/python3-pyyaml.mk +++ b/buildroot/package/python3-pyyaml/python3-pyyaml.mk @@ -5,12 +5,14 @@ ################################################################################ # Please keep in sync with package/python-pyyaml/python-pyyaml.mk -PYTHON3_PYYAML_VERSION = 5.3.1 +PYTHON3_PYYAML_VERSION = 5.4.1 PYTHON3_PYYAML_SOURCE = PyYAML-$(PYTHON3_PYYAML_VERSION).tar.gz -PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c -PYTHON3_PYYAML_SETUP_TYPE = distutils +PYTHON3_PYYAML_SITE = https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d +PYTHON3_PYYAML_SETUP_TYPE = setuptools PYTHON3_PYYAML_LICENSE = MIT PYTHON3_PYYAML_LICENSE_FILES = LICENSE +PYTHON3_PYYAML_CPE_ID_VENDOR = pyyaml +PYTHON3_PYYAML_CPE_ID_PRODUCT = pyyaml HOST_PYTHON3_PYYAML_DL_SUBDIR = python-pyyaml HOST_PYTHON3_PYYAML_NEEDS_HOST_PYTHON = python3 HOST_PYTHON3_PYYAML_DEPENDENCIES = host-libyaml diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk index 63d6c3f53..def34f46a 100644 --- a/buildroot/package/python3/python3.mk +++ b/buildroot/package/python3/python3.mk @@ -10,6 +10,8 @@ PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others PYTHON3_LICENSE_FILES = LICENSE +PYTHON3_CPE_ID_VENDOR = python +PYTHON3_CPE_ID_PRODUCT = python # This host Python is installed in $(HOST_DIR), as it is needed when # cross-compiling third-party Python modules. diff --git a/buildroot/package/quagga/0003-Fix-build-with-gcc-10.patch b/buildroot/package/quagga/0003-Fix-build-with-gcc-10.patch new file mode 100644 index 000000000..fbe85165e --- /dev/null +++ b/buildroot/package/quagga/0003-Fix-build-with-gcc-10.patch @@ -0,0 +1,127 @@ +From 7a446434302d7b71211b81b3c6cd12a7b35223d1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 6 Mar 2021 16:28:37 +0100 +Subject: [PATCH] Fix build with gcc 10 + +Fix the following build failure with gcc 10 (which defaults to +-fno-common): + + CCLD pimd +/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pimd.o:(.bss+0x8): multiple definition of `qpim_static_route_list'; pim_main.o:(.bss+0x8): first defined here +/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pimd.o:(.bss+0x28): multiple definition of `qpim_mroute_del_last'; pim_main.o:(.bss+0x10): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/fd5ee2b52a3cfaec268fafd3ffe4c30e51465c7e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugzilla.quagga.net/show_bug.cgi?id=1014] +--- + pimd/pim_version.h | 2 +- + pimd/pimd.c | 1 + + pimd/pimd.h | 66 +++++++++++++++++++++++----------------------- + 3 files changed, 35 insertions(+), 34 deletions(-) + +diff --git a/pimd/pim_version.h b/pimd/pim_version.h +index ef9f370c..891d4314 100644 +--- a/pimd/pim_version.h ++++ b/pimd/pim_version.h +@@ -25,6 +25,6 @@ + + #define PIMD_VERSION_STR "0.166" + +-const char * const PIMD_VERSION; ++extern const char * const PIMD_VERSION; + + #endif /* PIM_VERSION_H */ +diff --git a/pimd/pimd.c b/pimd/pimd.c +index 97fb2233..d7340cc0 100644 +--- a/pimd/pimd.c ++++ b/pimd/pimd.c +@@ -50,6 +50,7 @@ int64_t qpim_mroute_socket_creation = 0; /* timestamp of creat + struct thread *qpim_mroute_socket_reader = 0; + int qpim_mroute_oif_highest_vif_index = -1; + struct list *qpim_channel_oil_list = 0; ++struct in_addr qpim_all_pim_routers_addr; + int qpim_t_periodic = PIM_DEFAULT_T_PERIODIC; /* Period between Join/Prune Messages */ + struct list *qpim_upstream_list = 0; + struct zclient *qpim_zclient_update = 0; +diff --git a/pimd/pimd.h b/pimd/pimd.h +index 9a7e6058..8b3496fd 100644 +--- a/pimd/pimd.h ++++ b/pimd/pimd.h +@@ -68,39 +68,39 @@ + #define PIM_MASK_PIM_J_P (1 << 12) + #define PIM_MASK_STATIC (1 << 13) + +-const char *const PIM_ALL_SYSTEMS; +-const char *const PIM_ALL_ROUTERS; +-const char *const PIM_ALL_PIM_ROUTERS; +-const char *const PIM_ALL_IGMP_ROUTERS; +- +-struct thread_master *master; +-uint32_t qpim_debugs; +-int qpim_mroute_socket_fd; +-int64_t qpim_mroute_socket_creation; /* timestamp of creation */ +-struct thread *qpim_mroute_socket_reader; +-int qpim_mroute_oif_highest_vif_index; +-struct list *qpim_channel_oil_list; /* list of struct channel_oil */ +-struct in_addr qpim_all_pim_routers_addr; +-int qpim_t_periodic; /* Period between Join/Prune Messages */ +-struct list *qpim_upstream_list; /* list of struct pim_upstream */ +-struct zclient *qpim_zclient_update; +-struct zclient *qpim_zclient_lookup; +-struct pim_assert_metric qpim_infinite_assert_metric; +-long qpim_rpf_cache_refresh_delay_msec; +-struct thread *qpim_rpf_cache_refresher; +-int64_t qpim_rpf_cache_refresh_requests; +-int64_t qpim_rpf_cache_refresh_events; +-int64_t qpim_rpf_cache_refresh_last; +-struct in_addr qpim_inaddr_any; +-struct list *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */ +-struct in_addr qpim_ssmpingd_group_addr; +-int64_t qpim_scan_oil_events; +-int64_t qpim_scan_oil_last; +-int64_t qpim_mroute_add_events; +-int64_t qpim_mroute_add_last; +-int64_t qpim_mroute_del_events; +-int64_t qpim_mroute_del_last; +-struct list *qpim_static_route_list; /* list of routes added statically */ ++extern const char *const PIM_ALL_SYSTEMS; ++extern const char *const PIM_ALL_ROUTERS; ++extern const char *const PIM_ALL_PIM_ROUTERS; ++extern const char *const PIM_ALL_IGMP_ROUTERS; ++ ++extern struct thread_master *master; ++extern uint32_t qpim_debugs; ++extern int qpim_mroute_socket_fd; ++extern int64_t qpim_mroute_socket_creation; /* timestamp of creation */ ++extern struct thread *qpim_mroute_socket_reader; ++extern int qpim_mroute_oif_highest_vif_index; ++extern struct list *qpim_channel_oil_list; /* list of struct channel_oil */ ++extern struct in_addr qpim_all_pim_routers_addr; ++extern int qpim_t_periodic; /* Period between Join/Prune Messages */ ++extern struct list *qpim_upstream_list; /* list of struct pim_upstream */ ++extern struct zclient *qpim_zclient_update; ++extern struct zclient *qpim_zclient_lookup; ++extern struct pim_assert_metric qpim_infinite_assert_metric; ++extern long qpim_rpf_cache_refresh_delay_msec; ++extern struct thread *qpim_rpf_cache_refresher; ++extern int64_t qpim_rpf_cache_refresh_requests; ++extern int64_t qpim_rpf_cache_refresh_events; ++extern int64_t qpim_rpf_cache_refresh_last; ++extern struct in_addr qpim_inaddr_any; ++extern struct list *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */ ++extern struct in_addr qpim_ssmpingd_group_addr; ++extern int64_t qpim_scan_oil_events; ++extern int64_t qpim_scan_oil_last; ++extern int64_t qpim_mroute_add_events; ++extern int64_t qpim_mroute_add_last; ++extern int64_t qpim_mroute_del_events; ++extern int64_t qpim_mroute_del_last; ++extern struct list *qpim_static_route_list; /* list of routes added statically */ + + #define PIM_JP_HOLDTIME (qpim_t_periodic * 7 / 2) + +-- +2.30.0 + diff --git a/buildroot/package/rabbitmq-c/rabbitmq-c.mk b/buildroot/package/rabbitmq-c/rabbitmq-c.mk index d25673b59..e6ac52fd8 100644 --- a/buildroot/package/rabbitmq-c/rabbitmq-c.mk +++ b/buildroot/package/rabbitmq-c/rabbitmq-c.mk @@ -8,6 +8,7 @@ RABBITMQ_C_VERSION = 0.10.0 RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,v$(RABBITMQ_C_VERSION)) RABBITMQ_C_LICENSE = MIT RABBITMQ_C_LICENSE_FILES = LICENSE-MIT +RABBITMQ_C_CPE_ID_VENDOR = rabbitmq-c_project RABBITMQ_C_INSTALL_STAGING = YES RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ diff --git a/buildroot/package/rabbitmq-server/rabbitmq-server.mk b/buildroot/package/rabbitmq-server/rabbitmq-server.mk index 26c2fae5e..c5d3190de 100644 --- a/buildroot/package/rabbitmq-server/rabbitmq-server.mk +++ b/buildroot/package/rabbitmq-server/rabbitmq-server.mk @@ -32,6 +32,8 @@ RABBITMQ_SERVER_LICENSE_FILES = \ LICENSE-MPL-RabbitMQ \ LICENSE-MPL2 \ LICENSE-rabbitmq_aws +RABBITMQ_SERVER_CPE_ID_VENDOR = pivotal_software +RABBITMQ_SERVER_CPE_ID_PRODUCT = rabbitmq RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults diff --git a/buildroot/package/rdesktop/rdesktop.mk b/buildroot/package/rdesktop/rdesktop.mk index 672d85b5c..5a1739a46 100644 --- a/buildroot/package/rdesktop/rdesktop.mk +++ b/buildroot/package/rdesktop/rdesktop.mk @@ -24,6 +24,7 @@ RDESKTOP_DEPENDENCIES = \ RDESKTOP_CONF_OPTS = --disable-credssp RDESKTOP_LICENSE = GPL-3.0+ RDESKTOP_LICENSE_FILES = COPYING +RDESKTOP_CPE_ID_VENDOR = rdesktop ifeq ($(BR2_PACKAGE_PCSC_LITE),y) RDESKTOP_DEPENDENCIES += pcsc-lite diff --git a/buildroot/package/redis/redis.hash b/buildroot/package/redis/redis.hash index b72605013..9b87b49fb 100644 --- a/buildroot/package/redis/redis.hash +++ b/buildroot/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 79bbb894f9dceb33ca699ee3ca4a4e1228be7fb5547aeb2f99d921e86c1285bd redis-6.0.10.tar.gz +sha256 f16ad973d19f80f121e53794d5eb48a997e2c6a85b5be41bb3b66750cc17bf6b redis-6.0.12.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/buildroot/package/redis/redis.mk b/buildroot/package/redis/redis.mk index 96132ae96..c851e589c 100644 --- a/buildroot/package/redis/redis.mk +++ b/buildroot/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 6.0.10 +REDIS_VERSION = 6.0.12 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING diff --git a/buildroot/package/rhash/rhash.mk b/buildroot/package/rhash/rhash.mk index 4438112f3..92abcd29b 100644 --- a/buildroot/package/rhash/rhash.mk +++ b/buildroot/package/rhash/rhash.mk @@ -9,7 +9,7 @@ RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = 0BSD RHASH_LICENSE_FILES = COPYING -RHASH_CPE_ID_VALID = YES +RHASH_CPE_ID_VENDOR = rhash_project RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) diff --git a/buildroot/package/rpcbind/rpcbind.mk b/buildroot/package/rpcbind/rpcbind.mk index cce84cfa8..25916f0b5 100644 --- a/buildroot/package/rpcbind/rpcbind.mk +++ b/buildroot/package/rpcbind/rpcbind.mk @@ -9,6 +9,7 @@ RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIN RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause RPCBIND_LICENSE_FILES = COPYING +RPCBIND_CPE_ID_VENDOR = rpcbind_project RPCBIND_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" diff --git a/buildroot/package/rpm/rpm.mk b/buildroot/package/rpm/rpm.mk index 351ae0994..350a38264 100644 --- a/buildroot/package/rpm/rpm.mk +++ b/buildroot/package/rpm/rpm.mk @@ -19,6 +19,7 @@ RPM_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING +RPM_CPE_ID_VENDOR = rpm # We're patching configure.ac RPM_AUTORECONF = YES diff --git a/buildroot/package/rsync/rsync.mk b/buildroot/package/rsync/rsync.mk index 52875e428..db26ebd93 100644 --- a/buildroot/package/rsync/rsync.mk +++ b/buildroot/package/rsync/rsync.mk @@ -8,6 +8,7 @@ RSYNC_VERSION = 3.1.3 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src RSYNC_LICENSE = GPL-3.0+ RSYNC_LICENSE_FILES = COPYING +RSYNC_CPE_ID_VENDOR = samba RSYNC_DEPENDENCIES = zlib popt RSYNC_CONF_OPTS = \ --with-included-zlib=no \ diff --git a/buildroot/package/rtmpdump/rtmpdump.mk b/buildroot/package/rtmpdump/rtmpdump.mk index bc68b7a83..db79a796d 100644 --- a/buildroot/package/rtmpdump/rtmpdump.mk +++ b/buildroot/package/rtmpdump/rtmpdump.mk @@ -11,6 +11,7 @@ RTMPDUMP_INSTALL_STAGING = YES # care about librtmp, it's LGPL-2.1+ RTMPDUMP_LICENSE = LGPL-2.1+ RTMPDUMP_LICENSE_FILES = librtmp/COPYING +RTMPDUMP_CPE_ID_VENDOR = rtmpdump_project RTMPDUMP_DEPENDENCIES = zlib ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/buildroot/package/ruby/ruby.mk b/buildroot/package/ruby/ruby.mk index 341943c4a..4ab6ea78c 100644 --- a/buildroot/package/ruby/ruby.mk +++ b/buildroot/package/ruby/ruby.mk @@ -19,6 +19,7 @@ HOST_RUBY_CONF_OPTS = \ --without-gmp RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others RUBY_LICENSE_FILES = LEGAL COPYING BSDL +RUBY_CPE_ID_VENDOR = ruby-lang # 0001-fix-default-coroutine-selection.patch RUBY_AUTORECONF = YES diff --git a/buildroot/package/rust-bin/rust-bin.hash b/buildroot/package/rust-bin/rust-bin.hash index cc3ea89b1..46c023e62 100644 --- a/buildroot/package/rust-bin/rust-bin.hash +++ b/buildroot/package/rust-bin/rust-bin.hash @@ -16,6 +16,9 @@ sha256 5bc6c5dfcc9c345c3f7af519df8ac77c2b0938ea32aa7949f589bec2c7cd3a22 rust-s # From https://static.rust-lang.org/dist/rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz.asc sha256 da71ec82973eb6fdf67de25b5a39d9cb4b943ec2c43de570f4785a3a79036430 rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.48.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 d700751756d9b6e7881dd3a5f67bec1b998b3e278a113f4de2125f4281deaf5c rust-std-1.48.0-i586-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz.asc sha256 d4ea5ca6f9c8f9092b50c879f1d9a2620486f08020fa4cac227743a19f6e8cdf rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz diff --git a/buildroot/package/sane-backends/sane-backends.mk b/buildroot/package/sane-backends/sane-backends.mk index 52e03da51..3c93ceaaa 100644 --- a/buildroot/package/sane-backends/sane-backends.mk +++ b/buildroot/package/sane-backends/sane-backends.mk @@ -10,6 +10,7 @@ SANE_BACKENDS_SITE = \ SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPL-2.0+ SANE_BACKENDS_LICENSE_FILES = COPYING +SANE_BACKENDS_CPE_ID_VENDOR = sane-backends_project SANE_BACKENDS_INSTALL_STAGING = YES SANE_BACKENDS_CONF_OPTS = \ diff --git a/buildroot/package/sdl/sdl.mk b/buildroot/package/sdl/sdl.mk index 06564d610..7389cd3ed 100644 --- a/buildroot/package/sdl/sdl.mk +++ b/buildroot/package/sdl/sdl.mk @@ -9,6 +9,8 @@ SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz SDL_SITE = http://www.libsdl.org/release SDL_LICENSE = LGPL-2.1+ SDL_LICENSE_FILES = COPYING +SDL_CPE_ID_VENDOR = libsdl +SDL_CPE_ID_PRODUCT = simple_directmedia_layer SDL_INSTALL_STAGING = YES # we're patching configure.in, but package cannot autoreconf with our version of diff --git a/buildroot/package/sdl2/sdl2.mk b/buildroot/package/sdl2/sdl2.mk index dfe5ec880..48148d38e 100644 --- a/buildroot/package/sdl2/sdl2.mk +++ b/buildroot/package/sdl2/sdl2.mk @@ -10,7 +10,7 @@ SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib SDL2_LICENSE_FILES = COPYING.txt SDL2_CPE_ID_VENDOR = libsdl -SDL2_CPE_ID_PRODUCT = sdl +SDL2_CPE_ID_PRODUCT = simple_directmedia_layer SDL2_INSTALL_STAGING = YES SDL2_CONFIG_SCRIPTS = sdl2-config diff --git a/buildroot/package/sdl2_image/sdl2_image.mk b/buildroot/package/sdl2_image/sdl2_image.mk index 68572b3f9..13de7b126 100644 --- a/buildroot/package/sdl2_image/sdl2_image.mk +++ b/buildroot/package/sdl2_image/sdl2_image.mk @@ -10,6 +10,8 @@ SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release SDL2_IMAGE_INSTALL_STAGING = YES SDL2_IMAGE_LICENSE = Zlib SDL2_IMAGE_LICENSE_FILES = COPYING.txt +SDL2_IMAGE_CPE_ID_VENDOR = libsdl +SDL2_IMAGE_CPE_ID_PRODUCT = sdl_image # Unconditionally enable support for image formats that don't require # any dependency. diff --git a/buildroot/package/sdl_image/sdl_image.mk b/buildroot/package/sdl_image/sdl_image.mk index 95a03a395..9ff9206b7 100644 --- a/buildroot/package/sdl_image/sdl_image.mk +++ b/buildroot/package/sdl_image/sdl_image.mk @@ -10,6 +10,7 @@ SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release SDL_IMAGE_INSTALL_STAGING = YES SDL_IMAGE_LICENSE = Zlib SDL_IMAGE_LICENSE_FILES = COPYING +SDL_IMAGE_CPE_ID_VENDOR = libsdl SDL_IMAGE_CONF_OPTS = \ --with-sdl-prefix=$(STAGING_DIR)/usr \ diff --git a/buildroot/package/softether/Config.in b/buildroot/package/softether/Config.in index bfb45b031..01104b5d3 100644 --- a/buildroot/package/softether/Config.in +++ b/buildroot/package/softether/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SOFTETHER depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL @@ -27,4 +28,5 @@ config BR2_PACKAGE_SOFTETHER comment "softether needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch b/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch new file mode 100644 index 000000000..2fbb8ff8a --- /dev/null +++ b/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch @@ -0,0 +1,48 @@ +From d591a38d934b2a6750f16c7bd46a9ad12233301c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 3 Mar 2021 16:48:57 +0100 +Subject: [PATCH] configure.ac: fix static linking with magic + +Put back -lz (i.e. ZLIB_LIBS) when searching for magic which was +wrongly removed by commit 6ff0e9322f9891f5a6ac6c9b3bceffbfca16bec3. This +will fix the following static build failure: + +configure:11677: checking for magic_open in -lmagic +configure:11702: /srv/storage/autobuild/run/instance-0/output-1/host/bin/arm-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -Wall -Wmissing-prototypes -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--as-needed conftest.c -lmagic >&5 +conftest.c:53:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] + 53 | char magic_open (); + | ^~~~ +conftest.c:55:1: warning: function declaration isn't a prototype [-Wstrict-prototypes] + 55 | main () + | ^~~~ +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /srv/storage/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompresszlib': +compress.c:(.text+0x1d0): undefined reference to `inflateInit_' +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x1e4): undefined reference to `inflate' +/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x1fc): undefined reference to `inflateEnd' + +Fixes: + - http://autobuild.buildroot.org/results/d96f27cd96926060046e2e1115777f5bceda3741 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet (waiting for feedback on third patch)] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 896714f5..ca7bccaa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -80,8 +80,8 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA]) + + dnl Various libraries + +-SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open]) + SOX_CHECK_LIB([ZLIB], [zlib.h], [z], [uncompress]) ++SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open], [], [], [], [$ZLIB_LIBS]) + SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS]) + SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open], [], [], [], [$ZLIB_LIBS]) + SOX_WITH_LIB([libgsm], [gsm/gsm.h gsm.h], [gsm], [gsm_create]) +-- +2.30.0 + diff --git a/buildroot/package/spice/spice.mk b/buildroot/package/spice/spice.mk index db05bd67f..b515431cf 100644 --- a/buildroot/package/spice/spice.mk +++ b/buildroot/package/spice/spice.mk @@ -9,7 +9,7 @@ SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ SPICE_LICENSE_FILES = COPYING -SPICE_CPE_ID_VALID = YES +SPICE_CPE_ID_VENDOR = spice_project SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ diff --git a/buildroot/package/squashfs/squashfs.mk b/buildroot/package/squashfs/squashfs.mk index 026c0a46c..cbc3c906d 100644 --- a/buildroot/package/squashfs/squashfs.mk +++ b/buildroot/package/squashfs/squashfs.mk @@ -8,7 +8,7 @@ SQUASHFS_VERSION = 4.4 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING -SQUASHFS_CPE_ID_VALID = YES +SQUASHFS_CPE_ID_VENDOR = squashfs_project SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) diff --git a/buildroot/package/strace/strace.mk b/buildroot/package/strace/strace.mk index 646be41e5..0ae622ec5 100644 --- a/buildroot/package/strace/strace.mk +++ b/buildroot/package/strace/strace.mk @@ -9,7 +9,7 @@ STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later -STRACE_CPE_ID_VALID = YES +STRACE_CPE_ID_VENDOR = strace_project STRACE_CONF_OPTS = --enable-mpers=no ifeq ($(BR2_PACKAGE_LIBUNWIND),y) diff --git a/buildroot/package/stunnel/stunnel.mk b/buildroot/package/stunnel/stunnel.mk index e0cc5630e..51cb4a4db 100644 --- a/buildroot/package/stunnel/stunnel.mk +++ b/buildroot/package/stunnel/stunnel.mk @@ -15,6 +15,7 @@ STUNNEL_CONF_ENV = \ LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` STUNNEL_LICENSE = GPL-2.0+ STUNNEL_LICENSE_FILES = COPYING.md COPYRIGHT.md +STUNNEL_CPE_ID_VENDOR = stunnel ifeq ($(BR2_INIT_SYSTEMD),y) STUNNEL_DEPENDENCIES += systemd diff --git a/buildroot/package/sudo/sudo.mk b/buildroot/package/sudo/sudo.mk index 7f57c66b7..57c229250 100644 --- a/buildroot/package/sudo/sudo.mk +++ b/buildroot/package/sudo/sudo.mk @@ -4,13 +4,14 @@ # ################################################################################ -SUDO_VERSION = $(SUDO_CPE_ID_VERSION)$(SUDO_CPE_ID_UPDATE) +SUDO_VERSION_MAJOR = 1.9.5 +SUDO_VERSION_MINOR = p2 +SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause SUDO_LICENSE_FILES = doc/LICENSE -SUDO_CPE_ID_VALID = YES -SUDO_CPE_ID_VERSION = 1.9.5 -SUDO_CPE_ID_UPDATE = p2 +SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) +SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ diff --git a/buildroot/package/suricata/suricata.hash b/buildroot/package/suricata/suricata.hash index 7435c1b96..839517781 100644 --- a/buildroot/package/suricata/suricata.hash +++ b/buildroot/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 e7a1798fe59c1d213f752feefbf8bb54168f9fa56235cf3380347c696ecdb1ae suricata-6.0.1.tar.gz +sha256 5e4647a07cb31b5d6d0049972a45375c137de908a964a44e2d6d231fa3ad4b52 suricata-6.0.2.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/suricata/suricata.mk b/buildroot/package/suricata/suricata.mk index a8970fe9a..ab8f27c31 100644 --- a/buildroot/package/suricata/suricata.mk +++ b/buildroot/package/suricata/suricata.mk @@ -4,7 +4,7 @@ # ################################################################################ -SURICATA_VERSION = 6.0.1 +SURICATA_VERSION = 6.0.2 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE diff --git a/buildroot/package/sysklogd/sysklogd.mk b/buildroot/package/sysklogd/sysklogd.mk index ff181372b..ea7b869d7 100644 --- a/buildroot/package/sysklogd/sysklogd.mk +++ b/buildroot/package/sysklogd/sysklogd.mk @@ -8,7 +8,7 @@ SYSKLOGD_VERSION = 2.2.1 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE -SYSKLOGD_CPE_ID_VALID = YES +SYSKLOGD_CPE_ID_VENDOR = sysklogd_project # Busybox install logger in /usr/bin, and syslogd in /sbin, so install in # the same locations so that busybox does not install its applets in there. diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index 64f23c38a..41332f207 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -8,6 +8,7 @@ SYSTEMD_VERSION = 247.3 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE +SYSTEMD_CPE_ID_VENDOR = freedesktop SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ diff --git a/buildroot/package/tiff/tiff.mk b/buildroot/package/tiff/tiff.mk index 7568215f9..c3d804514 100644 --- a/buildroot/package/tiff/tiff.mk +++ b/buildroot/package/tiff/tiff.mk @@ -8,6 +8,8 @@ TIFF_VERSION = 4.2.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT +TIFF_CPE_ID_VENDOR = libtiff +TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ --disable-cxx \ diff --git a/buildroot/package/tmux/tmux.mk b/buildroot/package/tmux/tmux.mk index 17570520c..281b7d8ee 100644 --- a/buildroot/package/tmux/tmux.mk +++ b/buildroot/package/tmux/tmux.mk @@ -8,7 +8,7 @@ TMUX_VERSION = 3.1c TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING -TMUX_CPE_ID_VALID = YES +TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear diff --git a/buildroot/package/tpm2-abrmd/Config.in b/buildroot/package/tpm2-abrmd/Config.in index 4931641af..0c60db809 100644 --- a/buildroot/package/tpm2-abrmd/Config.in +++ b/buildroot/package/tpm2-abrmd/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_TPM2_ABRMD depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_TPM2_TSS @@ -22,5 +23,6 @@ config BR2_PACKAGE_TPM2_ABRMD comment "tpm2-abrmd needs a toolchain w/ dynamic library, wchar, threads" depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/buildroot/package/tpm2-pkcs11/Config.in b/buildroot/package/tpm2-pkcs11/Config.in index 46d5cab07..ec82d72ae 100644 --- a/buildroot/package/tpm2-pkcs11/Config.in +++ b/buildroot/package/tpm2-pkcs11/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_TPM2_PKCS11 bool "tpm2-pkcs11" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBYAML select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_SQLITE @@ -10,5 +12,6 @@ config BR2_PACKAGE_TPM2_PKCS11 https://github.com/tpm2-software/tpm2-pkcs11 -comment "tpm2-pkcs11 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "tpm2-pkcs11 needs a toolchain w/ dynamic library, threads" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/tpm2-tools/Config.in b/buildroot/package/tpm2-tools/Config.in index 35ca63bf6..642bd9e46 100644 --- a/buildroot/package/tpm2-tools/Config.in +++ b/buildroot/package/tpm2-tools/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TPM2_TOOLS bool "tpm2-tools" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_OPENSSL @@ -19,4 +20,5 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools comment "tpm2-tools needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS diff --git a/buildroot/package/tpm2-totp/Config.in b/buildroot/package/tpm2-totp/Config.in index dcadf5a5f..7f274fa13 100644 --- a/buildroot/package/tpm2-totp/Config.in +++ b/buildroot/package/tpm2-totp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TPM2_TOTP bool "tpm2-totp" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss depends on !BR2_STATIC_LIBS # tpm2-tss depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.20 select BR2_PACKAGE_LIBQRENCODE @@ -19,5 +20,6 @@ config BR2_PACKAGE_TPM2_TOTP https://github.com/tpm2-software/tpm2-totp comment "tpm2-totp needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/buildroot/package/tpm2-tss/Config.in b/buildroot/package/tpm2-tss/Config.in index 2fc56dbd7..b1ab00dd3 100644 --- a/buildroot/package/tpm2-tss/Config.in +++ b/buildroot/package/tpm2-tss/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TPM2_TSS bool "tpm2-tss" depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_LIBURIPARSER select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL @@ -55,4 +56,5 @@ config BR2_PACKAGE_TPM2_TSS_FAPI endif comment "tpm2-tss needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS diff --git a/buildroot/package/transmission/transmission.mk b/buildroot/package/transmission/transmission.mk index ff3b41c32..1660d2c2b 100644 --- a/buildroot/package/transmission/transmission.mk +++ b/buildroot/package/transmission/transmission.mk @@ -20,6 +20,7 @@ TRANSMISSION_CONF_OPTS = \ --enable-lightweight TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception TRANSMISSION_LICENSE_FILES = COPYING +TRANSMISSION_CPE_ID_VENDOR = transmissionbt ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) TRANSMISSION_DEPENDENCIES += libminiupnpc diff --git a/buildroot/package/uclibc-ng-test/0001-add-nios2-tls-macros-from-glibc.patch b/buildroot/package/uclibc-ng-test/0001-add-nios2-tls-macros-from-glibc.patch deleted file mode 100644 index 574d10c1b..000000000 --- a/buildroot/package/uclibc-ng-test/0001-add-nios2-tls-macros-from-glibc.patch +++ /dev/null @@ -1,84 +0,0 @@ -From bf6fcd59d1ff51584a703b1d78c9e8fd4f808917 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 28 Nov 2020 11:44:00 +0100 -Subject: [PATCH] add nios2 tls macros from glibc - -Retrieved from -https://github.com/bminor/glibc/blob/master/sysdeps/nios2/tls-macros.h - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/wbx-github/uclibc-ng-test/commit/bf6fcd59d1ff51584a703b1d78c9e8fd4f808917] ---- - test/tls/tls-macros-nios2.h | 46 +++++++++++++++++++++++++++++++++++++ - test/tls/tls-macros.h | 4 ++++ - 2 files changed, 50 insertions(+) - create mode 100644 test/tls/tls-macros-nios2.h - -diff --git a/test/tls/tls-macros-nios2.h b/test/tls/tls-macros-nios2.h -new file mode 100644 -index 0000000..7029530 ---- /dev/null -+++ b/test/tls/tls-macros-nios2.h -@@ -0,0 +1,46 @@ -+#define TLS_LE(x) \ -+ ({ int *__result; \ -+ asm ("addi %0, r23, %%tls_le(" #x ")" \ -+ : "=r" (__result)); \ -+ __result; }) -+ -+#define TLS_IE(x) \ -+ ({ int *__result; \ -+ int __tmp; \ -+ asm ("nextpc %0 ; " \ -+ "1: movhi %1, %%hiadj(_gp_got - 1b) ; " \ -+ "addi %1, %1, %%lo(_gp_got - 1b) ; " \ -+ "add %0, %0, %1 ; " \ -+ "ldw %1, %%tls_ie(" #x ")(%0) ; " \ -+ "add %1, r23, %1" \ -+ : "=&r" (__tmp), "=&r" (__result)); \ -+ __result; }) -+ -+#define TLS_LD(x) \ -+ ({ char *__result; \ -+ char *__result2; \ -+ int *__result3; \ -+ int __tmp; \ -+ extern void *__tls_get_addr (void *); \ -+ asm ("nextpc %0 ; " \ -+ "1: movhi %1, %%hiadj(_gp_got - 1b) ; " \ -+ "addi %1, %1, %%lo(_gp_got - 1b) ; " \ -+ "add %0, %0, %1 ; " \ -+ "addi %0, %0, %%tls_ldm(" #x ")" \ -+ : "=r" (__result), "=r" (__tmp)); \ -+ __result2 = (char *)__tls_get_addr (__result); \ -+ asm ("addi %0, %1, %%tls_ldo(" #x ")" \ -+ : "=r" (__result3) : "r" (__result2)); \ -+ __result3; }) -+ -+#define TLS_GD(x) \ -+ ({ int *__result; \ -+ int __tmp; \ -+ extern void *__tls_get_addr (void *); \ -+ asm ("nextpc %0 ; " \ -+ "1: movhi %1, %%hiadj(_gp_got - 1b) ; " \ -+ "addi %1, %1, %%lo(_gp_got - 1b) ; " \ -+ "add %0, %0, %1 ; " \ -+ "addi %0, %0, %%tls_gd(" #x ")" \ -+ : "=r" (__result), "=r" (__tmp)); \ -+ (int *)__tls_get_addr (__result); }) -diff --git a/test/tls/tls-macros.h b/test/tls/tls-macros.h -index 4a4e916..087b365 100644 ---- a/test/tls/tls-macros.h -+++ b/test/tls/tls-macros.h -@@ -64,6 +64,10 @@ - #include - #endif - -+#ifdef __nios2__ -+#include -+#endif -+ - #if defined(__powerpc__) && !defined(__powerpc64__) - #include - #endif diff --git a/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash b/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash index 796f1dbce..37660b04c 100644 --- a/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash +++ b/buildroot/package/uclibc-ng-test/uclibc-ng-test.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ece0cb910ce649601e4dec42572c2871c3c58cff1be5c94e8e91816dce5793ba uclibc-ng-test-c64d6ac77f0e745c70e76024212c72e4bbe2091a-br1.tar.gz +sha256 f731307c0547ce4bbd3f5025972f64e9b22208a147e34e5745000b54d4d3aa98 uclibc-ng-test-0844445e7358eb10e716155b55b0fb23e88d644a-br1.tar.gz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk b/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk index 9f866f5d7..ea5f22421 100644 --- a/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_NG_TEST_VERSION = c64d6ac77f0e745c70e76024212c72e4bbe2091a +UCLIBC_NG_TEST_VERSION = 0844445e7358eb10e716155b55b0fb23e88d644a UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test UCLIBC_NG_TEST_LICENSE = LGPL-2.1+ UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB diff --git a/buildroot/package/unzip/unzip.mk b/buildroot/package/unzip/unzip.mk index 2997d33a2..e8c9366a1 100644 --- a/buildroot/package/unzip/unzip.mk +++ b/buildroot/package/unzip/unzip.mk @@ -10,7 +10,7 @@ UNZIP_PATCH = unzip_$(UNZIP_VERSION)-26.debian.tar.xz UNZIP_SITE = https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE -UNZIP_CPE_ID_VALID = YES +UNZIP_CPE_ID_VENDOR = unzip_project # unzip_$(UNZIP_VERSION)-26.debian.tar.xz has patches to fix: UNZIP_IGNORE_CVES = \ diff --git a/buildroot/package/upx/upx.mk b/buildroot/package/upx/upx.mk index 2449fa643..bdf5dd4c0 100644 --- a/buildroot/package/upx/upx.mk +++ b/buildroot/package/upx/upx.mk @@ -9,7 +9,7 @@ UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING -UPX_CPE_ID_VALID = YES +UPX_CPE_ID_VENDOR = upx_project HOST_UPX_DEPENDENCIES = host-ucl host-zlib diff --git a/buildroot/package/ushare/ushare.hash b/buildroot/package/ushare/ushare.hash index 4d009dd99..013b24795 100644 --- a/buildroot/package/ushare/ushare.hash +++ b/buildroot/package/ushare/ushare.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 3bfc2eecdbbbf3c1778f70e8e8a8fc4638fbf52081c4b047a59204f079a4a580 ushare-2.0.tar.gz +sha256 e4563141a171138900540cc979f205cf666e820f709d47a98521bc77f53a99e6 ushare-2.1.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/buildroot/package/ushare/ushare.mk b/buildroot/package/ushare/ushare.mk index 59dddb4bf..a4c971160 100644 --- a/buildroot/package/ushare/ushare.mk +++ b/buildroot/package/ushare/ushare.mk @@ -4,7 +4,7 @@ # ################################################################################ -USHARE_VERSION = 2.0 +USHARE_VERSION = 2.1 USHARE_SITE = $(call github,ddugovic,uShare,v$(USHARE_VERSION)) USHARE_DEPENDENCIES = host-pkgconf libupnp $(TARGET_NLS_DEPENDENCIES) USHARE_LICENSE = GPL-2.0+ diff --git a/buildroot/package/util-linux/util-linux.mk b/buildroot/package/util-linux/util-linux.mk index 0178c52ba..09acaca1a 100644 --- a/buildroot/package/util-linux/util-linux.mk +++ b/buildroot/package/util-linux/util-linux.mk @@ -211,6 +211,7 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --disable-nsenter \ --disable-pg \ --disable-rfkill \ + --disable-runuser \ --disable-schedutils \ --disable-setpriv \ --disable-setterm \ diff --git a/buildroot/package/valijson/valijson.mk b/buildroot/package/valijson/valijson.mk index 29e6342a6..e425757d2 100644 --- a/buildroot/package/valijson/valijson.mk +++ b/buildroot/package/valijson/valijson.mk @@ -8,7 +8,7 @@ VALIJSON_VERSION = 0.3 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE -VALIJSON_CPE_ID_VALID = YES +VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO VALIJSON_DEPENDENCIES = boost diff --git a/buildroot/package/vsftpd/vsftpd.mk b/buildroot/package/vsftpd/vsftpd.mk index 2804a3a39..49b9b1917 100644 --- a/buildroot/package/vsftpd/vsftpd.mk +++ b/buildroot/package/vsftpd/vsftpd.mk @@ -9,7 +9,7 @@ VSFTPD_SITE = https://security.appspot.com/downloads VSFTPD_LIBS = -lcrypt VSFTPD_LICENSE = GPL-2.0 VSFTPD_LICENSE_FILES = COPYING -VSFTPD_CPE_ID_VALID = YES +VSFTPD_CPE_ID_VENDOR = vsftpd_project define VSFTPD_DISABLE_UTMPX $(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h diff --git a/buildroot/package/wolfssl/wolfssl.hash b/buildroot/package/wolfssl/wolfssl.hash index f5a25fe98..05fee25b6 100644 --- a/buildroot/package/wolfssl/wolfssl.hash +++ b/buildroot/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 053aefbb02d0b06b27c5e2df6875b4b587318755b7db9d6aa8d72206b310a848 wolfssl-4.6.0-stable.tar.gz +sha256 b0e740b31d4d877d540ad50cc539a8873fc41af02bd3091c4357b403f7106e31 wolfssl-4.7.0-stable.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/wolfssl/wolfssl.mk b/buildroot/package/wolfssl/wolfssl.mk index d66a1c280..fe21ddcd4 100644 --- a/buildroot/package/wolfssl/wolfssl.mk +++ b/buildroot/package/wolfssl/wolfssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFSSL_VERSION = 4.6.0-stable +WOLFSSL_VERSION = 4.7.0-stable WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) WOLFSSL_INSTALL_STAGING = YES diff --git a/buildroot/package/wpa_supplicant/Config.in b/buildroot/package/wpa_supplicant/Config.in index cba7fa07e..c6e4de1d4 100644 --- a/buildroot/package/wpa_supplicant/Config.in +++ b/buildroot/package/wpa_supplicant/Config.in @@ -49,6 +49,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING bool "Enable mesh networking" depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help @@ -83,6 +84,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WPS config BR2_PACKAGE_WPA_SUPPLICANT_WPA3 bool "Enable WPA3 support" + depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.hash b/buildroot/package/wpa_supplicant/wpa_supplicant.hash index cce465d84..2387391a3 100644 --- a/buildroot/package/wpa_supplicant/wpa_supplicant.hash +++ b/buildroot/package/wpa_supplicant/wpa_supplicant.hash @@ -2,3 +2,4 @@ sha256 fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 wpa_supplicant-2.9.tar.gz sha256 9da5dd0776da266b180b915e460ff75c6ff729aca1196ab396529510f24f3761 README sha256 c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch +sha256 7f40cfec5faf5e927ea9028ab9392cd118685bde7229ad24210caf0a8f6e9611 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.mk b/buildroot/package/wpa_supplicant/wpa_supplicant.mk index 940a82174..284ea0609 100644 --- a/buildroot/package/wpa_supplicant/wpa_supplicant.mk +++ b/buildroot/package/wpa_supplicant/wpa_supplicant.mk @@ -7,7 +7,8 @@ WPA_SUPPLICANT_VERSION = 2.9 WPA_SUPPLICANT_SITE = http://w1.fi/releases WPA_SUPPLICANT_PATCH = \ - https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch + https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch \ + https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch WPA_SUPPLICANT_LICENSE = BSD-3-Clause WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi diff --git a/buildroot/package/x11vnc/x11vnc.mk b/buildroot/package/x11vnc/x11vnc.mk index aa0f14c45..1eda717c6 100644 --- a/buildroot/package/x11vnc/x11vnc.mk +++ b/buildroot/package/x11vnc/x11vnc.mk @@ -12,7 +12,7 @@ X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING -X11VNC_CPE_ID_VALID = YES +X11VNC_CPE_ID_VENDOR = x11vnc_project # 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch X11VNC_IGNORE_CVES += CVE-2020-29074 diff --git a/buildroot/package/xscreensaver/xscreensaver.mk b/buildroot/package/xscreensaver/xscreensaver.mk index cb1e440ea..c3c9ec89c 100644 --- a/buildroot/package/xscreensaver/xscreensaver.mk +++ b/buildroot/package/xscreensaver/xscreensaver.mk @@ -10,7 +10,7 @@ XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h -XSCREENSAVER_CPE_ID_VALID = YES +XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ diff --git a/buildroot/package/yaml-cpp/yaml-cpp.mk b/buildroot/package/yaml-cpp/yaml-cpp.mk index d95380e62..895072ec4 100644 --- a/buildroot/package/yaml-cpp/yaml-cpp.mk +++ b/buildroot/package/yaml-cpp/yaml-cpp.mk @@ -9,7 +9,7 @@ YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT YAML_CPP_LICENSE_FILES = LICENSE -YAML_CPP_CPE_ID_VALID = YES +YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ diff --git a/buildroot/package/zziplib/zziplib.mk b/buildroot/package/zziplib/zziplib.mk index 6cb9dedce..6b7b64cac 100644 --- a/buildroot/package/zziplib/zziplib.mk +++ b/buildroot/package/zziplib/zziplib.mk @@ -8,7 +8,7 @@ ZZIPLIB_VERSION = 0.13.72 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm -ZZIPLIB_CPE_ID_VALID = YES +ZZIPLIB_CPE_ID_VENDOR = zziplib_project ZZIPLIB_INSTALL_STAGING = YES ZZIPLIB_CONF_OPTS += \ -DZZIPDOCS=OFF \ diff --git a/buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config b/buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config index 797528745..c44525b20 100644 --- a/buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config +++ b/buildroot/support/config-fragments/autobuild/bootlin-xtensa-uclibc.config @@ -1,3 +1,5 @@ BR2_xtensa=y +BR2_XTENSA_CUSTOM=y +BR2_XTENSA_LITTLE_ENDIAN=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE=y diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index 28a74b992..685d8e3b7 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2020.11.3' +RELEASE='2021.02' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/scripts/gen-bootlin-toolchains b/buildroot/support/scripts/gen-bootlin-toolchains index fc9d57f5a..902b7795e 100755 --- a/buildroot/support/scripts/gen-bootlin-toolchains +++ b/buildroot/support/scripts/gen-bootlin-toolchains @@ -210,7 +210,7 @@ arches = { 'prefix': 'i686', }, 'xtensa-lx60': { - 'conditions': ['BR2_xtensa', 'BR2_xtensa_fsf'], + 'conditions': ['BR2_xtensa', 'BR2_XTENSA_CUSTOM', 'BR2_XTENSA_LITTLE_ENDIAN'], 'prefix': 'xtensa', }, } diff --git a/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk index 5added78d..7f539ad58 100644 --- a/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk +++ b/buildroot/support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk @@ -1,5 +1,5 @@ CPE_ID_PKG3_VERSION = 67 -CPE_ID_PKG3_CPE_ID_VALID = YES +CPE_ID_PKG3_CPE_ID_VENDOR = cpe-id-pkg3_project $(eval $(generic-package)) $(eval $(host-generic-package)) diff --git a/buildroot/support/testing/tests/core/test_cpeid.py b/buildroot/support/testing/tests/core/test_cpeid.py index 190f0306e..11c847215 100644 --- a/buildroot/support/testing/tests/core/test_cpeid.py +++ b/buildroot/support/testing/tests/core/test_cpeid.py @@ -47,7 +47,7 @@ class CpeIdTest(infra.basetest.BRConfigTest): self.assertNotIn("cpe-id", pkg_json['host-cpe-id-pkg2']) def test_pkg3(self): - # this package has just _CPE_ID_VALID defined, so verify + # this package has just _CPE_ID_VENDOR defined, so verify # it has the default CPE_ID value, and that inheritance of the # values for the host package is working pkg_vars = self.get_vars("CPE_ID_PKG3_CPE_ID") diff --git a/buildroot/support/testing/tests/toolchain/test_external_bootlin.py b/buildroot/support/testing/tests/toolchain/test_external_bootlin.py index 2edbfb320..af60c21f7 100644 --- a/buildroot/support/testing/tests/toolchain/test_external_bootlin.py +++ b/buildroot/support/testing/tests/toolchain/test_external_bootlin.py @@ -2567,7 +2567,8 @@ class TestExternalToolchainBootlinX86i686UclibcStable(TestExternalToolchain): class TestExternalToolchainBootlinXtensalx60UclibcBleedingEdge(TestExternalToolchain): config = """ BR2_xtensa=y - BR2_xtensa_fsf=y + BR2_XTENSA_CUSTOM=y + BR2_XTENSA_LITTLE_ENDIAN=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE=y @@ -2582,7 +2583,8 @@ class TestExternalToolchainBootlinXtensalx60UclibcBleedingEdge(TestExternalToolc class TestExternalToolchainBootlinXtensalx60UclibcStable(TestExternalToolchain): config = """ BR2_xtensa=y - BR2_xtensa_fsf=y + BR2_XTENSA_CUSTOM=y + BR2_XTENSA_LITTLE_ENDIAN=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE=y diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index 553612c4a..fdc0f9ba5 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -166,6 +166,13 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 bool default y if BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 +# Error: branch offset out of range on Nios II. This bug +# no longer exists in gcc >= 8.x. +config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 + bool + default y if BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool diff --git a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index d47360ad8..61ead9b82 100644 --- a/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/buildroot/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -40,7 +40,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 - default y if BR2_xtensa && BR2_xtensa_fsf + default y if BR2_xtensa && BR2_XTENSA_CUSTOM && BR2_XTENSA_LITTLE_ENDIAN if BR2_TOOLCHAIN_EXTERNAL_BOOTLIN @@ -4252,7 +4252,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE bool "xtensa-lx60 uclibc bleeding-edge 2020.08-1" depends on BR2_xtensa - depends on BR2_xtensa_fsf + depends on BR2_XTENSA_CUSTOM + depends on BR2_XTENSA_LITTLE_ENDIAN select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR @@ -4276,7 +4277,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE bool "xtensa-lx60 uclibc stable 2020.08-1" depends on BR2_xtensa - depends on BR2_xtensa_fsf + depends on BR2_XTENSA_CUSTOM + depends on BR2_XTENSA_LITTLE_ENDIAN select BR2_TOOLCHAIN_GCC_AT_LEAST_9 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR