jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-27 06:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update buildroot to 2021.02.5 (#1566)

Browse Source 
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner 2021-10-04 22:00:47 +02:00 committed by GitHub
parent bd6562edf6
commit c5c5b6bcbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
165 changed files with 3543 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
buildroot/CHANGES
View File

@ -1,3 +1,25 @@
2021.02.5, released September 15th, 2021
Important / security related fixes.
Toolchain: Disable fortify support for Microblaze as it is not
currently working.
Updated/fixed packages: alsa-utils, arm-trusted-firmware,
bayer2rgb-neon, belle-sip, busybox, c-ares, cjson, coreutils,
cpio, eigen, environt-setup, fetchmail, fluidsynth,
fontconfig, gd, gdb, gnuradio, gnutls, go, haproxy, ipmiutil,
iputils, jszip, kvm-unit-tests, libarchive, libexif,
libgcrypt, libmodsecurity, libopenssl, librsvg, libshout,
libssh, linux, localedef, mc, mesa3d, mosquitto, netsniff-ng,
nginx, nodejs, ogre, openmpi, openvmtools, php, postgresql,
prelink-cross, prosody, protobuf, python-keyring,
python-matplotlib, python-pillow, python-pyudev,
python-secretstorage, python3, qt5base, samba4, sdl2, sox,
swupdate, sylpheed, tor, uboot-tools, uhd, unbound, vim,
wlroots, xapp_xrdb, xapp_xwd, xen, xenomai, xlib_libXfont2,
xlib_libXft, zip
2021.02.4, released August 10th, 2021
Important / security related fixes.

8
buildroot/Config.in
View File

@ -835,8 +835,15 @@ endchoice
comment "RELocation Read Only (RELRO) needs shared libraries"
depends on !BR2_SHARED_LIBS
config BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
bool
default y
# Microblaze glibc toolchains don't work with Fortify Source enabled
depends on !BR2_microblaze
choice
bool "Buffer-overflow Detection (FORTIFY_SOURCE)"
depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_GLIBC
depends on !BR2_OPTIMIZE_0
help
@ -877,6 +884,7 @@ config BR2_FORTIFY_SOURCE_2
endchoice
comment "Fortify Source needs a glibc toolchain and optimization"
depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0)
endmenu

6
buildroot/Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2021.02"
config BR2_PACKAGE_GNURADIO_PAGER
bool "gnuradio gr-flex support removed"
select BR2_LEGACY
help
gr-flex has been removed from gnuradio since version 3.8.0.0.
config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
bool "sconeserver http::sconesite::image removed"
select BR2_LEGACY

37
buildroot/DEVELOPERS
View File

@ -1024,6 +1024,9 @@ F: package/xapian/
N: Giulio Benetti <giulio.benetti@benettiengineering.com>
F: package/at/
F: package/binutils/
F: package/gcc/
F: package/harfbuzz/
F: package/libfuse3/
F: package/libnspr/
F: package/libnss/
@ -1032,6 +1035,7 @@ F: package/nfs-utils/
F: package/sunxi-mali-mainline/
F: package/sunxi-mali-mainline-driver/
F: package/udisks/
F: toolchain/
N: Gregory Dymarek <gregd72002@gmail.com>
F: package/ding-libs/
@ -1821,36 +1825,6 @@ F: arch/Config.in.xtensa
N: Maxim Kochetkov <fido_max@inbox.ru>
F: package/timescaledb/
N: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
F: package/babeld/
F: package/dante/
F: package/faifa/
F: package/initscripts/
F: package/intel-microcode/
F: package/iucode-tool/
F: package/jasper/
F: package/kodi/
F: package/libass/
F: package/libbluray/
F: package/libcdio/
F: package/libcofi/
F: package/libenca/
F: package/libmodplug/
F: package/libnfs/
F: package/libplist/
F: package/libshairplay/
F: package/linux-zigbee/
F: package/netcat-openbsd/
F: package/open-plc-utils/
F: package/rpi-firmware/
F: package/rpi-userland/
F: package/rtmpdump/
F: package/skeleton/
F: package/systemd/
F: package/systemd-bootchart/
F: package/tinyalsa/
F: package/tinyxml/
N: Michael Durrant <mdurrant@arcturusnetworks.com>
F: board/arcturus/
F: configs/arcturus_ucp1020_defconfig
@ -2500,9 +2474,6 @@ F: configs/rock_pi_n10_defconfig
F: configs/rockpro64_defconfig
F: package/arm-gnu-a-toolchain/
N: Sven Fischer <sven@leiderfischer.de>
F: package/qt5/qt5remoteobjects/
N: Sven Haardiek <sven.haardiek@iotec-gmbh.de>
F: package/lcdproc/
F: package/python-influxdb/

4
buildroot/Makefile
View File

@ -92,9 +92,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2021.02.4
export BR2_VERSION := 2021.02.5
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1628627000
BR2_VERSION_EPOCH = 1631718000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)

5
buildroot/boot/arm-trusted-firmware/Config.in
View File

@ -191,7 +191,10 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL
string
default "none" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
# While newer versions of TF-A support "none" as
# ENABLE_STACK_PROTECTOR value, older versions (e.g 2.0) only
# supported "0" to disable SSP.
default "0" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
default "default" if BR2_SSP_REGULAR
default "strong" if BR2_SSP_STRONG
default "all" if BR2_SSP_ALL

8
buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
View File

@ -51,7 +51,10 @@ endif
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
CROSS_COMPILE="$(TARGET_CROSS)" \
$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM)
ARM_TRUSTED_FIRMWARE_MAKE_ENV += \
$(TARGET_MAKE_ENV) \
ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL))
ifeq ($(BR2_ARM_CPU_ARMV7A),y)
@ -155,7 +158,8 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
$(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
$(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
$(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
endef

6
buildroot/configs/pc_x86_64_bios_defconfig
View File

@ -23,13 +23,13 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg"
# Linux headers same as kernel, a 4.18 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
# Linux headers same as kernel, a 4.19 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config"
BR2_LINUX_KERNEL_INSTALL_TARGET=y

6
buildroot/configs/pc_x86_64_efi_defconfig
View File

@ -25,13 +25,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh"
# Linux headers same as kernel, a 4.18 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
# Linux headers same as kernel, a 4.19 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config"
BR2_LINUX_KERNEL_INSTALL_TARGET=y

2
buildroot/docs/manual/adding-packages-qmake.txt
View File

@ -80,6 +80,6 @@ also be defined.
to the +make+ command during the target installation step. By default,
+install+.
* +LIBFOO_SYNC_HEADERS+, to run syncqt.pl before qmake. Some packages
* +LIBFOO_SYNC_QT_HEADERS+, to run syncqt.pl before qmake. Some packages
need this to have a properly populated include directory before
running the build.

8
buildroot/docs/manual/manual.html
View File

File diff suppressed because one or more lines are too long

BIN
buildroot/docs/manual/manual.pdf
View File

Binary file not shown.

12
buildroot/docs/manual/manual.text
View File

@ -174,13 +174,13 @@ List of Examples
---------------------------------------------------------------------
Buildroot 2021.02.4 manual generated on 2021-08-10 20:33:55 UTC from
git revision 004a792dcf
Buildroot 2021.02.5 manual generated on 2021-09-15 15:21:07 UTC from
git revision 767a2da72f
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=
004a792dcf10e6c474070c9571f7504411e786cc] file in the Buildroot
767a2da72fc1690fde33b665851f20492ba5cd75] file in the Buildroot
sources for the full text of this license.
Copyright © 2004-2020 The Buildroot developers
@ -6517,9 +6517,9 @@ also be defined.
* LIBFOO_INSTALL_TARGET_OPTS, to specify additional targets to pass
to the make command during the target installation step. By
default, install.
* LIBFOO_SYNC_HEADERS, to run syncqt.pl before qmake. Some packages
need this to have a properly populated include directory before
running the build.
* LIBFOO_SYNC_QT_HEADERS, to run syncqt.pl before qmake. Some
packages need this to have a properly populated include directory
before running the build.
18.19. Infrastructure for packages building kernel modules

10
buildroot/linux/Config.in
View File

@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION
bool "Latest version (5.10)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (4.19.182-cip45)"
bool "Latest CIP SLTS version (4.19.198-cip54)"
help
CIP launched in the spring of 2016 to address the needs of
organizations in industries such as power generation and
@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
https://www.cip-project.org
config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
bool "Latest CIP RT SLTS version (4.19.165-cip41-rt18)"
bool "Latest CIP RT SLTS version (4.19.198-cip54-rt21)"
help
Same as the CIP version, but this is the PREEMPT_RT realtime
variant.
@ -125,9 +125,9 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "5.10.57" if BR2_LINUX_KERNEL_LATEST_VERSION
default "4.19.182-cip45" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "4.19.165-cip41-rt18" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default "5.10.64" if BR2_LINUX_KERNEL_LATEST_VERSION
default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

16
buildroot/linux/linux.hash
View File

@ -1,14 +1,14 @@
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d linux-5.10.57.tar.xz
sha256 0471d0ccb7953cdae7d235192588ac5d72344851969962676d1703e69084a37f linux-5.4.139.tar.xz
sha256 3eb84bd24a2de2b4749314e34597c02401c5d6831b055ed5224adb405c35e30a linux-5.10.64.tar.xz
sha256 5cf7782ec2e91417edf0d5e6555da6d556962c8985e33ba9e7dadba5cbdc68f9 linux-5.4.145.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 4bdf66494be66a1da857f09b40b95026a0388e373fb01a206c60f67834746cb4 linux-4.4.279.tar.xz
sha256 21edb57dea0fe04a51fcfb6d4e8c0c052787a20015bc74a0a0e63329601f2e07 linux-4.9.279.tar.xz
sha256 7f235d454d703112e86574150652807f42abead92f3837da32ea86b4f148b371 linux-4.14.243.tar.xz
sha256 f2827d0506622fcae0dae0bc72b2f016469210f50c2d3dd1bdd1211a813dca27 linux-4.19.202.tar.xz
sha256 02252f0002e65306f6765089e8bb51f621f4eaea974348c31991b0c508243bb5 linux-4.4.283.tar.xz
sha256 67727389771a858406f773b4db62d7d3248209e26120df47507ea4a8898d2e15 linux-4.9.282.tar.xz
sha256 9c5612ef428441b7c85cf211a455c06ce695b81a9a40c064d0ea424dd08bef3a linux-4.14.246.tar.xz
sha256 b7eb776f408b3ea71c97dde4888cc4549edf925a18cd158e7c9681d6ffa684c0 linux-4.19.206.tar.xz
# Locally computed
sha256 9f1de83c5c2bb582a33bd4ee892d45671901cd06af9dc159f0f499f1b5265b20 linux-cip-4.19.182-cip45.tar.gz
sha256 0eeba6d6ecc45cf8f16458842b64d22e7064b9de9c31c11d1c395b08a47e3855 linux-cip-4.19.165-cip41-rt18.tar.gz
sha256 e6fc0a999a180ad272b08ff71cbc67f2d3fdc6773d4a8069aefb8781b8e07821 linux-cip-4.19.198-cip54.tar.gz
sha256 449668d678e458ddaf30f944b7ca7f5ce6ea6664f57d43ea4eb90b176e03b9cb linux-cip-4.19.198-cip54-rt21.tar.gz
# Licenses hashes
sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING

1
buildroot/package/alsa-utils/alsa-utils.mk
View File

@ -77,7 +77,6 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS
fi
if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
mkdir -p $(TARGET_DIR)/usr/share/; \
rm -rf $(TARGET_DIR)/usr/share/alsa/; \
cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
fi
endef

2
buildroot/package/bayer2rgb-neon/Config.in
View File

@ -9,7 +9,7 @@ config BR2_PACKAGE_BAYER2RGB_NEON
to decode raw camera bayer to RGB using
NEON hardware acceleration.
https://git.phytec.de/bayer2rgb-neon/
https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb
comment "bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9"
depends on BR2_arm && BR2_ARM_CPU_HAS_NEON

1
buildroot/package/belle-sip/belle-sip.mk
View File

@ -9,6 +9,7 @@ BELLE_SIP_SITE = \
https://gitlab.linphone.org/BC/public/belle-sip/-/archive/$(BELLE_SIP_VERSION)
BELLE_SIP_LICENSE = GPL-3.0+
BELLE_SIP_LICENSE_FILES = LICENSE.txt
BELLE_SIP_CPE_ID_VENDOR = linphone
BELLE_SIP_INSTALL_STAGING = YES
BELLE_SIP_DEPENDENCIES = \
bctoolbox \

5
buildroot/package/busybox/udhcpc.script
View File

@ -4,6 +4,7 @@
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
ACTION="$1"
RESOLV_CONF="/etc/resolv.conf"
[ -e $RESOLV_CONF ] || touch $RESOLV_CONF
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
@ -29,7 +30,7 @@ wait_for_ipv6_default_route() {
printf " timeout!\n"
}
case "$1" in
case "$ACTION" in
deconfig)
/sbin/ifconfig $interface up
/sbin/ifconfig $interface 0.0.0.0
@ -115,7 +116,7 @@ esac
HOOK_DIR="$0.d"
for hook in "${HOOK_DIR}/"*; do
[ -f "${hook}" -a -x "${hook}" ] || continue
"${hook}" "${@}"
"${hook}" "$ACTION"
done
exit 0

