From 289e6a5685172bd1bb61913e4ad9aa02379998ad Mon Sep 17 00:00:00 2001 From: NADAL Jean-Baptiste Date: Fri, 23 Feb 2018 23:37:40 +0100 Subject: [PATCH] Update buildroot to 17.02.10 --- bsp/buildroot/CHANGES | 30 +++++ bsp/buildroot/DEVELOPERS | 1 + bsp/buildroot/Makefile | 4 +- bsp/buildroot/VERSION | 2 +- bsp/buildroot/docs/manual/manual.html | 18 +-- bsp/buildroot/docs/manual/manual.pdf | Bin 499448 -> 499442 bytes bsp/buildroot/docs/manual/manual.text | 4 +- bsp/buildroot/package/Makefile.in | 2 +- .../package/avahi/avahi_tmpfiles.conf | 2 +- .../berkeleydb/0001-cwd-db_config.patch | 21 +++ .../package/berkeleydb/berkeleydb.hash | 1 + bsp/buildroot/package/bind/bind.hash | 4 +- bsp/buildroot/package/bind/bind.mk | 2 +- bsp/buildroot/package/busybox/busybox.mk | 2 +- bsp/buildroot/package/ccache/ccache.hash | 5 +- bsp/buildroot/package/ccache/ccache.mk | 4 +- ...libc.patch => 0002-backtrace-uClibc.patch} | 0 bsp/buildroot/package/clamav/Config.in | 1 + bsp/buildroot/package/clamav/clamav.hash | 14 +- bsp/buildroot/package/clamav/clamav.mk | 12 +- bsp/buildroot/package/coreutils/coreutils.mk | 4 +- .../0001-byteorder.h-fix-uclibc-build.patch | 32 +++++ ...ory-leak-in-auth_client_request_abor.patch | 33 +++++ bsp/buildroot/package/dovecot/dovecot.hash | 5 +- bsp/buildroot/package/dovecot/dovecot.mk | 2 +- bsp/buildroot/package/eeprog/Config.in | 2 +- bsp/buildroot/package/eudev/S10udev | 4 +- bsp/buildroot/package/fis/fis.mk | 2 +- .../intel-microcode/intel-microcode.hash | 3 +- .../intel-microcode/intel-microcode.mk | 4 +- bsp/buildroot/package/iputils/iputils.mk | 5 + bsp/buildroot/package/irssi/irssi.hash | 2 +- bsp/buildroot/package/irssi/irssi.mk | 2 +- bsp/buildroot/package/kmsxx/kmsxx.mk | 5 +- bsp/buildroot/package/libcurl/libcurl.hash | 6 +- bsp/buildroot/package/libcurl/libcurl.mk | 2 +- .../package/liberation/liberation.mk | 2 +- bsp/buildroot/package/libiio/libiio.mk | 4 +- .../package/linux-headers/Config.in.host | 8 +- bsp/buildroot/package/lz4/lz4.mk | 12 +- bsp/buildroot/package/mariadb/mariadb.hash | 4 +- bsp/buildroot/package/mariadb/mariadb.mk | 2 +- .../matchbox-fakekey/matchbox-fakekey.mk | 4 +- bsp/buildroot/package/matchbox-lib/Config.in | 1 + .../package/matchbox-lib/matchbox-lib.mk | 7 +- ...event-some-forms-of-Cross-Protocol-S.patch | 50 +++++++ ... 0008-Call-apxs-with-correct-prefix.patch} | 0 ...onstraints-in-aarch64-multiply-macro.patch | 28 ---- bsp/buildroot/package/php/php.hash | 2 +- bsp/buildroot/package/php/php.mk | 2 +- .../pound/0001-fix-openssl-1.0.2.patch | 127 ++++++++++++++++++ ...it_com-Stop-freeing-a-static-pointer.patch | 98 ++++++++++++++ ...dump-Fixed-typo-in-memory-leak-patch.patch | 31 +++++ ...e-endofName-never-exceeds-tagEnd-130.patch | 35 +++++ ...logging-for-transactions-without-a-c.patch | 31 +++++ bsp/buildroot/package/squid/squid.hash | 8 +- bsp/buildroot/package/squid/squid.mk | 2 +- bsp/buildroot/package/tar/tar.mk | 3 + .../package/ti-cgt-pru/ti-cgt-pru.hash | 4 +- .../package/ti-cgt-pru/ti-cgt-pru.mk | 8 +- .../package/transmission/transmission.hash | 3 +- .../package/transmission/transmission.mk | 2 +- .../package/util-linux/util-linux.mk | 33 ++++- bsp/buildroot/package/webkitgtk/Config.in | 1 + .../package/webkitgtk/webkitgtk.hash | 8 +- bsp/buildroot/package/webkitgtk/webkitgtk.mk | 4 +- .../package/wireshark/wireshark.hash | 6 +- bsp/buildroot/package/wireshark/wireshark.mk | 2 +- bsp/buildroot/package/x11r7/mcookie/mcookie.c | 4 +- bsp/buildroot/package/xen/xen.mk | 1 + bsp/buildroot/support/kconfig/Makefile | 3 +- ...-nconfig-fix-multi-byte-UTF-handling.patch | 45 +++++++ bsp/buildroot/support/kconfig/patches/series | 1 + bsp/buildroot/system/Config.in | 4 + 74 files changed, 712 insertions(+), 120 deletions(-) create mode 100644 bsp/buildroot/package/berkeleydb/0001-cwd-db_config.patch rename bsp/buildroot/package/clamav/{0003-backtrace-uClibc.patch => 0002-backtrace-uClibc.patch} (100%) create mode 100644 bsp/buildroot/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch create mode 100644 bsp/buildroot/package/dovecot/0002-lib-auth-Fix-memory-leak-in-auth_client_request_abor.patch create mode 100644 bsp/buildroot/package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch rename bsp/buildroot/package/php/{0009-Call-apxs-with-correct-prefix.patch => 0008-Call-apxs-with-correct-prefix.patch} (100%) delete mode 100644 bsp/buildroot/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch create mode 100644 bsp/buildroot/package/pound/0001-fix-openssl-1.0.2.patch create mode 100644 bsp/buildroot/package/rpcbind/0005-rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch create mode 100644 bsp/buildroot/package/rpcbind/0006-pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch create mode 100644 bsp/buildroot/package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch create mode 100644 bsp/buildroot/package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch create mode 100644 bsp/buildroot/support/kconfig/patches/18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch diff --git a/bsp/buildroot/CHANGES b/bsp/buildroot/CHANGES index a632a936..d006d936 100644 --- a/bsp/buildroot/CHANGES +++ b/bsp/buildroot/CHANGES @@ -1,3 +1,33 @@ +2017.02.10, Released January 31st, 2018 + + Important / security related fixes. + + nconfig: Fix for ncurses/ncursesw linking issue causing crashes. + + System: Only show getty options when busybox init or sysvinit + are used. + + Infrastructure: Fix build issue for autotools based packages + checking for C++ support on toolchains without C++ support and + on a distro lacking /lib/cpp (E.G. Arch Linux). + + Updated/fixed packages: avahi, berkeleydb, bind, busybox, + ccache, clamav, coreutils, dovecot, eeprog, eudev, fis, + intel-microcode, iputils, irssi, kmsxx, liberation, libiio, + lz4, mariadb, matchbox-lib, mcookie, openocd, php, pound, + rpcbind, squid, tar, ti-cgt-pru, transmission, util-linux, + webkitgtk, wireshark, xen + + Issues resolved (http://bugs.buildroot.org): + + #9996: lz4 package does not install lz4 binaries in target + #10176: Rsyslog's S01logging is deleted by Busybox.mk from... + #10216: package/x11r7/mcookie/mcookie.c:207: bad size ? + #10301: systemd/getty unused options + #10331: kmsxx, host installation fails with BR2_SHARED_... + #10536: Finding non-relative paths in the ccache + #10641: avahi-autoipd not starting when using systemd-tmpfiles + 2017.02.9, Released January 1st, 2018 Important / security related fixes. diff --git a/bsp/buildroot/DEVELOPERS b/bsp/buildroot/DEVELOPERS index 09a0a6e8..b21176e5 100644 --- a/bsp/buildroot/DEVELOPERS +++ b/bsp/buildroot/DEVELOPERS @@ -1624,6 +1624,7 @@ F: package/libinput/ F: package/libiscsi/ F: package/libseccomp/ F: package/linux-tools/ +F: package/matchbox* F: package/mesa3d-headers/ F: package/mke2img/ F: package/nut/ diff --git a/bsp/buildroot/Makefile b/bsp/buildroot/Makefile index 067453eb..806d9f44 100644 --- a/bsp/buildroot/Makefile +++ b/bsp/buildroot/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02.9 +export BR2_VERSION := 2017.02.10 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1514805000 +BR2_VERSION_EPOCH = 1517426000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/bsp/buildroot/VERSION b/bsp/buildroot/VERSION index 97d6333b..50439ba0 100644 --- a/bsp/buildroot/VERSION +++ b/bsp/buildroot/VERSION @@ -1 +1 @@ -buildroot 2017_02_9 +buildroot 2017_02_10 diff --git a/bsp/buildroot/docs/manual/manual.html b/bsp/buildroot/docs/manual/manual.html index 8d1aca0b..7231ff65 100644 --- a/bsp/buildroot/docs/manual/manual.html +++ b/bsp/buildroot/docs/manual/manual.html @@ -1,6 +1,6 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

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

List of Examples

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

Buildroot 2017.02.9 manual generated on 2018-01-01 -11:25:52 UTC from git revision 8f03647169

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

The Buildroot user manual

Table of Contents

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

List of Examples

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

Buildroot 2017.02.10 manual generated on 2018-01-31 +19:26:28 UTC from git revision 91850b3497

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

Copyright © 2004-2017 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of @@ -16,8 +16,8 @@ processors everyone is used to having in his PC. They can be PowerPC processors, MIPS processors, ARM processors, etc.

Buildroot supports numerous processors and their variants; it also comes with default configurations for several boards available off-the-shelf. Besides this, a number of third-party projects are based on, -or develop their BSP [1] or -SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the +or develop their BSP [1] or +SDK [2] on top of Buildroot.


[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the compilation, certain standard Linux utilities are expected to be already installed on the host system. Below you will find an overview of the mandatory and optional packages (note that package names may vary @@ -272,7 +272,7 @@ processor. Under most Linux systems, the compilation toolchain uses the GNU libc (glibc) as the C standard library. This compilation toolchain is called the "host compilation toolchain". The machine on which it is running, and on which you’re working, is called the "host -system" [3].

The compilation toolchain is provided by your distribution, and +system" [3].

The compilation toolchain is provided by your distribution, and Buildroot has nothing to do with it (other than using it to build a cross-compilation toolchain and other tools that are run on the development host).

As said above, the compilation toolchain that comes with your system @@ -551,7 +551,7 @@ The third solution is systemd. http://www.freedesktop.org/wiki/Software/systemd.

The solution recommended by Buildroot developers is to use the BusyBox init as it is sufficient for most embedded -systems. systemd can be used for more complex situations.


[3] This terminology differs from what is used by GNU +systems. systemd can be used for more complex situations.


[3] This terminology differs from what is used by GNU configure, where the host is the machine on which the application will run (which is usually the same as target)

Chapter 7. Configuration of other components

Before attempting to modify any of the components below, make sure you have already configured Buildroot itself, and have enabled the @@ -2673,7 +2673,7 @@ flags. The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s) of the shell script(s) needing fixing. All these names are relative to $(STAGING_DIR)/usr/bin and if needed multiple names can be given.

In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed -from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

Example 17.1. Config script: divine package

Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

So its fixup would be:

DIVINE_CONFIG_SCRIPTS = divine-config

Example 17.2. Config script: imagemagick package:

Package imagemagick installs the following scripts: +from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

Example 17.1. Config script: divine package

Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

So its fixup would be:

DIVINE_CONFIG_SCRIPTS = divine-config

Example 17.2. Config script: imagemagick package:

Package imagemagick installs the following scripts: $(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config

So it’s fixup would be:

IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config

On line 14, we specify the list of dependencies this package relies @@ -4601,7 +4601,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. @@ -4683,7 +4683,7 @@ pastebin service. Note that not all available pastebin services will preserve Unix-style line terminators when downloading raw pastes. Following pastebin services are known to work correctly: - https://gist.github.com/ -- http://code.bulix.org/


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

    Chapter 22. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that +- http://code.bulix.org/


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

    Chapter 22. DEVELOPERS file and get-developers

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

    • Calculate the list of developers to whom patches should be sent, by diff --git a/bsp/buildroot/docs/manual/manual.pdf b/bsp/buildroot/docs/manual/manual.pdf index d03ffc300d6b09195308fad3da585e92cd495519..6500d7fff7147d49efa75663a7a6696558ebaa1a 100644 GIT binary patch delta 7289 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 Wr_E;C#~ct3i5wXppN6g`*?$3e<1@hk diff --git a/bsp/buildroot/docs/manual/manual.text b/bsp/buildroot/docs/manual/manual.text index ceeeaf5b..c6f25028 100644 --- a/bsp/buildroot/docs/manual/manual.text +++ b/bsp/buildroot/docs/manual/manual.text @@ -155,8 +155,8 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2017.02.9 manual generated on 2018-01-01 11:25:58 UTC from -git revision 8f03647169 +Buildroot 2017.02.10 manual generated on 2018-01-31 19:26:34 UTC from +git revision 91850b3497 The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to diff --git a/bsp/buildroot/package/Makefile.in b/bsp/buildroot/package/Makefile.in index b32ad8e4..523cc678 100644 --- a/bsp/buildroot/package/Makefile.in +++ b/bsp/buildroot/package/Makefile.in @@ -388,7 +388,7 @@ DISABLE_NLS :=--disable-nls endif ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -TARGET_CONFIGURE_OPTS += CXX=false +TARGET_CONFIGURE_OPTS += CXX=false CXXCPP=cpp endif ifeq ($(BR2_STATIC_LIBS),y) diff --git a/bsp/buildroot/package/avahi/avahi_tmpfiles.conf b/bsp/buildroot/package/avahi/avahi_tmpfiles.conf index f9aebdfd..da23c147 100644 --- a/bsp/buildroot/package/avahi/avahi_tmpfiles.conf +++ b/bsp/buildroot/package/avahi/avahi_tmpfiles.conf @@ -1 +1 @@ -d /tmp/avahi-autopid 0755 avahi avahi +d /tmp/avahi-autoipd 0755 avahi avahi diff --git a/bsp/buildroot/package/berkeleydb/0001-cwd-db_config.patch b/bsp/buildroot/package/berkeleydb/0001-cwd-db_config.patch new file mode 100644 index 00000000..08ce5a39 --- /dev/null +++ b/bsp/buildroot/package/berkeleydb/0001-cwd-db_config.patch @@ -0,0 +1,21 @@ +Do not access DB_CONFIG when db_home is not set + +Fixes CVE-2017-10140: +https://bugzilla.redhat.com/show_bug.cgi?id=1464032#c9 + +Downloaded from +http://pkgs.fedoraproject.org/cgit/rpms/libdb.git/commit/?id=8047fa8580659fcae740c25e91b490539b8453eb + +Signed-off-by: Bernd Kuhls + +--- db-5.3.28/src/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ db-5.3.28/src/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/bsp/buildroot/package/berkeleydb/berkeleydb.hash b/bsp/buildroot/package/berkeleydb/berkeleydb.hash index e47c578c..75293297 100644 --- a/bsp/buildroot/package/berkeleydb/berkeleydb.hash +++ b/bsp/buildroot/package/berkeleydb/berkeleydb.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 76a25560d9e52a198d37a31440fd07632b5f1f8f9f2b6d5438f4bc3e7c9013ef db-5.3.28.NC.tar.gz +sha256 b78815181a53241f9347c6b47d1031fd669946f863e1edc807a291354cec024b LICENSE diff --git a/bsp/buildroot/package/bind/bind.hash b/bsp/buildroot/package/bind/bind.hash index 95362309..199db704 100644 --- a/bsp/buildroot/package/bind/bind.hash +++ b/bsp/buildroot/package/bind/bind.hash @@ -1,3 +1,3 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.2/bind-9.11.2.tar.gz.sha256.asc -sha256 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a bind-9.11.2.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.2-P1/bind-9.11.2-P1.tar.gz.sha256.asc +sha256 cec31548832fca3f85d95178d4019b7d702039e8595d4c93914feba337df1212 bind-9.11.2-P1.tar.gz sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT diff --git a/bsp/buildroot/package/bind/bind.mk b/bsp/buildroot/package/bind/bind.mk index 4465a2f7..570f719d 100644 --- a/bsp/buildroot/package/bind/bind.mk +++ b/bsp/buildroot/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.2 +BIND_VERSION = 9.11.2-P1 BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) diff --git a/bsp/buildroot/package/busybox/busybox.mk b/bsp/buildroot/package/busybox/busybox.mk index 577f2f24..3f4260be 100644 --- a/bsp/buildroot/package/busybox/busybox.mk +++ b/bsp/buildroot/package/busybox/busybox.mk @@ -175,7 +175,7 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \ $(INSTALL) -m 0755 -D package/busybox/S01logging \ $(TARGET_DIR)/etc/init.d/S01logging; \ - else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi + fi endef ifeq ($(BR2_INIT_BUSYBOX),y) diff --git a/bsp/buildroot/package/ccache/ccache.hash b/bsp/buildroot/package/ccache/ccache.hash index bde53f79..c22394b1 100644 --- a/bsp/buildroot/package/ccache/ccache.hash +++ b/bsp/buildroot/package/ccache/ccache.hash @@ -1,2 +1,3 @@ -# Verified key https://samba.org/ftp/ccache/ccache-3.3.3.tar.xz.asc - sha256 computed locally -sha256 3b02a745da1cfa9eb438af7147e0fd3545e2f6163de9e5b07da86f58859f04ec ccache-3.3.3.tar.xz +# Verified key https://samba.org/ftp/ccache/ccache-3.3.4.tar.xz.asc - sha256 computed locally +sha256 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f ccache-3.3.4.tar.xz +sha256 190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6 ccache-3.3.5.tar.xz diff --git a/bsp/buildroot/package/ccache/ccache.mk b/bsp/buildroot/package/ccache/ccache.mk index 55a91325..6af2d8e5 100644 --- a/bsp/buildroot/package/ccache/ccache.mk +++ b/bsp/buildroot/package/ccache/ccache.mk @@ -4,8 +4,8 @@ # ################################################################################ -CCACHE_VERSION = 3.3.3 -CCACHE_SITE = https://samba.org/ftp/ccache +CCACHE_VERSION = 3.3.5 +CCACHE_SITE = https://www.samba.org/ftp/ccache CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPLv3+, others CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt diff --git a/bsp/buildroot/package/clamav/0003-backtrace-uClibc.patch b/bsp/buildroot/package/clamav/0002-backtrace-uClibc.patch similarity index 100% rename from bsp/buildroot/package/clamav/0003-backtrace-uClibc.patch rename to bsp/buildroot/package/clamav/0002-backtrace-uClibc.patch diff --git a/bsp/buildroot/package/clamav/Config.in b/bsp/buildroot/package/clamav/Config.in index 7ec402d9..f832341a 100644 --- a/bsp/buildroot/package/clamav/Config.in +++ b/bsp/buildroot/package/clamav/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CLAMAV bool "clamav" select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/bsp/buildroot/package/clamav/clamav.hash b/bsp/buildroot/package/clamav/clamav.hash index d2a1a129..fe873bdd 100644 --- a/bsp/buildroot/package/clamav/clamav.hash +++ b/bsp/buildroot/package/clamav/clamav.hash @@ -1,2 +1,14 @@ # Locally calculated -sha256 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a clamav-0.99.2.tar.gz +sha256 00fa5292a6e00a3a4035b826267748965d5d2c4943d8ff417d740238263e8e84 clamav-0.99.3.tar.gz +sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING +sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 +sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file +sha256 6dce638b76399e7521ad8e182d3e33e4496c85b3b69b6ff434b53017101e82ad COPYING.getopt +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LGPL +sha256 e3a9b913515a42f8ff3ef1551c3a2cdba383c39ed959729e0e2911219496ad74 COPYING.llvm +sha256 d96d71b66aa32c4a2d1619b9ca3347dafa9460bcf0fb5ac2408916067ad31dfc COPYING.lzma +sha256 accdcf2455c07b99abea59016b3663eaef926a92092d103bfaa25fed27cf6b24 COPYING.pcre +sha256 e2c1395a3d9fea6d5d25847c9d783db6e2cc8b085b4025861f459139c5dfd90b COPYING.regex +sha256 1faccc6b5c7b958fb807a3f573d5be9bf7889fe898f7e0617c544b05a81bfd00 COPYING.unrar +sha256 a20d6317c5384e8d4c05f9c31097878675d9429ec46090656166039cc10bc957 COPYING.YARA +sha256 c2f77553f8d870c5635b0dace0519253233f172b33ce1fdf6578610706294eee COPYING.zlib diff --git a/bsp/buildroot/package/clamav/clamav.mk b/bsp/buildroot/package/clamav/clamav.mk index 36ab8be0..e7e782dc 100644 --- a/bsp/buildroot/package/clamav/clamav.mk +++ b/bsp/buildroot/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.99.2 +CLAMAV_VERSION = 0.99.3 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPLv2 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ @@ -12,6 +12,7 @@ CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ COPYING.unrar COPYING.zlib CLAMAV_DEPENDENCIES = \ host-pkgconf \ + libtool \ openssl \ zlib \ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) @@ -24,6 +25,8 @@ CLAMAV_CONF_ENV = \ # UCLIBC_HAS_FTS is disabled, therefore disable fanotify (missing fts.h) CLAMAV_CONF_OPTS = \ --with-dbdir=/var/lib/clamav \ + --with-ltdl-include=$(STAGING_DIR)/usr/include \ + --with-ltdl-lib=$(STAGING_DIR)/usr/lib \ --with-openssl=$(STAGING_DIR)/usr \ --with-zlib=$(STAGING_DIR)/usr \ --disable-zlib-vcheck \ @@ -45,6 +48,13 @@ else CLAMAV_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_JSON_C),y) +CLAMAV_CONF_OPTS += --with-libjson=$(STAGING_DIR)/usr +CLAMAV_DEPENDENCIES += json-c +else +CLAMAV_CONF_OPTS += --without-libjson +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) CLAMAV_CONF_OPTS += --with-xml=$(STAGING_DIR)/usr CLAMAV_DEPENDENCIES += libxml2 diff --git a/bsp/buildroot/package/coreutils/coreutils.mk b/bsp/buildroot/package/coreutils/coreutils.mk index 409089c3..4e0b1f7b 100644 --- a/bsp/buildroot/package/coreutils/coreutils.mk +++ b/bsp/buildroot/package/coreutils/coreutils.mk @@ -56,8 +56,8 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ INSTALL_PROGRAM=$(INSTALL) COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \ - ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \ - uname join + kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \ + vdir sleep stty sync touch true uname join # If both coreutils and busybox are selected, make certain coreutils # wins the fight over who gets to have their utils actually installed. diff --git a/bsp/buildroot/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch b/bsp/buildroot/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch new file mode 100644 index 00000000..b6d3ed3e --- /dev/null +++ b/bsp/buildroot/package/dovecot/0001-byteorder.h-fix-uclibc-build.patch @@ -0,0 +1,32 @@ +From 902917880ca29f1007750a70cf46e7246b2d0a2a Mon Sep 17 00:00:00 2001 +From: Josef 'Jeff' Sipek +Date: Tue, 14 Nov 2017 06:01:21 +0100 +Subject: [PATCH] byteorder.h: fix uclibc build + +Patch suggested on upstream mailinglist: +https://www.dovecot.org/pipermail/dovecot/2017-November/110019.html + +Signed-off-by: Bernd Kuhls +--- + src/lib/byteorder.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lib/byteorder.h b/src/lib/byteorder.h +index 2f5dc7c17..4ffe8da21 100644 +--- a/src/lib/byteorder.h ++++ b/src/lib/byteorder.h +@@ -23,6 +23,11 @@ + #ifndef BYTEORDER_H + #define BYTEORDER_H + ++#undef bswap_8 ++#undef bswap_16 ++#undef bswap_32 ++#undef bswap_64 ++ + /* + * These prototypes exist to catch bugs in the code generating macros below. + */ +-- +2.11.0 + diff --git a/bsp/buildroot/package/dovecot/0002-lib-auth-Fix-memory-leak-in-auth_client_request_abor.patch b/bsp/buildroot/package/dovecot/0002-lib-auth-Fix-memory-leak-in-auth_client_request_abor.patch new file mode 100644 index 00000000..babccd3a --- /dev/null +++ b/bsp/buildroot/package/dovecot/0002-lib-auth-Fix-memory-leak-in-auth_client_request_abor.patch @@ -0,0 +1,33 @@ +From 1a29ed2f96da1be22fa5a4d96c7583aa81b8b060 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 18 Dec 2017 16:50:51 +0200 +Subject: [PATCH] lib-auth: Fix memory leak in auth_client_request_abort() + +This caused memory leaks when authentication was aborted. For example +with IMAP: + +a AUTHENTICATE PLAIN +* + +Broken by 9137c55411aa39d41c1e705ddc34d5bd26c65021 + +Signed-off-by: Peter Korsgaard +--- + src/lib-auth/auth-client-request.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c +index 480fb42b3..046f7c307 100644 +--- a/src/lib-auth/auth-client-request.c ++++ b/src/lib-auth/auth-client-request.c +@@ -186,6 +186,7 @@ void auth_client_request_abort(struct auth_client_request **_request) + + auth_client_send_cancel(request->conn->client, request->id); + call_callback(request, AUTH_REQUEST_STATUS_ABORT, NULL, NULL); ++ pool_unref(&request->pool); + } + + unsigned int auth_client_request_get_id(struct auth_client_request *request) +-- +2.11.0 + diff --git a/bsp/buildroot/package/dovecot/dovecot.hash b/bsp/buildroot/package/dovecot/dovecot.hash index 46e7c5aa..33163d6d 100644 --- a/bsp/buildroot/package/dovecot/dovecot.hash +++ b/bsp/buildroot/package/dovecot/dovecot.hash @@ -1,2 +1,5 @@ # Locally computed after checking signature -sha256 ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 dovecot-2.2.29.1.tar.gz +sha256 fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 dovecot-2.2.33.2.tar.gz +sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/bsp/buildroot/package/dovecot/dovecot.mk b/bsp/buildroot/package/dovecot/dovecot.mk index 36a64948..f8fbaaab 100644 --- a/bsp/buildroot/package/dovecot/dovecot.mk +++ b/bsp/buildroot/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).29.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).33.2 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPLv2.1 diff --git a/bsp/buildroot/package/eeprog/Config.in b/bsp/buildroot/package/eeprog/Config.in index ff313bdb..73582c70 100644 --- a/bsp/buildroot/package/eeprog/Config.in +++ b/bsp/buildroot/package/eeprog/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_EEPROG help Simple tool to read/write i2c eeprom chips. - http://codesink.org/eeprog.html + http://www.codesink.org/eeprog.html diff --git a/bsp/buildroot/package/eudev/S10udev b/bsp/buildroot/package/eudev/S10udev index 8382bec2..640fec62 100755 --- a/bsp/buildroot/package/eudev/S10udev +++ b/bsp/buildroot/package/eudev/S10udev @@ -27,9 +27,9 @@ test -r $UDEV_CONFIG || exit 6 case "$1" in start) - printf "Populating ${udev_root:-/dev} using udev: " + printf "Populating %s using udev: " "${udev_root:-/dev}" printf '\000\000\000\000' > /proc/sys/kernel/hotplug - $UDEV_BIN -d || (echo "FAIL" && exit 1) + $UDEV_BIN -d || { echo "FAIL"; exit 1; } udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add udevadm settle --timeout=30 || echo "udevadm settle failed" diff --git a/bsp/buildroot/package/fis/fis.mk b/bsp/buildroot/package/fis/fis.mk index 876b1272..f559bdf7 100644 --- a/bsp/buildroot/package/fis/fis.mk +++ b/bsp/buildroot/package/fis/fis.mk @@ -12,7 +12,7 @@ FIS_LICENSE_FILES = fis.c define FIS_BUILD_CMDS $(TARGET_CC) $(TARGET_CFLAGS) -std=c99 -o $(@D)/fis \ - $(@D)/fis.c $(@D)/crc.c $(TARGE_LDFLAGS) + $(@D)/fis.c $(@D)/crc.c $(TARGET_LDFLAGS) endef define FIS_INSTALL_TARGET_CMDS diff --git a/bsp/buildroot/package/intel-microcode/intel-microcode.hash b/bsp/buildroot/package/intel-microcode/intel-microcode.hash index 7925209b..12e1dfbf 100644 --- a/bsp/buildroot/package/intel-microcode/intel-microcode.hash +++ b/bsp/buildroot/package/intel-microcode/intel-microcode.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 096e39489eef67666be652e81fa372a06b74f39ea3d565dc0287242c668717e7 microcode-20151106.tgz +sha256 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130 microcode-20180108.tgz +sha256 6d4deb65ca688d930e188bf93f78430f134097b161e6df4a2ef00728e14965e3 license.txt diff --git a/bsp/buildroot/package/intel-microcode/intel-microcode.mk b/bsp/buildroot/package/intel-microcode/intel-microcode.mk index aefa99a1..d6c35b21 100644 --- a/bsp/buildroot/package/intel-microcode/intel-microcode.mk +++ b/bsp/buildroot/package/intel-microcode/intel-microcode.mk @@ -4,9 +4,9 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20151106 +INTEL_MICROCODE_VERSION = 20180108 INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz -INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/25512/eng +INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27431/eng INTEL_MICROCODE_STRIP_COMPONENTS = 0 INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license.txt diff --git a/bsp/buildroot/package/iputils/iputils.mk b/bsp/buildroot/package/iputils/iputils.mk index 21f5dcbe..d3a12ac6 100644 --- a/bsp/buildroot/package/iputils/iputils.mk +++ b/bsp/buildroot/package/iputils/iputils.mk @@ -76,4 +76,9 @@ define IPUTILS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 endef +define IPUTILS_PERMISSIONS + /bin/ping f 4755 0 0 - - - - - + /bin/traceroute6 f 4755 0 0 - - - - - +endef + $(eval $(generic-package)) diff --git a/bsp/buildroot/package/irssi/irssi.hash b/bsp/buildroot/package/irssi/irssi.hash index 0a6c3f61..83dde003 100644 --- a/bsp/buildroot/package/irssi/irssi.hash +++ b/bsp/buildroot/package/irssi/irssi.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 c2556427e12eb06cabfed40839ac6f57eb8b1aa6365fab6dfcd331b7a04bb914 irssi-1.0.5.tar.xz +sha256 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585 irssi-1.0.6.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/bsp/buildroot/package/irssi/irssi.mk b/bsp/buildroot/package/irssi/irssi.mk index 3ea81a95..d29d4f0e 100644 --- a/bsp/buildroot/package/irssi/irssi.mk +++ b/bsp/buildroot/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.0.5 +IRSSI_VERSION = 1.0.6 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz # Do not use the github helper here. The generated tarball is *NOT* the # same as the one uploaded by upstream for the release. diff --git a/bsp/buildroot/package/kmsxx/kmsxx.mk b/bsp/buildroot/package/kmsxx/kmsxx.mk index c06d20be..4932f479 100644 --- a/bsp/buildroot/package/kmsxx/kmsxx.mk +++ b/bsp/buildroot/package/kmsxx/kmsxx.mk @@ -44,12 +44,15 @@ define KMSXX_INSTALL_TARGET_CMDS $(KMSXX_INSTALL_TARGET_TESTS) endef +# kmsxx only builds shared or static libraries, so when +# BR2_SHARED_STATIC_LIBS=y, we don't have any static library to +# install define KMSXX_INSTALL_STAGING_CMDS $(foreach l,$(KMSXX_LIBS),\ $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ $(STAGING_DIR)/usr/lib/lib$(l).so) - $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS), + $(if $(BR2_STATIC_LIBS), $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).a \ $(STAGING_DIR)/usr/lib/lib$(l).a) mkdir -p $(STAGING_DIR)/usr/include/$(l) diff --git a/bsp/buildroot/package/libcurl/libcurl.hash b/bsp/buildroot/package/libcurl/libcurl.hash index 275a5a37..b1afe189 100644 --- a/bsp/buildroot/package/libcurl/libcurl.hash +++ b/bsp/buildroot/package/libcurl/libcurl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.57.0.tar.xz.asc -sha256 f5f6fd3c72b7b8389969f4fb671ed8532fa9b5bb7a5cae7ca89bc1cea45c7878 curl-7.57.0.tar.xz -sha256 cbcf511f5702f7baf5424193a792bc9c18fab22bcbec2e6a587598389dc632c2 COPYING +# https://curl.haxx.se/download/curl-7.58.0.tar.xz.asc +sha256 6a813875243609eb75f37fa72044e4ad618b55ec15a4eafdac2df6a7e800e3e3 curl-7.58.0.tar.xz +sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING diff --git a/bsp/buildroot/package/libcurl/libcurl.mk b/bsp/buildroot/package/libcurl/libcurl.mk index 0aab58a7..a1d2aa7a 100644 --- a/bsp/buildroot/package/libcurl/libcurl.mk +++ b/bsp/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.57.0 +LIBCURL_VERSION = 7.58.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ diff --git a/bsp/buildroot/package/liberation/liberation.mk b/bsp/buildroot/package/liberation/liberation.mk index dfed086f..a77c014a 100644 --- a/bsp/buildroot/package/liberation/liberation.mk +++ b/bsp/buildroot/package/liberation/liberation.mk @@ -5,7 +5,7 @@ ################################################################################ LIBERATION_VERSION = 2.00.1 -LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts +LIBERATION_SITE = https://releases.pagure.org/liberation-fonts LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation LIBERATION_LICENSE = OFLv1.1 diff --git a/bsp/buildroot/package/libiio/libiio.mk b/bsp/buildroot/package/libiio/libiio.mk index aaa6c706..d7d7f597 100644 --- a/bsp/buildroot/package/libiio/libiio.mk +++ b/bsp/buildroot/package/libiio/libiio.mk @@ -54,8 +54,8 @@ else LIBIIO_CONF_OPTS += -DWITH_IIOD_USBD=OFF endif -# Avahi support in libiio requires avahi-client, which needs avahi-daemon -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON),yy) +# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus +ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) LIBIIO_DEPENDENCIES += avahi endif diff --git a/bsp/buildroot/package/linux-headers/Config.in.host b/bsp/buildroot/package/linux-headers/Config.in.host index ee9f0e9f..5e361219 100644 --- a/bsp/buildroot/package/linux-headers/Config.in.host +++ b/bsp/buildroot/package/linux-headers/Config.in.host @@ -214,15 +214,15 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.96" if BR2_KERNEL_HEADERS_3_2 + default "3.2.98" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.108" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 default "3.18.72" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.48" if BR2_KERNEL_HEADERS_4_1 - default "4.4.108" if BR2_KERNEL_HEADERS_4_4 + default "4.1.49" if BR2_KERNEL_HEADERS_4_1 + default "4.4.114" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.73" if BR2_KERNEL_HEADERS_4_9 + default "4.9.79" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/bsp/buildroot/package/lz4/lz4.mk b/bsp/buildroot/package/lz4/lz4.mk index 9d7f56bb..b0d45474 100644 --- a/bsp/buildroot/package/lz4/lz4.mk +++ b/bsp/buildroot/package/lz4/lz4.mk @@ -18,26 +18,26 @@ LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED endif define HOST_LZ4_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) all endef define HOST_LZ4_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \ + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR)/usr \ install -C $(@D) endef define LZ4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all endef define LZ4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \ PREFIX=/usr install -C $(@D) endef define LZ4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr install -C $(@D)/lib + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr install -C $(@D) endef $(eval $(generic-package)) diff --git a/bsp/buildroot/package/mariadb/mariadb.hash b/bsp/buildroot/package/mariadb/mariadb.hash index fcca9be6..f8e1c6ce 100644 --- a/bsp/buildroot/package/mariadb/mariadb.hash +++ b/bsp/buildroot/package/mariadb/mariadb.hash @@ -1,5 +1,5 @@ -# From https://downloads.mariadb.org/mariadb/10.1.29/ -sha256 73bbd5602f52ab5aa4d83f465134871b6c87bda25371d098f6da5a3d98517ed4 mariadb-10.1.29.tar.gz +# From https://downloads.mariadb.org/mariadb/10.1.30/ +sha256 173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88 mariadb-10.1.30.tar.gz # Hash for license files sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README diff --git a/bsp/buildroot/package/mariadb/mariadb.mk b/bsp/buildroot/package/mariadb/mariadb.mk index 97a1b034..dc88696e 100644 --- a/bsp/buildroot/package/mariadb/mariadb.mk +++ b/bsp/buildroot/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.1.29 +MARIADB_VERSION = 10.1.30 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) # Tarball no longer contains LGPL license text diff --git a/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk b/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk index ea8e6dcd..d694e61c 100644 --- a/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk +++ b/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk @@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES - $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc - $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile + $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' \ + $(@D)/Makefile endef MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES diff --git a/bsp/buildroot/package/matchbox-lib/Config.in b/bsp/buildroot/package/matchbox-lib/Config.in index e50a5436..d758ab35 100644 --- a/bsp/buildroot/package/matchbox-lib/Config.in +++ b/bsp/buildroot/package/matchbox-lib/Config.in @@ -1,4 +1,5 @@ config BR2_PACKAGE_MATCHBOX_LIB bool "matchbox-lib" + select BR2_PACKAGE_XLIB_LIBXEXT help Matchbox common functionality library. diff --git a/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk b/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk index 451279e6..ea6abf11 100644 --- a/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk +++ b/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk @@ -10,12 +10,13 @@ MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatch MATCHBOX_LIB_LICENSE = LGPLv2.1+ MATCHBOX_LIB_LICENSE_FILES = COPYING MATCHBOX_LIB_INSTALL_STAGING = YES -MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext -MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs +MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext +MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs MATCHBOX_LIB_CONF_ENV = LIBS="-lX11" define MATCHBOX_LIB_POST_INSTALL_FIXES - $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \ + $(SED) 's:-I$(STAGING_DIR)/:-I/:g' \ + -e 's:-I/usr/include\( \|$$\)::g' \ $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc endef diff --git a/bsp/buildroot/package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch b/bsp/buildroot/package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch new file mode 100644 index 00000000..ba19bf57 --- /dev/null +++ b/bsp/buildroot/package/openocd/0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch @@ -0,0 +1,50 @@ +From 3a223ca3ebc7ac24d7726a0cd58e5695bc813657 Mon Sep 17 00:00:00 2001 +From: Andreas Fritiofson +Date: Sat, 13 Jan 2018 21:00:47 +0100 +Subject: [PATCH] CVE-2018-5704: Prevent some forms of Cross Protocol Scripting + attacks + +OpenOCD can be targeted by a Cross Protocol Scripting attack from +a web browser running malicious code, such as the following PoC: + +var x = new XMLHttpRequest(); +x.open("POST", "http://127.0.0.1:4444", true); +x.send("exec xcalc\r\n"); + +This mitigation should provide some protection from browser-based +attacks and is based on the corresponding fix in Redis: + +https://github.com/antirez/redis/blob/8075572207b5aebb1385c4f233f5302544439325/src/networking.c#L1758 + + +Upstream-status: Under review: http://openocd.zylin.com/#/c/4335/ +Change-Id: Ia96ebe19b74b5805dc228bf7364c7971a90a4581 +Signed-off-by: Andreas Fritiofson +Reported-by: Josef Gajdusek +Signed-off-by: Peter Korsgaard +--- + src/server/startup.tcl | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/server/startup.tcl b/src/server/startup.tcl +index 64ace407..dd1b31e4 100644 +--- a/src/server/startup.tcl ++++ b/src/server/startup.tcl +@@ -8,3 +8,14 @@ proc ocd_gdb_restart {target_id} { + # one target + reset halt + } ++ ++proc prevent_cps {} { ++ echo "Possible SECURITY ATTACK detected." ++ echo "It looks like somebody is sending POST or Host: commands to OpenOCD." ++ echo "This is likely due to an attacker attempting to use Cross Protocol Scripting" ++ echo "to compromise your OpenOCD instance. Connection aborted." ++ exit ++} ++ ++proc POST {args} { prevent_cps } ++proc Host: {args} { prevent_cps } +-- +2.11.0 + diff --git a/bsp/buildroot/package/php/0009-Call-apxs-with-correct-prefix.patch b/bsp/buildroot/package/php/0008-Call-apxs-with-correct-prefix.patch similarity index 100% rename from bsp/buildroot/package/php/0009-Call-apxs-with-correct-prefix.patch rename to bsp/buildroot/package/php/0008-Call-apxs-with-correct-prefix.patch diff --git a/bsp/buildroot/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch b/bsp/buildroot/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch deleted file mode 100644 index f4812daa..00000000 --- a/bsp/buildroot/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001 -From: Andy Postnikov -Date: Sat, 10 Dec 2016 23:51:17 +0300 -Subject: [PATCH] Fix bug #70015 - Compilation failure on aarch64 - -Fixes build at -O0. - -[From pull request https://github.com/php/php-src/pull/2236.] -Signed-off-by: Tatsuyuki Ishi ---- - Zend/zend_multiply.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h -index 75769db..fbd69ab 100644 ---- a/Zend/zend_multiply.h -+++ b/Zend/zend_multiply.h -@@ -75,8 +75,8 @@ - __asm__("mul %0, %2, %3\n" \ - "smulh %1, %2, %3\n" \ - "sub %1, %1, %0, asr #63\n" \ -- : "=X"(__tmpvar), "=X"(usedval) \ -- : "X"(a), "X"(b)); \ -+ : "=&r"(__tmpvar), "=&r"(usedval) \ -+ : "r"(a), "r"(b)); \ - if (usedval) (dval) = (double) (a) * (double) (b); \ - else (lval) = __tmpvar; \ - } while (0) diff --git a/bsp/buildroot/package/php/php.hash b/bsp/buildroot/package/php/php.hash index c724f6d8..3b3c97bd 100644 --- a/bsp/buildroot/package/php/php.hash +++ b/bsp/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ # From http://php.net/downloads.php -sha256 0d42089729be7b2bb0308cbe189c2782f9cb4b07078c8a235495be5874fff729 php-7.1.7.tar.xz +sha256 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10 php-7.1.13.tar.xz # License file sha256 a44951f93b10c87c3f7cd9f311d95999c57c95ed950eec32b14c1c7ea6baf25e LICENSE diff --git a/bsp/buildroot/package/php/php.mk b/bsp/buildroot/package/php/php.mk index 0733bc9a..b684fa15 100644 --- a/bsp/buildroot/package/php/php.mk +++ b/bsp/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.7 +PHP_VERSION = 7.1.13 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES diff --git a/bsp/buildroot/package/pound/0001-fix-openssl-1.0.2.patch b/bsp/buildroot/package/pound/0001-fix-openssl-1.0.2.patch new file mode 100644 index 00000000..b20fdb36 --- /dev/null +++ b/bsp/buildroot/package/pound/0001-fix-openssl-1.0.2.patch @@ -0,0 +1,127 @@ +From eb471de8f26e0367dd08d299d2252fa8b2b958a9 Mon Sep 17 00:00:00 2001 +From: Emilio +Date: Mon, 17 Jul 2017 09:41:32 +0200 +Subject: [PATCH] [Improvement] Added support to compile pound with openssl + 1.0.2 + +Signed-off-by: Emilio + + new file: dh2048.h + modified: svc.c + +Patch was downloaded from 3rd-party repo: +https://github.com/zevenet/pound/commit/eb471de8f26e0367dd08d299d2252fa8b2b958a9 + +This repo was announced on upstream mailinglist: +http://www.apsis.ch/pound/pound_list/archive/2017/2017-07/1500287626000#1500287626000 + +Signed-off-by: Bernd Kuhls +--- + dh2048.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + svc.c | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 86 insertions(+) + create mode 100644 dh2048.h + +diff --git a/dh2048.h b/dh2048.h +new file mode 100644 +index 0000000..79c693c +--- /dev/null ++++ b/dh2048.h +@@ -0,0 +1,53 @@ ++#ifndef HEADER_DH_H ++# include ++#endif ++ ++DH *get_dh2048() ++{ ++ static unsigned char dhp_2048[] = { ++ 0xBF, 0x6C, 0xC6, 0xBD, 0xEA, 0x10, 0x84, 0x59, 0x40, 0xC2, ++ 0xC6, 0xA2, 0x9B, 0x19, 0xD3, 0x2E, 0x2F, 0xAB, 0xE6, 0xE4, ++ 0x1E, 0x91, 0x0D, 0x59, 0xDC, 0x96, 0x3F, 0x6E, 0x65, 0x38, ++ 0xB9, 0xBE, 0xBB, 0x8F, 0xDF, 0x73, 0xAC, 0xAC, 0xB3, 0x2F, ++ 0xA7, 0x02, 0x0B, 0x87, 0xB7, 0x3F, 0x3A, 0x42, 0x8A, 0x94, ++ 0xDD, 0xEC, 0x33, 0xA4, 0x25, 0xB1, 0xBF, 0x84, 0x91, 0x87, ++ 0xD8, 0x1C, 0x42, 0xB9, 0x8E, 0x00, 0x1F, 0x49, 0xED, 0x57, ++ 0xA4, 0x48, 0xB0, 0xCC, 0xD8, 0xB8, 0x83, 0xCA, 0x3E, 0xDF, ++ 0xA2, 0xF2, 0x07, 0x71, 0x71, 0x18, 0x1F, 0x50, 0x45, 0x3A, ++ 0x66, 0x04, 0x7F, 0x15, 0xB2, 0xA8, 0x02, 0x77, 0xCE, 0xC6, ++ 0xF9, 0x7C, 0x63, 0xE4, 0x52, 0x41, 0xFA, 0x62, 0xB9, 0x0D, ++ 0xDC, 0x08, 0x62, 0xEC, 0x00, 0xAB, 0xB0, 0xF7, 0x79, 0x48, ++ 0x75, 0x22, 0x85, 0xCC, 0x67, 0x3C, 0xEA, 0x09, 0x32, 0xAC, ++ 0x30, 0xED, 0x1E, 0x67, 0xDC, 0x74, 0xF8, 0xD9, 0xC3, 0xD0, ++ 0xA0, 0x60, 0x4D, 0xCE, 0x52, 0xBC, 0xA3, 0xE5, 0x18, 0x7B, ++ 0x0B, 0xC8, 0xCE, 0x70, 0xA2, 0xC8, 0x21, 0xCA, 0xCE, 0xA5, ++ 0xD4, 0xCB, 0x85, 0xFC, 0xC7, 0x07, 0x5C, 0x05, 0x87, 0xFC, ++ 0x2F, 0x67, 0x4D, 0x2D, 0x4F, 0xA4, 0xEE, 0x63, 0x98, 0x49, ++ 0xE4, 0x2E, 0xD7, 0x3F, 0x7D, 0x69, 0x68, 0x0A, 0xA2, 0x3E, ++ 0x5A, 0x04, 0xD4, 0xDD, 0xBB, 0xC7, 0xB4, 0x34, 0xB7, 0x21, ++ 0xD3, 0xAC, 0x99, 0xD7, 0x87, 0x45, 0x5E, 0x18, 0x68, 0x16, ++ 0x3A, 0xAF, 0xE2, 0x04, 0x57, 0xB8, 0x6A, 0xB8, 0x2F, 0x75, ++ 0xD5, 0x79, 0x96, 0x60, 0x8D, 0xD1, 0xCC, 0xD1, 0x33, 0x85, ++ 0x53, 0x88, 0x87, 0x34, 0xA6, 0x4B, 0x49, 0x24, 0x53, 0xD6, ++ 0xF1, 0x1E, 0x4E, 0x98, 0x4D, 0x6B, 0x44, 0x31, 0x94, 0xFF, ++ 0x46, 0xC2, 0x38, 0x2E, 0xEA, 0xBB ++ }; ++ static unsigned char dhg_2048[] = { ++ 0x05 ++ }; ++ DH *dh = DH_new(); ++ BIGNUM *dhp_bn, *dhg_bn; ++ ++ if (dh == NULL) ++ return NULL; ++ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL); ++ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL); ++ if (dhp_bn == NULL || dhg_bn == NULL ++ || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { ++ DH_free(dh); ++ BN_free(dhp_bn); ++ BN_free(dhg_bn); ++ return NULL; ++ } ++ return dh; ++} +diff --git a/svc.c b/svc.c +index 1341397..758dfbd 100644 +--- a/svc.c ++++ b/svc.c +@@ -1512,6 +1512,39 @@ do_RSAgen(void) + return; + } + ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) ++{ ++ /* If the fields p and g in d are NULL, the corresponding input ++ * parameters MUST be non-NULL. q may remain NULL. ++ */ ++ if ((dh->p == NULL && p == NULL) ++ || (dh->g == NULL && g == NULL)) ++ return 0; ++ ++ if (p != NULL) { ++ BN_free(dh->p); ++ dh->p = p; ++ } ++ if (q != NULL) { ++ BN_free(dh->q); ++ dh->q = q; ++ } ++ if (g != NULL) { ++ BN_free(dh->g); ++ dh->g = g; ++ } ++ ++ if (q != NULL) { ++ dh->length = BN_num_bits(q); ++ } ++ ++ return 1; ++} ++#endif ++ ++ + #include "dh512.h" + + #if DH_LEN == 1024 diff --git a/bsp/buildroot/package/rpcbind/0005-rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch b/bsp/buildroot/package/rpcbind/0005-rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch new file mode 100644 index 00000000..c482af5d --- /dev/null +++ b/bsp/buildroot/package/rpcbind/0005-rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch @@ -0,0 +1,98 @@ +From 4e201b75928ff7d4894cd30ab0f5f67b9cd95f5c Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Thu, 18 Jan 2018 17:33:56 +0000 +Subject: [PATCH] rpcbproc_callit_com: Stop freeing a static pointer + +commit 7ea36ee introduced a svc_freeargs() call +that ended up freeing static pointer. + +It turns out the allocations for the rmt_args +is not necessary . The xdr routines (xdr_bytes) will +handle the memory management and the largest +possible message size is UDPMSGSIZE (due to UDP only) +which is smaller than RPC_BUF_MAX + +Signed-off-by: Steve Dickson +(cherry picked from commit 7c7590ad536c0e24bef790cb1e65702fc54db566) +Signed-off-by: Ed Blake +--- + src/rpcb_svc_com.c | 39 ++++++--------------------------------- + 1 file changed, 6 insertions(+), 33 deletions(-) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 0432b6f..64f1104 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -616,9 +616,9 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + struct netconfig *nconf; + struct netbuf *caller; + struct r_rmtcall_args a; +- char *buf_alloc = NULL, *outbufp; ++ char *outbufp; + char *outbuf_alloc = NULL; +- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX]; ++ char outbuf[RPC_BUF_MAX]; + struct netbuf *na = (struct netbuf *) NULL; + struct rpc_msg call_msg; + int outlen; +@@ -639,36 +639,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + } + if (si.si_socktype != SOCK_DGRAM) + return; /* Only datagram type accepted */ +- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE); +- if (sendsz == 0) { /* data transfer not supported */ +- if (reply_type == RPCBPROC_INDIRECT) +- svcerr_systemerr(transp); +- return; +- } +- /* +- * Should be multiple of 4 for XDR. +- */ +- sendsz = ((sendsz + 3) / 4) * 4; +- if (sendsz > RPC_BUF_MAX) { +-#ifdef notyet +- buf_alloc = alloca(sendsz); /* not in IDR2? */ +-#else +- buf_alloc = malloc(sendsz); +-#endif /* notyet */ +- if (buf_alloc == NULL) { +- if (debugging) +- xlog(LOG_DEBUG, +- "rpcbproc_callit_com: No Memory!\n"); +- if (reply_type == RPCBPROC_INDIRECT) +- svcerr_systemerr(transp); +- return; +- } +- a.rmt_args.args = buf_alloc; +- } else { +- a.rmt_args.args = buf; +- } ++ sendsz = UDPMSGSIZE; + + call_msg.rm_xid = 0; /* For error checking purposes */ ++ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */ + if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) { + if (reply_type == RPCBPROC_INDIRECT) + svcerr_decode(transp); +@@ -708,7 +682,8 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + if (rbl == (rpcblist_ptr)NULL) { + #ifdef RPCBIND_DEBUG + if (debugging) +- xlog(LOG_DEBUG, "not found\n"); ++ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n", ++ a.rmt_prog, a.rmt_vers); + #endif + if (reply_type == RPCBPROC_INDIRECT) + svcerr_noprog(transp); +@@ -941,8 +916,6 @@ out: + } + if (local_uaddr) + free(local_uaddr); +- if (buf_alloc) +- free(buf_alloc); + if (outbuf_alloc) + free(outbuf_alloc); + if (na) { +-- +2.11.0 + diff --git a/bsp/buildroot/package/rpcbind/0006-pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch b/bsp/buildroot/package/rpcbind/0006-pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch new file mode 100644 index 00000000..11ce6a84 --- /dev/null +++ b/bsp/buildroot/package/rpcbind/0006-pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch @@ -0,0 +1,31 @@ +From d3f1f55e50e3c436a2ea91d60da84c3a94e6c53f Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Thu, 18 Jan 2018 17:41:49 +0000 +Subject: [PATCH] pmapproc_dump: Fixed typo in memory leak patch + +commit 7ea36eee introduce a typo that caused +NIS (aka ypbind) to fail. + +Signed-off-by: Steve Dickson +(cherry picked from commit c49a7ea639eb700823e174fd605bbbe183e229aa) +Signed-off-by: Ed Blake +--- + src/pmap_svc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pmap_svc.c b/src/pmap_svc.c +index bb57b05..ffca7df 100644 +--- a/src/pmap_svc.c ++++ b/src/pmap_svc.c +@@ -384,7 +384,7 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) + } + + done: +- if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) { ++ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) { + if (debugging) { + (void) xlog(LOG_DEBUG, "unable to free arguments\n"); + if (doabort) { +-- +2.11.0 + diff --git a/bsp/buildroot/package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch b/bsp/buildroot/package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch new file mode 100644 index 00000000..6e71677a --- /dev/null +++ b/bsp/buildroot/package/squid/0003-ESI-make-sure-endofName-never-exceeds-tagEnd-130.patch @@ -0,0 +1,35 @@ +From eb2db98a676321b814fc4a51c4fb7928a8bb45d9 Mon Sep 17 00:00:00 2001 +From: Amos Jeffries +Date: Fri, 19 Jan 2018 13:54:14 +1300 +Subject: [PATCH] ESI: make sure endofName never exceeds tagEnd (#130) + +Signed-off-by: Peter Korsgaard +--- + src/esi/CustomParser.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc +index d86d2d309..db634d921 100644 +--- a/src/esi/CustomParser.cc ++++ b/src/esi/CustomParser.cc +@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool + + char * endofName = strpbrk(const_cast(tag), w_space); + +- if (endofName > tagEnd) ++ if (!endofName || endofName > tagEnd) + endofName = const_cast(tagEnd); + + *endofName = '\0'; +@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool + + char * endofName = strpbrk(const_cast(tag), w_space); + +- if (endofName > tagEnd) ++ if (!endofName || endofName > tagEnd) + endofName = const_cast(tagEnd); + + *endofName = '\0'; +-- +2.11.0 + diff --git a/bsp/buildroot/package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch b/bsp/buildroot/package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch new file mode 100644 index 00000000..51fff300 --- /dev/null +++ b/bsp/buildroot/package/squid/0004-Fix-indirect-IP-logging-for-transactions-without-a-c.patch @@ -0,0 +1,31 @@ +From 8232b83d3fa47a1399f155cb829db829369fbae9 Mon Sep 17 00:00:00 2001 +From: squidadm +Date: Sun, 21 Jan 2018 08:07:08 +1300 +Subject: [PATCH] Fix indirect IP logging for transactions without a client + connection (#129) (#136) + +Signed-off-by: Peter Korsgaard +--- + src/client_side_request.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/client_side_request.cc b/src/client_side_request.cc +index be124f355..203f89d46 100644 +--- a/src/client_side_request.cc ++++ b/src/client_side_request.cc +@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data) + * Ensure that the access log shows the indirect client + * instead of the direct client. + */ +- ConnStateData *conn = http->getConn(); +- conn->log_addr = request->indirect_client_addr; +- http->al->cache.caddr = conn->log_addr; ++ http->al->cache.caddr = request->indirect_client_addr; ++ if (ConnStateData *conn = http->getConn()) ++ conn->log_addr = request->indirect_client_addr; + } + request->x_forwarded_for_iterator.clean(); + request->flags.done_follow_x_forwarded_for = true; +-- +2.11.0 + diff --git a/bsp/buildroot/package/squid/squid.hash b/bsp/buildroot/package/squid/squid.hash index d9b7924d..8787cb25 100644 --- a/bsp/buildroot/package/squid/squid.hash +++ b/bsp/buildroot/package/squid/squid.hash @@ -1,3 +1,5 @@ -# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.24.tar.xz.asc -md5 3fae511e16b6379b61c011914673973d squid-3.5.24.tar.xz -sha1 f203637783301a4b86e554b6dd226de721762ae5 squid-3.5.24.tar.xz +# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.xz.asc +md5 39ef8199675d48a314b540f92c00c545 squid-3.5.27.tar.xz +sha1 1e69c96d13cd49844da3bcf33a0b428fbe7b6f77 squid-3.5.27.tar.xz +# Locally calculated +sha256 58f5d05257af1fb964fde20e134d660fac9afa86b6fd8c70d63ead63068378fa COPYING diff --git a/bsp/buildroot/package/squid/squid.mk b/bsp/buildroot/package/squid/squid.mk index 9abf3cd8..cd91600e 100644 --- a/bsp/buildroot/package/squid/squid.mk +++ b/bsp/buildroot/package/squid/squid.mk @@ -5,7 +5,7 @@ ################################################################################ SQUID_VERSION_MAJOR = 3.5 -SQUID_VERSION = $(SQUID_VERSION_MAJOR).24 +SQUID_VERSION = $(SQUID_VERSION_MAJOR).27 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR) SQUID_LICENSE = GPLv2+ diff --git a/bsp/buildroot/package/tar/tar.mk b/bsp/buildroot/package/tar/tar.mk index 26f113a4..4ba28339 100644 --- a/bsp/buildroot/package/tar/tar.mk +++ b/bsp/buildroot/package/tar/tar.mk @@ -44,4 +44,7 @@ define HOST_TAR_EXTRACT_CMDS mv $(@D)/tar-$(TAR_VERSION)/* $(@D) rmdir $(@D)/tar-$(TAR_VERSION) endef + +HOST_TAR_CONF_OPTS = --without-selinux + $(eval $(host-autotools-package)) diff --git a/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash b/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash index 1c19b33f..1975d8d1 100644 --- a/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash +++ b/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 df85cd1ed3aea12d577854ece11bf5f2af6ace8c39959eea4cf2fa5973924e0e ti_cgt_pru_2.1.3_linux_installer_x86.bin +sha256 7dc37fd689d1d506bf410d2a00af658b93a58d4bc10ac32c2210129dab617377 ti_cgt_pru_2.2.1_linux_installer_x86.bin +sha256 eb646f4f8b14351110992b40ba24d12803bcc150a76e7298705f51088b0a09cc PRU_Code_Generation_Tools_2.2.x_manifest.html +sha256 6b98f9262abd1ae9a3731e6feee02a56b6e290542dea119eeeeaf88bf802aabc pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx diff --git a/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk b/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk index d94f0919..4849543e 100644 --- a/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk +++ b/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk @@ -4,14 +4,14 @@ # ################################################################################ -TI_CGT_PRU_VERSION = 2.1.3 +TI_CGT_PRU_VERSION = 2.2.1 TI_CGT_PRU_SOURCE = ti_cgt_pru_$(TI_CGT_PRU_VERSION)_linux_installer_x86.bin -TI_CGT_PRU_SITE = http://software-dl.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION) +TI_CGT_PRU_SITE = http://downloads.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION) TI_CGT_PRU_LICENSE = TI Technology and Software Publicly Available License (compiler + PRU library), \ Boost Software License 1.0 (compiler), \ BSD-2c, BSD-3c, MIT, Academic Free License 3.0, Hewlett-Packard (PRU library) -TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.1.x_manifest.html \ - PRU_CodeGen_Library_2.1_0222433C-30C1-442d-B5C6-2073BD97F80F.spdx.tag +TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.2.x_manifest.html \ + pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx define HOST_TI_CGT_PRU_EXTRACT_CMDS chmod +x $(DL_DIR)/$(TI_CGT_PRU_SOURCE) diff --git a/bsp/buildroot/package/transmission/transmission.hash b/bsp/buildroot/package/transmission/transmission.hash index 849a722d..4c1c3f9a 100644 --- a/bsp/buildroot/package/transmission/transmission.hash +++ b/bsp/buildroot/package/transmission/transmission.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f transmission-2.92.tar.xz +sha256 8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b transmission-2.93.tar.xz +sha256 20801783bf59e27d03ed6aab625b32a34e221ae95bf801db87827c8023398495 COPYING diff --git a/bsp/buildroot/package/transmission/transmission.mk b/bsp/buildroot/package/transmission/transmission.mk index e4a36805..34b310bf 100644 --- a/bsp/buildroot/package/transmission/transmission.mk +++ b/bsp/buildroot/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 2.92 +TRANSMISSION_VERSION = 2.93 TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_DEPENDENCIES = \ diff --git a/bsp/buildroot/package/util-linux/util-linux.mk b/bsp/buildroot/package/util-linux/util-linux.mk index 05e13989..d7358fe5 100644 --- a/bsp/buildroot/package/util-linux/util-linux.mk +++ b/bsp/buildroot/package/util-linux/util-linux.mk @@ -167,8 +167,37 @@ HOST_UTIL_LINUX_CONF_OPTS += \ ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown -# disable more command because of ncurses dependency -HOST_UTIL_LINUX_CONF_OPTS += --disable-more +# disable commands that have ncurses dependency, as well as +# other ones that are useless on the host +HOST_UTIL_LINUX_CONF_OPTS += \ + --disable-agetty \ + --disable-chfn-chsh \ + --disable-chmem \ + --disable-login \ + --disable-lslogins \ + --disable-mesg \ + --disable-more \ + --disable-newgrp \ + --disable-nologin \ + --disable-nsenter \ + --disable-pg \ + --disable-rfkill \ + --disable-schedutils \ + --disable-setpriv \ + --disable-setterm \ + --disable-su \ + --disable-sulogin \ + --disable-tunelp \ + --disable-ul \ + --disable-unshare \ + --disable-uuidd \ + --disable-vipw \ + --disable-wall \ + --disable-wdctl \ + --disable-write \ + --disable-zramctl +# Used by cramfs utils +HOST_UTIL_LINUX_DEPENDENCIES += host-zlib else HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs endif diff --git a/bsp/buildroot/package/webkitgtk/Config.in b/bsp/buildroot/package/webkitgtk/Config.in index bfe34441..93f286bb 100644 --- a/bsp/buildroot/package/webkitgtk/Config.in +++ b/bsp/buildroot/package/webkitgtk/Config.in @@ -34,6 +34,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_SQLITE diff --git a/bsp/buildroot/package/webkitgtk/webkitgtk.hash b/bsp/buildroot/package/webkitgtk/webkitgtk.hash index 3d64b6f5..dd2b28d3 100644 --- a/bsp/buildroot/package/webkitgtk/webkitgtk.hash +++ b/bsp/buildroot/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.18.4.tar.xz.sums -md5 c4686971eac2760bab685e21ac8849be webkitgtk-2.18.4.tar.xz -sha1 709616b445158dc3163a64bb59e95aadbe58949c webkitgtk-2.18.4.tar.xz -sha256 87b6bb9a6065b949ecbe6191313c43e57ad28efdf1f2b5e763405093520632b8 webkitgtk-2.18.4.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.18.6.tar.xz.sums +md5 c1a548595135ee75ad3bf2e18ac83112 webkitgtk-2.18.6.tar.xz +sha1 fb0daa85142cfe8822de518dfaa7bd5c3cdd6c23 webkitgtk-2.18.6.tar.xz +sha256 93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c webkitgtk-2.18.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/bsp/buildroot/package/webkitgtk/webkitgtk.mk b/bsp/buildroot/package/webkitgtk/webkitgtk.mk index 00f7920a..99b2b499 100644 --- a/bsp/buildroot/package/webkitgtk/webkitgtk.mk +++ b/bsp/buildroot/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.18.4 +WEBKITGTK_VERSION = 2.18.6 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ - libxml2 libxslt sqlite webp + libtasn1 libxml2 libxslt sqlite webp WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ -DENABLE_GEOLOCATION=OFF \ diff --git a/bsp/buildroot/package/wireshark/wireshark.hash b/bsp/buildroot/package/wireshark/wireshark.hash index cffdab2a..93421c64 100644 --- a/bsp/buildroot/package/wireshark/wireshark.hash +++ b/bsp/buildroot/package/wireshark/wireshark.hash @@ -1,2 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.11.txt -sha256 a9f11621e85d7e1d72259157edd94825e72af3fd72e184b8474459f92ad5fc40 wireshark-2.2.11.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.12.txt +sha256 3274458d1bb1658a5001465ecb07c7cbfc709571ef36bd062897570d4bab3ebc wireshark-2.2.12.tar.bz2 +# Locally calculated +sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/bsp/buildroot/package/wireshark/wireshark.mk b/bsp/buildroot/package/wireshark/wireshark.mk index 76c0db38..2bbbbf26 100644 --- a/bsp/buildroot/package/wireshark/wireshark.mk +++ b/bsp/buildroot/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.11 +WIRESHARK_VERSION = 2.2.12 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license diff --git a/bsp/buildroot/package/x11r7/mcookie/mcookie.c b/bsp/buildroot/package/x11r7/mcookie/mcookie.c index 902d92fc..da243f23 100644 --- a/bsp/buildroot/package/x11r7/mcookie/mcookie.c +++ b/bsp/buildroot/package/x11r7/mcookie/mcookie.c @@ -14,7 +14,7 @@ * gather 128 bits of random information, so the magic cookie generated * will be considerably easier to guess than one might expect. * - * 1999-02-22 Arkadiusz Mi¶kiewicz + * 1999-02-22 Arkadiusz Mi�kiewicz * - added Native Language Support * 1999-03-21 aeb: Added some fragments of code from Colin Plumb. * @@ -204,7 +204,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) MD5Transform(ctx->buf, (uint32 *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */ diff --git a/bsp/buildroot/package/xen/xen.mk b/bsp/buildroot/package/xen/xen.mk index 2a87d8f9..66b81dfb 100644 --- a/bsp/buildroot/package/xen/xen.mk +++ b/bsp/buildroot/package/xen/xen.mk @@ -54,6 +54,7 @@ XEN_DEPENDENCIES += argp-standalone endif XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools XEN_MAKE_OPTS += dist-tools +XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl" define XEN_INSTALL_INIT_SYSV mv $(TARGET_DIR)/etc/init.d/xencommons $(TARGET_DIR)/etc/init.d/S50xencommons diff --git a/bsp/buildroot/support/kconfig/Makefile b/bsp/buildroot/support/kconfig/Makefile index 7eb4071b..af620238 100644 --- a/bsp/buildroot/support/kconfig/Makefile +++ b/bsp/buildroot/support/kconfig/Makefile @@ -220,7 +220,8 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) HOSTLOADLIBES_nconf = $(shell \ - pkg-config --libs menu panel ncurses 2>/dev/null \ + pkg-config --libs menuw panelw ncursesw 2>/dev/null \ + || pkg-config --libs menu panel ncurses 2>/dev/null \ || echo "-lmenu -lpanel -lncurses" ) $(obj)/qconf.o: $(obj)/.tmp_qtcheck diff --git a/bsp/buildroot/support/kconfig/patches/18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch b/bsp/buildroot/support/kconfig/patches/18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch new file mode 100644 index 00000000..3ca48d07 --- /dev/null +++ b/bsp/buildroot/support/kconfig/patches/18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch @@ -0,0 +1,45 @@ +From 7285996aa0006d671bb01f0d35991d254b2b2b01 Mon Sep 17 00:00:00 2001 +From: Brian Norris +Date: Wed, 4 Jun 2014 00:52:31 -0700 +Subject: kconfig: nconfig: fix multi-byte UTF handling + +Currently, Kconfig descriptions that use multi-byte UTF-8 characters +(such as MTD_NAND_CAFE) will have their menu entries dropped from the +'make nconfig' ncurses menu, and all subsequent entries in the same +window will be omitted. This seems to be due to the ncurses 'menu' +library, which does not traditionally handle UTF-8 >8-bit characters +properly. + +The ncursesw library ('w' is for "wide") is written to handle these +UTF-8 characters, and is practically a drop-in replacement at the source +level. Use it by default, if available. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=43067 +Signed-off-by: Brian Norris +Cc: "Yann E. MORIN" +Cc: Martin Walch +Acked-by: Sam Ravnborg +Signed-off-by: Michal Marek +--- + scripts/kconfig/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +(limited to 'scripts/kconfig/Makefile') + +diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile +index e7bf38e..c059385 100644 +--- a/scripts/kconfig/Makefile ++++ b/scripts/kconfig/Makefile +@@ -191,7 +191,8 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ + HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) + + HOSTLOADLIBES_nconf = $(shell \ +- pkg-config --libs menu panel ncurses 2>/dev/null \ ++ pkg-config --libs menuw panelw ncursesw 2>/dev/null \ ++ || pkg-config --libs menu panel ncurses 2>/dev/null \ + || echo "-lmenu -lpanel -lncurses" ) + $(obj)/qconf.o: $(obj)/.tmp_qtcheck + +-- +cgit v1.1 + diff --git a/bsp/buildroot/support/kconfig/patches/series b/bsp/buildroot/support/kconfig/patches/series index e25375ea..1a53ba99 100644 --- a/bsp/buildroot/support/kconfig/patches/series +++ b/bsp/buildroot/support/kconfig/patches/series @@ -7,3 +7,4 @@ 15-fix-qconf-moc-rule.patch 16-fix-space-to-de-select-options.patch 17-kconfig-lxdialog-get-ncurses-CFLAGS-with-pkg-config.patch +18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch diff --git a/bsp/buildroot/system/Config.in b/bsp/buildroot/system/Config.in index b47ae438..2d2bb872 100644 --- a/bsp/buildroot/system/Config.in +++ b/bsp/buildroot/system/Config.in @@ -346,12 +346,16 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE config BR2_TARGET_GENERIC_GETTY_TERM string "TERM environment variable" default "vt100" + # currently observed only by busybox and sysvinit + depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV help Specify a TERM type. config BR2_TARGET_GENERIC_GETTY_OPTIONS string "other options to pass to getty" default "" + # currently observed only by busybox and sysvinit + depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV help Any other flags you want to pass to getty, Refer to getty --help for details.