1115
buildroot/package/c-ares/0001-Provide-ares_nameser-h-as-a-public-interface.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
buildroot/package/c-ares/c-ares.hash
View File

@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
sha256 d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40 c-ares-1.17.1.tar.gz
sha256 4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d c-ares-1.17.2.tar.gz
# Hash for license file
sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md

5
buildroot/package/c-ares/c-ares.mk
View File

@ -4,12 +4,15 @@
#
################################################################################
C_ARES_VERSION = 1.17.1
C_ARES_VERSION = 1.17.2
C_ARES_SITE = http://c-ares.haxx.se/download
C_ARES_INSTALL_STAGING = YES
C_ARES_CONF_OPTS = --with-random=/dev/urandom
C_ARES_LICENSE = MIT
C_ARES_LICENSE_FILES = LICENSE.md
C_ARES_CPE_ID_VENDOR = c-ares_project
# We're patching configure.ac
C_ARES_AUTORECONF = YES
$(eval $(autotools-package))
$(eval $(host-autotools-package))

2
buildroot/package/cjson/cjson.hash
View File

@ -1,3 +1,3 @@
# Locally computed:
sha256 d4e77a38f540f2c37f55758f2666655314f1f51c716fea5f279659940efdcf04 cjson-1.7.13.tar.gz
sha256 5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 cjson-1.7.15.tar.gz
sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE

2
buildroot/package/cjson/cjson.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
CJSON_VERSION = 1.7.13
CJSON_VERSION = 1.7.15
CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION))
CJSON_INSTALL_STAGING = YES
CJSON_LICENSE = MIT

6
buildroot/package/coreutils/coreutils.mk
View File

@ -154,7 +154,8 @@ COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION
# Explicitly install ln and realpath, which we *are* insterested in.
# A lot of other programs still get installed, however, but disabling
# them does not gain much at build time, and is a loooong list that is
# difficult to maintain...
# difficult to maintain... Just avoid overwriting fakedate when creating
# a reproducible build
HOST_COREUTILS_CONF_OPTS = \
--disable-acl \
--disable-libcap \
@ -162,7 +163,8 @@ HOST_COREUTILS_CONF_OPTS = \
--disable-single-binary \
--disable-xattr \
--without-gmp \
--enable-install-program=ln,realpath
--enable-install-program=ln,realpath \
--enable-no-install-program=date
$(eval $(autotools-package))
$(eval $(host-autotools-package))

461
buildroot/package/cpio/0002-Rewrite-dynamic-string-support.patch Normal file
View File

@ -0,0 +1,461 @@
From dd96882877721703e19272fe25034560b794061b Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Sat, 7 Aug 2021 12:52:21 +0300
Subject: Rewrite dynamic string support.
* src/dstring.c (ds_init): Take a single argument.
(ds_free): New function.
(ds_resize): Take a single argument. Use x2nrealloc to expand
the storage.
(ds_reset,ds_append,ds_concat,ds_endswith): New function.
(ds_fgetstr): Rewrite. In particular, this fixes integer overflow.
* src/dstring.h (dynamic_string): Keep both the allocated length
(ds_size) and index of the next free byte in the string (ds_idx).
(ds_init,ds_resize): Change signature.
(ds_len): New macro.
(ds_free,ds_reset,ds_append,ds_concat,ds_endswith): New protos.
* src/copyin.c: Use new ds_ functions.
* src/copyout.c: Likewise.
* src/copypass.c: Likewise.
* src/util.c: Likewise.
[Retrieved from:
https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dd96882877721703e19272fe25034560b794061b]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/copyin.c | 40 +++++++++++++-------------
src/copyout.c | 16 ++++-------
src/copypass.c | 34 +++++++++++------------
src/dstring.c | 88 ++++++++++++++++++++++++++++++++++++++++++----------------
src/dstring.h | 31 ++++++++++-----------
src/util.c | 6 ++--
6 files changed, 123 insertions(+), 92 deletions(-)
diff --git a/src/copyin.c b/src/copyin.c
index a096048..4fb14af 100644
--- a/src/copyin.c
+++ b/src/copyin.c
@@ -55,11 +55,12 @@ query_rename(struct cpio_file_stat* file_hdr, FILE *tty_in, FILE *tty_out,
char *str_res; /* Result for string function. */
static dynamic_string new_name; /* New file name for rename option. */
static int initialized_new_name = false;
+
if (!initialized_new_name)
- {
- ds_init (&new_name, 128);
- initialized_new_name = true;
- }
+ {
+ ds_init (&new_name);
+ initialized_new_name = true;
+ }
if (rename_flag)
{
@@ -780,37 +781,36 @@ long_format (struct cpio_file_stat *file_hdr, char const *link_name)
already in `save_patterns' (from the command line) are preserved. */
static void
-read_pattern_file ()
+read_pattern_file (void)
{
- int max_new_patterns;
- char **new_save_patterns;
- int new_num_patterns;
+ char **new_save_patterns = NULL;
+ size_t max_new_patterns;
+ size_t new_num_patterns;
int i;
- dynamic_string pattern_name;
+ dynamic_string pattern_name = DYNAMIC_STRING_INITIALIZER;
FILE *pattern_fp;
if (num_patterns < 0)
num_patterns = 0;
- max_new_patterns = 1 + num_patterns;
- new_save_patterns = (char **) xmalloc (max_new_patterns * sizeof (char *));
new_num_patterns = num_patterns;
- ds_init (&pattern_name, 128);
+ max_new_patterns = num_patterns;
+ new_save_patterns = xcalloc (max_new_patterns, sizeof (new_save_patterns[0]));
pattern_fp = fopen (pattern_file_name, "r");
if (pattern_fp == NULL)
open_fatal (pattern_file_name);
while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
{
- if (new_num_patterns >= max_new_patterns)
- {
- max_new_patterns += 1;
- new_save_patterns = (char **)
- xrealloc ((char *) new_save_patterns,
- max_new_patterns * sizeof (char *));
- }
+ if (new_num_patterns == max_new_patterns)
+ new_save_patterns = x2nrealloc (new_save_patterns,
+ &max_new_patterns,
+ sizeof (new_save_patterns[0]));
new_save_patterns[new_num_patterns] = xstrdup (pattern_name.ds_string);
++new_num_patterns;
}
+
+ ds_free (&pattern_name);
+
if (ferror (pattern_fp) || fclose (pattern_fp) == EOF)
close_error (pattern_file_name);
@@ -1210,7 +1210,7 @@ swab_array (char *ptr, int count)
in the file system. */
void
-process_copy_in ()
+process_copy_in (void)
{
FILE *tty_in = NULL; /* Interactive file for rename option. */
FILE *tty_out = NULL; /* Interactive file for rename option. */
diff --git a/src/copyout.c b/src/copyout.c
index 5ca587f..ca6798c 100644
--- a/src/copyout.c
+++ b/src/copyout.c
@@ -594,9 +594,10 @@ assign_string (char **pvar, char *value)
The format of the header depends on the compatibility (-c) flag. */
void
-process_copy_out ()
+process_copy_out (void)
{
- dynamic_string input_name; /* Name of file read from stdin. */
+ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
+ /* Name of file read from stdin. */
struct stat file_stat; /* Stat record for file. */
struct cpio_file_stat file_hdr = CPIO_FILE_STAT_INITIALIZER;
/* Output header information. */
@@ -605,7 +606,6 @@ process_copy_out ()
char *orig_file_name = NULL;
/* Initialize the copy out. */
- ds_init (&input_name, 128);
file_hdr.c_magic = 070707;
/* Check whether the output file might be a tape. */
@@ -657,14 +657,9 @@ process_copy_out ()
{
if (file_hdr.c_mode & CP_IFDIR)
{
- int len = strlen (input_name.ds_string);
/* Make sure the name ends with a slash */
- if (input_name.ds_string[len-1] != '/')
- {
- ds_resize (&input_name, len + 2);
- input_name.ds_string[len] = '/';
- input_name.ds_string[len+1] = 0;
- }
+ if (!ds_endswith (&input_name, '/'))
+ ds_append (&input_name, '/');
}
}
@@ -875,6 +870,7 @@ process_copy_out ()
(unsigned long) blocks), (unsigned long) blocks);
}
cpio_file_stat_free (&file_hdr);
+ ds_free (&input_name);
}
diff --git a/src/copypass.c b/src/copypass.c
index 5d5e939..23ee687 100644
--- a/src/copypass.c
+++ b/src/copypass.c
@@ -48,10 +48,12 @@ set_copypass_perms (int fd, const char *name, struct stat *st)
If `link_flag', link instead of copying. */
void
-process_copy_pass ()
+process_copy_pass (void)
{
- dynamic_string input_name; /* Name of file from stdin. */
- dynamic_string output_name; /* Name of new file. */
+ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER;
+ /* Name of file from stdin. */
+ dynamic_string output_name = DYNAMIC_STRING_INITIALIZER;
+ /* Name of new file. */
size_t dirname_len; /* Length of `directory_name'. */
int res; /* Result of functions. */
char *slash; /* For moving past slashes in input name. */
@@ -65,25 +67,18 @@ process_copy_pass ()
created files */
/* Initialize the copy pass. */
- ds_init (&input_name, 128);
dirname_len = strlen (directory_name);
if (change_directory_option && !ISSLASH (directory_name[0]))
{
char *pwd = xgetcwd ();
-
- dirname_len += strlen (pwd) + 1;
- ds_init (&output_name, dirname_len + 2);
- strcpy (output_name.ds_string, pwd);
- strcat (output_name.ds_string, "/");
- strcat (output_name.ds_string, directory_name);
+
+ ds_concat (&output_name, pwd);
+ ds_append (&output_name, '/');
}
- else
- {
- ds_init (&output_name, dirname_len + 2);
- strcpy (output_name.ds_string, directory_name);
- }
- output_name.ds_string[dirname_len] = '/';
+ ds_concat (&output_name, directory_name);
+ ds_append (&output_name, '/');
+ dirname_len = ds_len (&output_name);
output_is_seekable = true;
change_dir ();
@@ -116,8 +111,8 @@ process_copy_pass ()
/* Make the name of the new file. */
for (slash = input_name.ds_string; *slash == '/'; ++slash)
;
- ds_resize (&output_name, dirname_len + strlen (slash) + 2);
- strcpy (output_name.ds_string + dirname_len + 1, slash);
+ ds_reset (&output_name, dirname_len);
+ ds_concat (&output_name, slash);
existing_dir = false;
if (lstat (output_name.ds_string, &out_file_stat) == 0)
@@ -333,6 +328,9 @@ process_copy_pass ()
(unsigned long) blocks),
(unsigned long) blocks);
}
+
+ ds_free (&input_name);
+ ds_free (&output_name);
}
/* Try and create a hard link from FILE_NAME to another file
diff --git a/src/dstring.c b/src/dstring.c
index b261d5a..692d3e7 100644
--- a/src/dstring.c
+++ b/src/dstring.c
@@ -20,8 +20,8 @@
#if defined(HAVE_CONFIG_H)
# include <config.h>
#endif
-
#include <stdio.h>
+#include <stdlib.h>
#if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
#include <string.h>
#else
@@ -33,24 +33,41 @@
/* Initialiaze dynamic string STRING with space for SIZE characters. */
void
-ds_init (dynamic_string *string, int size)
+ds_init (dynamic_string *string)
+{
+ memset (string, 0, sizeof *string);
+}
+
+/* Free the dynamic string storage. */
+
+void
+ds_free (dynamic_string *string)
{
- string->ds_length = size;
- string->ds_string = (char *) xmalloc (size);
+ free (string->ds_string);
}
-/* Expand dynamic string STRING, if necessary, to hold SIZE characters. */
+/* Expand dynamic string STRING, if necessary. */
void
-ds_resize (dynamic_string *string, int size)
+ds_resize (dynamic_string *string)
{
- if (size > string->ds_length)
+ if (string->ds_idx == string->ds_size)
{
- string->ds_length = size;
- string->ds_string = (char *) xrealloc ((char *) string->ds_string, size);
+ string->ds_string = x2nrealloc (string->ds_string, &string->ds_size,
+ 1);
}
}
+/* Reset the index of the dynamic string S to LEN. */
+
+void
+ds_reset (dynamic_string *s, size_t len)
+{
+ while (len > s->ds_size)
+ ds_resize (s);
+ s->ds_idx = len;
+}
+
/* Dynamic string S gets a string terminated by the EOS character
(which is removed) from file F. S will increase
in size during the function if the string from F is longer than
@@ -61,34 +78,50 @@ ds_resize (dynamic_string *string, int size)
char *
ds_fgetstr (FILE *f, dynamic_string *s, char eos)
{
- int insize; /* Amount needed for line. */
- int strsize; /* Amount allocated for S. */
int next_ch;
/* Initialize. */
- insize = 0;
- strsize = s->ds_length;
+ s->ds_idx = 0;
/* Read the input string. */
- next_ch = getc (f);
- while (next_ch != eos && next_ch != EOF)
+ while ((next_ch = getc (f)) != eos && next_ch != EOF)
{
- if (insize >= strsize - 1)
- {
- ds_resize (s, strsize * 2 + 2);
- strsize = s->ds_length;
- }
- s->ds_string[insize++] = next_ch;
- next_ch = getc (f);
+ ds_resize (s);
+ s->ds_string[s->ds_idx++] = next_ch;
}
- s->ds_string[insize++] = '\0';
+ ds_resize (s);
+ s->ds_string[s->ds_idx] = '\0';
- if (insize == 1 && next_ch == EOF)
+ if (s->ds_idx == 0 && next_ch == EOF)
return NULL;
else
return s->ds_string;
}
+void
+ds_append (dynamic_string *s, int c)
+{
+ ds_resize (s);
+ s->ds_string[s->ds_idx] = c;
+ if (c)
+ {
+ s->ds_idx++;
+ ds_resize (s);
+ s->ds_string[s->ds_idx] = 0;
+ }
+}
+
+void
+ds_concat (dynamic_string *s, char const *str)
+{
+ size_t len = strlen (str);
+ while (len + 1 > s->ds_size)
+ ds_resize (s);
+ memcpy (s->ds_string + s->ds_idx, str, len);
+ s->ds_idx += len;
+ s->ds_string[s->ds_idx] = 0;
+}
+
char *
ds_fgets (FILE *f, dynamic_string *s)
{
@@ -100,3 +133,10 @@ ds_fgetname (FILE *f, dynamic_string *s)
{
return ds_fgetstr (f, s, '\0');
}
+
+/* Return true if the dynamic string S ends with character C. */
+int
+ds_endswith (dynamic_string *s, int c)
+{
+ return (s->ds_idx > 0 && s->ds_string[s->ds_idx - 1] == c);
+}
diff --git a/src/dstring.h b/src/dstring.h
index 5d24181..ca7a5f1 100644
--- a/src/dstring.h
+++ b/src/dstring.h
@@ -17,10 +17,6 @@
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA. */
-#ifndef NULL
-#define NULL 0
-#endif
-
/* A dynamic string consists of record that records the size of an
allocated string and the pointer to that string. The actual string
is a normal zero byte terminated string that can be used with the
@@ -30,22 +26,25 @@
typedef struct
{
- int ds_length; /* Actual amount of storage allocated. */
- char *ds_string; /* String. */
+ size_t ds_size; /* Actual amount of storage allocated. */
+ size_t ds_idx; /* Index of the next free byte in the string. */
+ char *ds_string; /* String storage. */
} dynamic_string;
+#define DYNAMIC_STRING_INITIALIZER { 0, 0, NULL }
-/* Macros that look similar to the original string functions.
- WARNING: These macros work only on pointers to dynamic string records.
- If used with a real record, an "&" must be used to get the pointer. */
-#define ds_strlen(s) strlen ((s)->ds_string)
-#define ds_strcmp(s1, s2) strcmp ((s1)->ds_string, (s2)->ds_string)
-#define ds_strncmp(s1, s2, n) strncmp ((s1)->ds_string, (s2)->ds_string, n)
-#define ds_index(s, c) index ((s)->ds_string, c)
-#define ds_rindex(s, c) rindex ((s)->ds_string, c)
+void ds_init (dynamic_string *string);
+void ds_free (dynamic_string *string);
+void ds_reset (dynamic_string *s, size_t len);
-void ds_init (dynamic_string *string, int size);
-void ds_resize (dynamic_string *string, int size);
+/* All functions below guarantee that s->ds_string[s->ds_idx] == '\0' */
char *ds_fgetname (FILE *f, dynamic_string *s);
char *ds_fgets (FILE *f, dynamic_string *s);
char *ds_fgetstr (FILE *f, dynamic_string *s, char eos);
+void ds_append (dynamic_string *s, int c);
+void ds_concat (dynamic_string *s, char const *str);
+
+#define ds_len(s) ((s)->ds_idx)
+
+int ds_endswith (dynamic_string *s, int c);
+
diff --git a/src/util.c b/src/util.c
index 996d4fa..ff2746d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -846,11 +846,9 @@ get_next_reel (int tape_des)
FILE *tty_out; /* File for interacting with user. */
int old_tape_des;
char *next_archive_name;
- dynamic_string new_name;
+ dynamic_string new_name = DYNAMIC_STRING_INITIALIZER;
char *str_res;
- ds_init (&new_name, 128);
-
/* Open files for interactive communication. */
tty_in = fopen (TTY_NAME, "r");
if (tty_in == NULL)
@@ -925,7 +923,7 @@ get_next_reel (int tape_des)
error (PAXEXIT_FAILURE, 0, _("internal error: tape descriptor changed from %d to %d"),
old_tape_des, tape_des);
- free (new_name.ds_string);
+ ds_free (&new_name);
fclose (tty_in);
fclose (tty_out);
}
--
cgit v1.2.1

40
buildroot/package/cpio/0003-Fix-previous-commit.patch Normal file
View File

@ -0,0 +1,40 @@
From dfc801c44a93bed7b3951905b188823d6a0432c8 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Wed, 11 Aug 2021 18:10:38 +0300
Subject: Fix previous commit
* src/dstring.c (ds_reset,ds_concat): Don't call ds_resize in a
loop.
[Retrieved from:
https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dfc801c44a93bed7b3951905b188823d6a0432c8]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/dstring.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/dstring.c b/src/dstring.c
index 692d3e7..b7e0bb5 100644
--- a/src/dstring.c
+++ b/src/dstring.c
@@ -64,7 +64,7 @@ void
ds_reset (dynamic_string *s, size_t len)
{
while (len > s->ds_size)
- ds_resize (s);
+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
s->ds_idx = len;
}
@@ -116,7 +116,7 @@ ds_concat (dynamic_string *s, char const *str)
{
size_t len = strlen (str);
while (len + 1 > s->ds_size)
- ds_resize (s);
+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1);
memcpy (s->ds_string + s->ds_idx, str, len);
s->ds_idx += len;
s->ds_string[s->ds_idx] = 0;
--
cgit v1.2.1

4
buildroot/package/cpio/cpio.mk
View File

@ -12,6 +12,10 @@ CPIO_LICENSE = GPL-3.0+
CPIO_LICENSE_FILES = COPYING
CPIO_CPE_ID_VENDOR = gnu
# 0002-Rewrite-dynamic-string-support.patch
# 0003-Fix-previous-commit.patch
CPIO_IGNORE_CVES += CVE-2021-38185
# cpio uses argp.h which is not provided by uclibc or musl by default.
# Use the argp-standalone package to provide this.
ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)

3
buildroot/package/eigen/eigen.mk
View File

@ -15,6 +15,7 @@ EIGEN_SUPPORTS_IN_SOURCE_BUILD = NO
# Default Eigen CMake installs .pc file in /usr/share/pkgconfig
# change it to /usr/lib/pkgconfig, to be consistent with other packages.
EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig
EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig \
-DCMAKE_Fortran_COMPILER=$(TARGET_FC)
$(eval $(cmake-package))

6
buildroot/package/environment-setup/environment-setup
View File

@ -16,4 +16,10 @@ Some tips:
* To build CMake-based projects, use the "cmake" alias
EOF
if [ x"$BASH_VERSION" != x"" ] ; then
SDK_PATH=$(dirname $(realpath "${BASH_SOURCE[0]}"))
elif [ x"$ZSH_VERSION" != x"" ] ; then
SDK_PATH=$(dirname $(realpath $0))
else
echo "unsupported shell"
fi

4
buildroot/package/fetchmail/fetchmail.hash
View File

@ -1,6 +1,6 @@
# From https://sourceforge.net/p/fetchmail/mailman/message/37327392/
sha256 c82141ae2e8f0039ceb0c5c2eda43c5e93ad0bf7f9c6bb628092b3be74386176 fetchmail-6.4.20.tar.xz
sha256 6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d fetchmail-6.4.21.tar.xz
# From https://sourceforge.net/projects/fetchmail/files/branch_6.4/
sha1 ac6a6c4afa105e097d025340cf78b32e0c3b0c8e fetchmail-6.4.20.tar.xz
sha1 a264c50256c2b42d2c7893f9efae7c9a29350786 fetchmail-6.4.21.tar.xz
# Locally computed:
sha256 6346b5aa04e258fa4326272ea92372d796b4382aa963535ae98a3bb5f8cd5aeb COPYING

2
buildroot/package/fetchmail/fetchmail.mk
View File

@ -5,7 +5,7 @@
################################################################################
FETCHMAIL_VERSION_MAJOR = 6.4
FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).20
FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).21
FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz
FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR)
FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING

2
buildroot/package/fluidsynth/fluidsynth.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 b539b7c65a650b56f01cd60a4e83c6125c217c5a63c0c214ef6274894a677d00 fluidsynth-2.1.5.tar.gz
sha256 365642cc64bafe0491149ad643ef7327877f99412d5abb93f1fa54e252028484 fluidsynth-2.1.9.tar.gz
sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE

2
buildroot/package/fluidsynth/fluidsynth.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
FLUIDSYNTH_VERSION = 2.1.5
FLUIDSYNTH_VERSION = 2.1.9
FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION))
FLUIDSYNTH_LICENSE = LGPL-2.1+
FLUIDSYNTH_LICENSE_FILES = LICENSE

7
buildroot/package/fontconfig/fontconfig.mk
View File

@ -10,9 +10,12 @@ FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2
# 0002-add-pthread-as-a-dependency-of-a-static-lib.patch
FONTCONFIG_AUTORECONF = YES
FONTCONFIG_INSTALL_STAGING = YES
FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf util-linux
FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \
$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \
$(TARGET_NLS_DEPENDENCIES)
HOST_FONTCONFIG_DEPENDENCIES = \
host-freetype host-expat host-pkgconf host-gperf host-util-linux
host-freetype host-expat host-pkgconf host-gperf host-util-linux \
host-gettext
FONTCONFIG_LICENSE = fontconfig license
FONTCONFIG_LICENSE_FILES = COPYING
FONTCONFIG_CPE_ID_VENDOR = fontconfig_project

4
buildroot/package/gd/gd.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58 libgd-2.3.0.tar.xz
sha256 4d80b4af6c38d7a65128c881623dee2a5daee6b3a6ccab74a5cdfa0dfda96da7 COPYING
sha256 3fe822ece20796060af63b7c60acb151e5844204d289da0ce08f8fdf131e5a61 libgd-2.3.3.tar.xz
sha256 005f4b6b0141d1bd11d371bbf7d4f67947f85a4906b7f5465f942204cf918ba3 COPYING

2
buildroot/package/gd/gd.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GD_VERSION = 2.3.0
GD_VERSION = 2.3.3
GD_SOURCE = libgd-$(GD_VERSION).tar.xz
GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION)
GD_INSTALL_STAGING = YES

0
buildroot/package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch → buildroot/package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
View File

0
buildroot/package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch → buildroot/package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
View File

0
buildroot/package/gdb/10.1/0003-use-asm-sgidefs.h.patch → buildroot/package/gdb/10.2/0003-use-asm-sgidefs.h.patch
View File

0
buildroot/package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch → buildroot/package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch
View File

0
buildroot/package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch → buildroot/package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch
View File

2
buildroot/package/gdb/Config.in.host
View File

@ -88,5 +88,5 @@ config BR2_GDB_VERSION
default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky
default "8.3.1" if BR2_GDB_VERSION_8_3
default "9.2" if BR2_GDB_VERSION_9_2 || !BR2_PACKAGE_HOST_GDB
default "10.1" if BR2_GDB_VERSION_10
default "10.2" if BR2_GDB_VERSION_10
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB

2
buildroot/package/gdb/gdb.hash
View File

@ -1,7 +1,7 @@
# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum
sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz
sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz
sha512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz
sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz
# Locally calculated (fetched from Github)
sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz

6
buildroot/package/gnuradio/Config.in
View File

@ -130,12 +130,6 @@ config BR2_PACKAGE_GNURADIO_FILTER
help
Filter signal processing blocks
config BR2_PACKAGE_GNURADIO_PAGER
bool "gr-flex support"
select BR2_PACKAGE_GNURADIO_ANALOG
help
FLEX pager decoder implementation blocks
config BR2_PACKAGE_GNURADIO_QTGUI
bool "gr-qtgui"
depends on BR2_PACKAGE_GNURADIO_PYTHON

6
buildroot/package/gnuradio/gnuradio.mk
View File

@ -130,12 +130,6 @@ else
GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y)
GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=ON
else
GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y)
GNURADIO_DEPENDENCIES += qt5base python-pyqt5 qwt
GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON

2
buildroot/package/gnutls/Config.in
View File

@ -12,7 +12,7 @@ config BR2_PACKAGE_GNUTLS
GnuTLS is a secure communications library implementing the SSL
and TLS protocols and technologies around them.
http://www.gnutls.org
https://www.gnutls.org/
if BR2_PACKAGE_GNUTLS

4
buildroot/package/gnutls/gnutls.hash
View File

@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.1.tar.xz.sig
sha256 3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f gnutls-3.7.1.tar.xz
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz.sig
sha256 646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752 gnutls-3.7.2.tar.xz
# Locally calculated
sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER

2
buildroot/package/gnutls/gnutls.mk
View File

@ -5,7 +5,7 @@
################################################################################
GNUTLS_VERSION_MAJOR = 3.7
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).1
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
GNUTLS_LICENSE = LGPL-2.1+ (core library)

2
buildroot/package/go/go.hash
View File

@ -1,3 +1,3 @@
# From https://golang.org/dl/
sha256 0662ae3813330280d5f1a97a2ee23bbdbe3a5a7cfa6001b24a9873a19a0dc7ec go1.15.15.src.tar.gz
sha256 8f2a8c24b793375b3243df82fdb0c8387486dcc8a892ca1c991aa99ace086b98 go1.16.8.src.tar.gz
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE

7
buildroot/package/go/go.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GO_VERSION = 1.15.15
GO_VERSION = 1.16.8
GO_SITE = https://storage.googleapis.com/golang
GO_SOURCE = go$(GO_VERSION).src.tar.gz
@ -49,6 +49,10 @@ else ifeq ($(BR2_aarch64),y)
GO_GOARCH = arm64
else ifeq ($(BR2_i386),y)
GO_GOARCH = 386
# i386: use softfloat if no SSE2: https://golang.org/doc/go1.16#386
ifneq ($(BR2_X86_CPU_HAS_SSE2),y)
GO_GO386 = softfloat
endif
else ifeq ($(BR2_x86_64),y)
GO_GOARCH = amd64
else ifeq ($(BR2_powerpc64),y)
@ -90,6 +94,7 @@ HOST_GO_CROSS_ENV = \
CC_FOR_TARGET="$(TARGET_CC)" \
CXX_FOR_TARGET="$(TARGET_CXX)" \
GOARCH=$(GO_GOARCH) \
$(if $(GO_GO386),GO386=$(GO_GO386)) \
$(if $(GO_GOARM),GOARM=$(GO_GOARM)) \
GO_ASSUME_CROSSCOMPILING=1

4
buildroot/package/haproxy/haproxy.hash
View File

@ -1,5 +1,5 @@
# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.14.tar.gz.sha256
sha256 6a9b702f04b07786f3e5878de8172a727acfdfdbc1cefe1c7a438df372f2fb61 haproxy-2.2.14.tar.gz
# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.17.tar.gz.sha256
sha256 68af4aa3807d9c9f29b976d0ed57fb2e06acf7a185979059584862cc20d85be0 haproxy-2.2.17.tar.gz
# Locally computed:
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt

2
buildroot/package/haproxy/haproxy.mk
View File

@ -5,7 +5,7 @@
################################################################################
HAPROXY_VERSION_MAJOR = 2.2
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).17
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

4
buildroot/package/iozone/iozone.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
IOZONE_VERSION = 3_490
IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
IOZONE_VERSION = 3.490
IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar
IOZONE_SITE = http://www.iozone.org/src/current
IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED)
# IOzone license details can be found at:

6
buildroot/package/ipmiutil/ipmiutil.mk
View File

@ -11,6 +11,12 @@ IPMIUTIL_LICENSE_FILES = COPYING
IPMIUTIL_MAKE = $(MAKE1)
# aclocal.m4 is newer than config.h.in. Touch the latter to avoid autoreconf
define IPMIUTIL_TOUCH_CONFIG_H_IN
touch $(@D)/config.h.in
endef
IPMIUTIL_PRE_CONFIGURE_HOOKS += IPMIUTIL_TOUCH_CONFIG_H_IN
# forgets to link against libcrypto dependencies breaking static link
ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx)
# tests against distro libcrypto so it might get a false positive when

2
buildroot/package/iputils/iputils.mk
View File

@ -23,7 +23,7 @@ IPUTILS_CONF_OPTS += \
-DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \
-DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \
-DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \
-DBUILD_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \
-DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \
-DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \
-DBUILD_TRACEROUTE6=$(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),true,false) \
-DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false)

56
buildroot/package/jszip/0001-fix-Use-a-null-prototype-object-for-this-files.patch Normal file
View File

@ -0,0 +1,56 @@
From 22357494f424178cb416cdb7d93b26dd4f824b36 Mon Sep 17 00:00:00 2001
From: Michael Aquilina <michaelaquilina@gmail.com>
Date: Mon, 14 Jun 2021 12:28:46 +0100
Subject: [PATCH] fix: Use a null prototype object for this.files
This approach is taken to prevent overriding object methods that would
exist on a normal object Object.create({})
[Retrieved from:
https://github.com/Stuk/jszip/commit/22357494f424178cb416cdb7d93b26dd4f824b36]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
lib/index.js | 5 ++++-
lib/object.js | 6 +++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/index.js b/lib/index.js
index b449877..b4c95ba 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -19,7 +19,10 @@ function JSZip() {
// "folder/" : {...},
// "folder/data.txt" : {...}
// }
- this.files = {};
+ // NOTE: we use a null prototype because we do not
+ // want filenames like "toString" coming from a zip file
+ // to overwrite methods and attributes in a normal Object.
+ this.files = Object.create(null);
this.comment = null;
diff --git a/lib/object.js b/lib/object.js
index 1c9d8e8..aec3db7 100644
--- a/lib/object.js
+++ b/lib/object.js
@@ -179,16 +179,16 @@ var out = {
*/
forEach: function(cb) {
var filename, relativePath, file;
+ /* jshint ignore:start */
+ // ignore warning about unwanted properties because this.files is a null prototype object
for (filename in this.files) {
- if (!this.files.hasOwnProperty(filename)) {
- continue;
- }
file = this.files[filename];
relativePath = filename.slice(this.root.length, filename.length);
if (relativePath && filename.slice(0, this.root.length) === this.root) { // the file is in the current root
cb(relativePath, file); // TODO reverse the parameters ? need to be clean AND consistent with the filter search fn...
}
}
+ /* jshint ignore:end */
},
/**

4
buildroot/package/jszip/jszip.mk
View File

@ -8,6 +8,10 @@ JSZIP_VERSION = 3.2.2
JSZIP_SITE = $(call github,Stuk,jszip,v$(JSZIP_VERSION))
JSZIP_LICENSE = MIT or GPL-3.0
JSZIP_LICENSE_FILES = LICENSE.markdown
JSZIP_CPE_ID_VENDOR = jszip_project
# 0001-fix-Use-a-null-prototype-object-for-this-files.patch
JSZIP_IGNORE_CVES += CVE-2021-23413
define JSZIP_INSTALL_TARGET_CMDS
$(INSTALL) -m 0644 -D $(@D)/dist/jszip.min.js \

61
buildroot/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch Normal file
View File

@ -0,0 +1,61 @@
From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001
From: Thomas Huth <thuth@redhat.com>
Date: Wed, 13 May 2020 13:14:46 +0200
Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32
The linker from Fedora 32 complains:
powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not
covered by LOAD segment
Let's introduce some fake PHDRs to the linker script to get this
working again.
Message-Id: <20200514192626.9950-7-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Matthew Weber <matthew.weber@collins.com>
---
powerpc/flat.lds | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/powerpc/flat.lds b/powerpc/flat.lds
index 53221e8..5eed368 100644
--- a/powerpc/flat.lds
+++ b/powerpc/flat.lds
@@ -1,7 +1,17 @@
+PHDRS
+{
+ text PT_LOAD FLAGS(5);
+ data PT_LOAD FLAGS(6);
+}
+
SECTIONS
{
- .text : { *(.init) *(.text) *(.text.*) }
+ .text : {
+ *(.init)
+ *(.text)
+ *(.text.*)
+ } :text
. = ALIGN(64K);
etext = .;
.opd : { *(.opd) }
@@ -19,9 +29,12 @@ SECTIONS
.data : {
*(.data)
*(.data.rel*)
- }
+ } :data
. = ALIGN(16);
- .rodata : { *(.rodata) *(.rodata.*) }
+ .rodata : {
+ *(.rodata)
+ *(.rodata.*)
+ } :data
. = ALIGN(16);
.bss : { *(.bss) }
. = ALIGN(256);
--
2.17.1

2
buildroot/package/libarchive/libarchive.hash
View File

@ -1,4 +1,4 @@
# From https://www.libarchive.de/downloads/sha256sums
sha256 9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a libarchive-3.5.1.tar.gz
sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz
# Locally computed:
sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING

3
buildroot/package/libarchive/libarchive.mk
View File

@ -4,7 +4,8 @@
#
################################################################################
LIBARCHIVE_VERSION = 3.5.1
LIBARCHIVE_VERSION = 3.5.2
LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz
LIBARCHIVE_SITE = https://www.libarchive.de/downloads
LIBARCHIVE_INSTALL_STAGING = YES
LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0

8
buildroot/package/libargtable2/libargtable2.mk
View File

@ -4,9 +4,11 @@
#
################################################################################
LIBARGTABLE2_VERSION = 13
LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13
LIBARGTABLE2_MAJOR_VERSION = 2
LIBARGTABLE2_MINOR_VERSION = 13
LIBARGTABLE2_VERSION = $(LIBARGTABLE2_MAJOR_VERSION).$(LIBARGTABLE2_MINOR_VERSION)
LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_MINOR_VERSION).tar.gz
LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-$(LIBARGTABLE2_VERSION)
LIBARGTABLE2_INSTALL_STAGING = YES
LIBARGTABLE2_CONF_OPTS = \
--disable-example \

63
buildroot/package/libexif/0001-fixed-another-unsigned-integer-overflow.patch
View File

@ -1,63 +0,0 @@
From ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Mon, 8 Jun 2020 17:27:06 +0200
Subject: [PATCH] fixed another unsigned integer overflow
first fixed by google in android fork,
https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0
(use a more generic overflow check method, also check second overflow instance.)
https://security-tracker.debian.org/tracker/CVE-2020-0198
Downloaded from upstream commit:
https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
libexif/exif-data.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 8b280d3..b495726 100644
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -47,6 +47,8 @@
#undef JPEG_MARKER_APP1
#define JPEG_MARKER_APP1 0xe1
+#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize ))
+
static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
struct _ExifDataPrivate
@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d,
exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o);
return;
}
- if (s > ds - o) {
+ if (CHECKOVERFLOW(o,ds,s)) {
exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o);
return;
}
@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
}
/* Read the number of entries */
- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) {
+ if (CHECKOVERFLOW(offset, ds, 2)) {
exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
- "Tag data past end of buffer (%u > %u)", offset+2, ds);
+ "Tag data past end of buffer (%u+2 > %u)", offset, ds);
return;
}
n = exif_get_short (d + offset, data->priv->order);
@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
offset += 2;
/* Check if we have enough data. */
- if (offset + 12 * n > ds) {
+ if (CHECKOVERFLOW(offset, ds, 12*n)) {
n = (ds - offset) / 12;
exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
"Short data; only loading %hu entries...", n);

40
buildroot/package/libexif/0001-libexif-exif-gps-ifd.c-fix-build-with-gcc-4.8.patch Normal file
View File

@ -0,0 +1,40 @@
From 0c925491dea995ca96770159158bb8d57a48d84b Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 15 Sep 2021 07:56:32 +0200
Subject: [PATCH] libexif/exif-gps-ifd.c: fix build with gcc 4.8
Fix the following build failure with gcc 4.8 raised since version 0.6.23 and
https://github.com/libexif/libexif/commit/e12c3529813cd16d50bf0a1c759093e1039dffec:
exif-gps-ifd.c: In function 'exif_get_gps_tag_info':
exif-gps-ifd.c:62:3: error: 'for' loop initial declarations are only allowed in C99 mode
for (int i = 0; i < sizeof(exif_gps_ifd_tags) / sizeof(ExifGPSIfdTagInfo); ++i) {
^
exif-gps-ifd.c:62:3: note: use option -std=c99 or -std=gnu99 to compile your code
Fixes:
- http://autobuild.buildroot.org/results/7dd222e06d1e6611449fb8fe7516817c9ad43d65
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/libexif/libexif/pull/72]
---
libexif/exif-gps-ifd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libexif/exif-gps-ifd.c b/libexif/exif-gps-ifd.c
index 9c9ba70..de5f950 100644
--- a/libexif/exif-gps-ifd.c
+++ b/libexif/exif-gps-ifd.c
@@ -59,7 +59,8 @@ const static struct ExifGPSIfdTagInfo exif_gps_ifd_tags[] = {
};
const ExifGPSIfdTagInfo *exif_get_gps_tag_info(ExifTag tag) {
- for (int i = 0; i < sizeof(exif_gps_ifd_tags) / sizeof(ExifGPSIfdTagInfo); ++i) {
+ int i;
+ for (i = 0; i < sizeof(exif_gps_ifd_tags) / sizeof(ExifGPSIfdTagInfo); ++i) {
if (tag==exif_gps_ifd_tags[i].tag)
return &exif_gps_ifd_tags[i];
}
--
2.33.0

36
buildroot/package/libexif/0002-fixed-a-incorrect-overflow-check.patch
View File

@ -1,36 +0,0 @@
From 9266d14b5ca4e29b970fa03272318e5f99386e06 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Thu, 5 Nov 2020 09:50:08 +0100
Subject: [PATCH] fixed a incorrect overflow check that could be optimized
away.
inspired by:
https://android.googlesource.com/platform/external/libexif/+/8e7345f3bc0bad06ac369d6cbc1124c8ceaf7d4b
https://source.android.com/security/bulletin/2020-11-01
CVE-2020-0452
Downloaded from upstream commit, rebased for 0.6.22:
https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
libexif/exif-entry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index 3fc0ff9..4b866ce 100644
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -1371,8 +1371,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
{
unsigned char *utf16;
- /* Sanity check the size to prevent overflow */
- if (e->size+sizeof(uint16_t)+1 < e->size) break;
+ /* Sanity check the size to prevent overflow. Note EXIF files are 64kb at most. */
+ if (e->size >= 65536 - sizeof(uint16_t)*2) break;
/* The tag may not be U+0000-terminated , so make a local
U+0000-terminated copy before converting it */

2
buildroot/package/libexif/libexif.hash
View File

@ -1,3 +1,3 @@
# Locally computed:
sha256 5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56 libexif-0.6.22.tar.xz
sha256 a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431 libexif-0.6.23.tar.xz
sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING

8
buildroot/package/libexif/libexif.mk
View File

@ -4,18 +4,14 @@
#
################################################################################
LIBEXIF_VERSION = 0.6.22
LIBEXIF_VERSION = 0.6.23
LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.xz
LIBEXIF_SITE = \
https://github.com/libexif/libexif/releases/download/libexif-$(subst .,_,$(LIBEXIF_VERSION))-release
https://github.com/libexif/libexif/releases/download/v$(LIBEXIF_VERSION)
LIBEXIF_INSTALL_STAGING = YES
LIBEXIF_DEPENDENCIES = host-pkgconf
LIBEXIF_LICENSE = LGPL-2.1+
LIBEXIF_LICENSE_FILES = COPYING
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
LIBEXIF_IGNORE_CVES += CVE-2020-0452
$(eval $(autotools-package))

4
buildroot/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch
View File

@ -24,7 +24,7 @@ diff --git a/Makefile.am b/Makefile.am
index 7fa4fa4d..f0bd90e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,9 +39,14 @@ else
@@ -40,9 +40,14 @@ else
doc =
endif
@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac
index e8c8cd39..1a6b61e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2710,6 +2710,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno])

8
buildroot/package/libgcrypt/libgcrypt.hash
View File

@ -1,7 +1,7 @@
# From https://www.gnupg.org/download/integrity_check.html
sha1 6b18f453fee677078586279d96fb88e5df7b3f35 libgcrypt-1.9.3.tar.bz2
sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2
# Locally calculated after checking signature
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.3.tar.bz2.sig
# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
sha256 97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd libgcrypt-1.9.3.tar.bz2
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig
# using key 6DAA6E64A76D2840571B4902528897B826403ADA
sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2
sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB

2
buildroot/package/libgcrypt/libgcrypt.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBGCRYPT_VERSION = 1.9.3
LIBGCRYPT_VERSION = 1.9.4
LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
LIBGCRYPT_LICENSE = LGPL-2.1+
LIBGCRYPT_LICENSE_FILES = COPYING.LIB

10
buildroot/package/libmodsecurity/libmodsecurity.mk
View File

@ -52,4 +52,14 @@ else
LIBMODSECURITY_CONF_OPTS += --without-maxmind
endif
LIBMODSECURITY_CXXFLAGS = $(TARGET_CXXFLAGS)
# m68k_cf can't use -fPIC that libmodsecurity forces to use, so we need
# to disable it to avoid a build failure.
ifeq ($(BR2_m68k_cf),y)
LIBMODSECURITY_CXXFLAGS += -fno-PIC
endif
LIBMODSECURITY_CONF_OPTS += CXXFLAGS="$(LIBMODSECURITY_CXXFLAGS)"
$(eval $(autotools-package))

4
buildroot/package/libopenssl/libopenssl.hash
View File

@ -1,5 +1,5 @@
# From https://www.openssl.org/source/openssl-1.1.1k.tar.gz.sha256
sha256 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 openssl-1.1.1k.tar.gz
# From https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256
sha256 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz
# License files
sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE

2
buildroot/package/libopenssl/libopenssl.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBOPENSSL_VERSION = 1.1.1k
LIBOPENSSL_VERSION = 1.1.1l
LIBOPENSSL_SITE = https://www.openssl.org/source
LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
LIBOPENSSL_LICENSE = OpenSSL or SSLeay

4
buildroot/package/librsvg/librsvg.hash
View File

@ -1,5 +1,5 @@
# From https://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.5.sha256sum
sha256 32701574c234fed352520c6d0bd5081f728184bc1a9b9c87d423dd27c32b9272 librsvg-2.50.5.tar.xz
# From https://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.7.sha256sum
sha256 fffb61b08cd5282aaae147a02b305166a7426fad22a8b9427708f0f2fc426ebc librsvg-2.50.7.tar.xz
# Locally computed
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB

2
buildroot/package/librsvg/librsvg.mk
View File

@ -5,7 +5,7 @@
################################################################################
LIBRSVG_VERSION_MAJOR = 2.50
LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).5
LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).7
LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz
LIBRSVG_INSTALL_STAGING = YES

3
buildroot/package/libshout/libshout.mk
View File

@ -33,9 +33,6 @@ endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBSHOUT_CONF_OPTS += --with-openssl
LIBSHOUT_DEPENDENCIES += openssl
else ifeq ($(BR2_PACKAGE_LIBRESSL),y)
LIBSHOUT_CONF_OPTS += --with-openssl=$(STAGING_DIR)/lib
LIBSHOUT_DEPENDENCIES += libressl
else
LIBSHOUT_CONF_OPTS += --without-openssl
endif

4
buildroot/package/libssh/libssh.hash
View File

@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
# https://www.libssh.org/files/0.9/libssh-0.9.5.tar.xz.asc
# https://www.libssh.org/files/0.9/libssh-0.9.6.tar.xz.asc
# with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
sha256 acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718 libssh-0.9.5.tar.xz
sha256 86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b libssh-0.9.6.tar.xz
sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING

2
buildroot/package/libssh/libssh.mk
View File

@ -5,7 +5,7 @@
################################################################################
LIBSSH_VERSION_MAJOR = 0.9
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).6
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
LIBSSH_LICENSE = LGPL-2.1

12
buildroot/package/linux-headers/Config.in.host
View File

@ -346,12 +346,12 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.4.279" if BR2_KERNEL_HEADERS_4_4
default "4.9.279" if BR2_KERNEL_HEADERS_4_9
default "4.14.243" if BR2_KERNEL_HEADERS_4_14
default "4.19.202" if BR2_KERNEL_HEADERS_4_19
default "5.4.139" if BR2_KERNEL_HEADERS_5_4
default "5.10.57" if BR2_KERNEL_HEADERS_5_10
default "4.4.283" if BR2_KERNEL_HEADERS_4_4
default "4.9.282" if BR2_KERNEL_HEADERS_4_9
default "4.14.246" if BR2_KERNEL_HEADERS_4_14
default "4.19.206" if BR2_KERNEL_HEADERS_4_19
default "5.4.145" if BR2_KERNEL_HEADERS_5_4
default "5.10.64" 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 \

0
buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0001-HACK-only-build-and-install-localedef.patch → buildroot/package/localedef/2.32-50-g737efa27fca5c97f566a2005687fda7d6659cd2e/0001-HACK-only-build-and-install-localedef.patch
View File

0
buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch → buildroot/package/localedef/2.32-50-g737efa27fca5c97f566a2005687fda7d6659cd2e/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
View File

0
buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch → buildroot/package/localedef/2.32-50-g737efa27fca5c97f566a2005687fda7d6659cd2e/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch
View File

0
buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch → buildroot/package/localedef/2.32-50-g737efa27fca5c97f566a2005687fda7d6659cd2e/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch
View File

2
buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/localedef.hash → buildroot/package/localedef/2.32-50-g737efa27fca5c97f566a2005687fda7d6659cd2e/localedef.hash
View File

@ -1,5 +1,5 @@
# Locally calculated (fetched from Github)
sha256 f4710e9a435a7b83e1d23dd75434f0d36b898eba9b4249c946c32b467d852fd4 glibc-2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2.tar.gz
sha256 b634d38ace90752eeecb93246d71c0673bab0db8dfbd69333479ae7b10d63410 glibc-2.32-50-g737efa27fca5c97f566a2005687fda7d6659cd2e.tar.gz
# Hashes for license files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

2
buildroot/package/localedef/localedef.mk
View File

@ -7,7 +7,7 @@
# Use the same VERSION and SITE as target glibc
# As in glibc.mk, generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
LOCALEDEF_VERSION = 2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2
LOCALEDEF_VERSION = 2.32-50-g737efa27fca5c97f566a2005687fda7d6659cd2e
LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
HOST_LOCALEDEF_DL_SUBDIR = glibc

1
buildroot/package/mc/Config.in
View File

@ -6,6 +6,7 @@ config BR2_PACKAGE_MC
select BR2_PACKAGE_LIBGLIB2
# mc prefers slang, but can use ncurses too
select BR2_PACKAGE_SLANG if !BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_WCHAR if BR2_PACKAGE_NCURSES
help
GNU Midnight Commander is a visual file manager, licensed
under GNU General Public License. It can use either SLang

4
buildroot/package/mc/mc.hash
View File

@ -1,4 +1,4 @@
# Hash from http://ftp.midnight-commander.org/mc-4.8.25.sha256
sha256 ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a mc-4.8.25.tar.xz
# Hash from http://ftp.midnight-commander.org/mc-4.8.27.sha256
sha256 31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4 mc-4.8.27.tar.xz
# sha256 locally computed:
sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING

2
buildroot/package/mc/mc.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
MC_VERSION = 4.8.25
MC_VERSION = 4.8.27
MC_SOURCE = mc-$(MC_VERSION).tar.xz
MC_SITE = http://ftp.midnight-commander.org
MC_LICENSE = GPL-3.0+

43
buildroot/package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch Normal file
View File

@ -0,0 +1,43 @@
From e501b7c17ada9c694d3f8302622b78d733485b38 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 21 Aug 2021 17:55:33 +0200
Subject: [PATCH] src/util/futex.h: fix build on 32-bit architectures using
64-bit time_t
Fix the following build failure on 32-bit architectures using 64-bit
time_t (e.g. riscv32):
../src/util/futex.h: In function 'sys_futex':
../src/util/futex.h:39:19: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'?
39 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
| ^~~~~~~~~
| sys_futex
Fixes:
- http://autobuild.buildroot.org/results/692700a5f967760a0b8cd358b1712f1d5a7b681e
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status:
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12496]
---
src/util/futex.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/util/futex.h b/src/util/futex.h
index 43097f4cd5b..221eda9db0c 100644
--- a/src/util/futex.h
+++ b/src/util/futex.h
@@ -34,6 +34,10 @@
#include <sys/syscall.h>
#include <sys/time.h>
+#ifndef SYS_futex
+#define SYS_futex SYS_futex_time64
+#endif
+
static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3)
{
return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
--
2.32.0

4
buildroot/package/mosquitto/mosquitto.hash
View File

@ -1,6 +1,6 @@
# Locally calculated after checking gpg signature
# from https://mosquitto.org/files/source/mosquitto-2.0.11.tar.gz.asc
sha256 7b36a7198bce85cf31b132f5c6ee36dcf5dadf86fb768501eb1e11ce95d4f78a mosquitto-2.0.11.tar.gz
# from https://mosquitto.org/files/source/mosquitto-2.0.12.tar.gz.asc
sha256 31cf0065cb431d6f4e57a5f4d56663e839c9d177362eff89582d7cfde191c933 mosquitto-2.0.12.tar.gz
# License files
sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt

2
buildroot/package/mosquitto/mosquitto.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
MOSQUITTO_VERSION = 2.0.11
MOSQUITTO_VERSION = 2.0.12
MOSQUITTO_SITE = https://mosquitto.org/files/source
MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0
MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10

51
buildroot/package/netsniff-ng/0001-Detect-libpcap-dependencies-using-pkg-config.patch Normal file
View File

@ -0,0 +1,51 @@
From 194ec61843b9598ce90873c812b817c4b96e2e0d Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 2 Sep 2021 12:56:00 +0300
Subject: [PATCH] Detect libpcap dependencies using pkg-config
When building statically the link command line must include all
dependencies of all libraries. libpcap can optionally depend on libnl.
mausezahn can't build statically in this case.
Use pkg-config in configure and in the link command to construct the
library flags we need to link with libpcap.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
Upstream status: commit 194ec61843b9598ce90873c812b817c4b96e2e0d
configure | 4 +++-
mausezahn/Makefile | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 510826a798f5..598ae2433a7a 100755
--- a/configure
+++ b/configure
@@ -588,7 +588,9 @@ int main(void)
}
EOF
- $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c -lpcap >> config.log 2>&1
+ $CC -o $TMPDIR/pcaptest $TMPDIR/pcaptest.c \
+ $($PKG_CONFIG --libs libpcap 2>> config.log) \
+ >> config.log 2>&1
if [ ! -x $TMPDIR/pcaptest ] ; then
echo "[NO]"
echo "CONFIG_LIBPCAP=0" >> Config
diff --git a/mausezahn/Makefile b/mausezahn/Makefile
index ca16b6579583..9544565355cc 100644
--- a/mausezahn/Makefile
+++ b/mausezahn/Makefile
@@ -1,6 +1,6 @@
mausezahn-libs = -lcli \
-lnet \
- -lpcap \
+ $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libpcap 2> /dev/null ) \
-lrt \
-lpthread \
-lm
--
2.33.0

2
buildroot/package/netsniff-ng/netsniff-ng.mk
View File

@ -13,7 +13,7 @@ NETSNIFF_NG_LICENSE_FILES = README COPYING
NETSNIFF_NG_CONF_ENV = \
NACL_INC_DIR=/dev/null \
NACL_LIB_DIR=/dev/null
NETSNIFF_NG_DEPENDENCIES = libnl libpcap libnetfilter_conntrack liburcu
NETSNIFF_NG_DEPENDENCIES = host-pkgconf libnl libpcap libnetfilter_conntrack liburcu
ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y)
NETSNIFF_NG_DEPENDENCIES += libcli libnet

118
buildroot/package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Normal file
View File

@ -0,0 +1,118 @@
From 4bd8fe780ff2064f2d4e9c905d8a98dd0f9b6191 Mon Sep 17 00:00:00 2001
From: Nevo Hed <nhed+buildroot@starry.com>
Date: Mon, 30 Aug 2021 13:28:13 -0400
Subject: [PATCH] Allow forcing of endianness for cross-compilation
Upstream-status: Invalid (upstream doesn't support cross-compilation)
See https://trac.nginx.org/nginx/ticket/2240
Signed-off-by: Nevo Hed <nhed+buildroot@starry.com>
---
auto/endianness | 61 ++++++++++++++++++++++++++++++++-----------------
auto/options | 6 +++++
2 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/auto/endianness b/auto/endianness
index 1b552b6b..4b2a3cd7 100644
--- a/auto/endianness
+++ b/auto/endianness
@@ -26,25 +26,44 @@ int main(void) {
END
-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
-
-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
-
-if [ -x $NGX_AUTOTEST ]; then
- if $NGX_AUTOTEST >/dev/null 2>&1; then
- echo " little endian"
+case "${NGX_FORCE_ENDIANNESS}" in
+ little)
+ echo " little endian (forced)"
have=NGX_HAVE_LITTLE_ENDIAN . auto/have
- else
- echo " big endian"
- fi
-
- rm -rf $NGX_AUTOTEST*
-
-else
- rm -rf $NGX_AUTOTEST*
-
- echo
- echo "$0: error: cannot detect system byte ordering"
- exit 1
-fi
+ ;;
+
+ big)
+ echo " big endian (forced)"
+ ;;
+
+ "")
+ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
+
+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
+
+ if [ -x $NGX_AUTOTEST ]; then
+ if $NGX_AUTOTEST >/dev/null 2>&1; then
+ echo " little endian"
+ have=NGX_HAVE_LITTLE_ENDIAN . auto/have
+ else
+ echo " big endian"
+ fi
+
+ rm -rf $NGX_AUTOTEST*
+
+ else
+ rm -rf $NGX_AUTOTEST*
+
+ echo
+ echo "$0: error: cannot detect system byte ordering"
+ exit 1
+ fi
+ ;;
+
+ *)
+ echo
+ echo "$0: error: invalid \"--force-endianness=${NGX_FORCE_ENDIANNESS}\""
+ exit 1
+ ;;
+esac
diff --git a/auto/options b/auto/options
index 80be906e..85a06456 100644
--- a/auto/options
+++ b/auto/options
@@ -17,6 +17,8 @@ NGX_USER=
NGX_GROUP=
NGX_BUILD=
+NGX_FORCE_ENDIANNESS=
+
CC=${CC:-cc}
CPP=
NGX_OBJS=objs
@@ -196,6 +198,8 @@ do
--user=*) NGX_USER="$value" ;;
--group=*) NGX_GROUP="$value" ;;
+ --force-endianness=*) NGX_FORCE_ENDIANNESS="$value" ;;
+
--crossbuild=*) NGX_PLATFORM="$value" ;;
--build=*) NGX_BUILD="$value" ;;
@@ -432,6 +436,8 @@ cat << END
--build=NAME set build name
--builddir=DIR set build directory
+ --force-endianness=<big>|<little> force endianness
+
--with-select_module enable select module
--without-select_module disable select module
--with-poll_module enable poll module
--
2.31.1

1
buildroot/package/nginx/nginx.mk
View File

@ -52,6 +52,7 @@ NGINX_CONF_ENV += \
# prefix: nginx root configuration location
NGINX_CONF_OPTS += \
--force-endianness=$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN))) \
--prefix=/usr \
--conf-path=/etc/nginx/nginx.conf \
--sbin-path=/usr/sbin/nginx \

4
buildroot/package/nodejs/nodejs.hash
View File

@ -1,5 +1,5 @@
# From https://nodejs.org/dist/v12.22.4/SHASUMS256.txt
sha256 44cd4eab131e5282fc923e9e720d983a0b44c12e4aa4f6c3598dc97ae1e4cd4c node-v12.22.4.tar.xz
# From https://nodejs.org/dist/v12.22.5/SHASUMS256.txt
sha256 f927ff6c2ac5a7234596031b18ba03febbcadd2650d375f1a3fd02426687fd14 node-v12.22.5.tar.xz
# Hash for license file
sha256 221417a7ca275112a5ac54639b36ee3c5184e74631ea1e1b01b701293b655190 LICENSE

2
buildroot/package/nodejs/nodejs.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
NODEJS_VERSION = 12.22.4
NODEJS_VERSION = 12.22.5
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \

71
buildroot/package/ogre/0002-Checks-for-strtol_l-function.patch Normal file
View File

@ -0,0 +1,71 @@
From 3f182b7e743662ec3fa63e1c7f213171d99485ba Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 10 Feb 2020 21:45:58 +0100
Subject: [PATCH] Checks for strtol_l function
strtol_l (and strtoul_l, strtoll_l, strtoull_l) are not always available
(for example on musl) so check for strtol_l and reuse android fallback if
needed to avoid the following build failure:
/home/buildroot/autobuild/instance-1/output-1/build/ogre-1.12.0/OgreMain/src/OgreStringConverter.cpp: In static member function 'static bool Ogre::StringConverter::parse(const String&, Ogre::int32&)':
/home/buildroot/autobuild/instance-1/output-1/build/ogre-1.12.0/OgreMain/src/OgreStringConverter.cpp:253:22: error: 'strtol_l' was not declared in this scope
ret = (int32)strtol_l(val.c_str(), &end, 0, _numLocale);
^~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/107cffe41081ce46441dec8699d6ad0f152bc152
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/OGRECave/ogre/commit/3f182b7e743662ec3fa63e1c7f213171d99485ba]
---
CMake/ConfigureBuild.cmake | 7 +++++++
CMake/Templates/OgreBuildSettings.h.in | 2 ++
OgreMain/include/OgreString.h | 3 +++
3 files changed, 12 insertions(+)
diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
index ab049a525ae..73606c997c1 100644
--- a/CMake/ConfigureBuild.cmake
+++ b/CMake/ConfigureBuild.cmake
@@ -133,6 +133,13 @@ if(SDL2_FOUND OR EMSCRIPTEN)
set(OGRE_BITES_HAVE_SDL 1)
endif()
+# determine if strtol_l is supported
+include(CheckFunctionExists)
+CHECK_FUNCTION_EXISTS(strtol_l HAVE_STRTOL_L)
+if (NOT HAVE_STRTOL_L)
+ set(OGRE_NO_LOCALE_STRCONVERT 1)
+endif ()
+
# generate OgreBuildSettings.h
configure_file(${OGRE_TEMPLATES_DIR}/OgreComponents.h.in ${PROJECT_BINARY_DIR}/include/OgreComponents.h @ONLY)
configure_file(${OGRE_TEMPLATES_DIR}/OgreBuildSettings.h.in ${PROJECT_BINARY_DIR}/include/OgreBuildSettings.h @ONLY)
diff --git a/CMake/Templates/OgreBuildSettings.h.in b/CMake/Templates/OgreBuildSettings.h.in
index a491d09624c..95eb1b71d64 100644
--- a/CMake/Templates/OgreBuildSettings.h.in
+++ b/CMake/Templates/OgreBuildSettings.h.in
@@ -107,4 +107,6 @@ WARNING: Disabling this will make the samples unusable.
#cmakedefine01 OGRE_NO_QUAD_BUFFER_STEREO
+#cmakedefine01 OGRE_NO_LOCALE_STRCONVERT
+
#endif
diff --git a/OgreMain/include/OgreString.h b/OgreMain/include/OgreString.h
index a81c220012e..1f544195dee 100644
--- a/OgreMain/include/OgreString.h
+++ b/OgreMain/include/OgreString.h
@@ -46,8 +46,11 @@ THE SOFTWARE.
# define strnicmp strncasecmp
#endif
+#if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID || OGRE_PLATFORM == OGRE_PLATFORM_EMSCRIPTEN || \
+ (OGRE_PLATFORM == OGRE_PLATFORM_LINUX && OGRE_NO_LOCALE_STRCONVERT == 1)
#if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID || OGRE_PLATFORM == OGRE_PLATFORM_EMSCRIPTEN
# define locale_t int
+#endif
# define strtod_l(ptr, end, l) strtod(ptr, end)
# define strtoul_l(ptr, end, base, l) strtoul(ptr, end, base)
# define strtol_l(ptr, end, base, l) strtol(ptr, end, base)

1
buildroot/package/openmpi/openmpi-mips32-fortran.cache
View File

@ -49,3 +49,4 @@ ompi_cv_fortran_kind_value_C_DOUBLE=8
ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8
ompi_cv_fortran_true_value=1
ompi_cv_fortran_sizeof_type_test_mpi_handle_=4
ompi_cv_fortran_alignment_type_test_mpi_handle_=4

1
buildroot/package/openmpi/openmpi-mips64-fortran.cache
View File

@ -58,3 +58,4 @@ ompi_cv_fortran_kind_value_0=0
ompi_cv_real16_c_equiv=yes
ompi_cv_fortran_true_value=1
ompi_cv_fortran_sizeof_type_test_mpi_handle_=4
ompi_cv_fortran_alignment_type_test_mpi_handle_=4

Some files were not shown because too many files have changed in this diff Show More