diff --git a/CHANGES b/CHANGES index cb35b7b255..9780a03528 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,40 @@ +2021.08-rc2, released August 18th, 2021 + + Fixes all over the tree. + + Defconfigs: Acmesystems acqua a5: Bump at91bootstrap version + to fix build issue with binutils >= 2.35, Microchip sam9x60ek + mmc_dev: Add missing toolchain/system options, sama5d2-icp + mmc: Correct at91bootstrap options + + Updated/fixed packages: arm-trusted-firmware, at91bootstrap3, + azure-iot-sdk-c, bluez5_utils, bullet, busybox, cegui, efl, + erlang, ffmpeg, flatbuffers, fontconfig, gcc, gd, glibc, go, + gobject-introspection, gpsd, guile, harfbuzz, iozone, iputils, + jszip, libargtable2, libbpf, libebml, libepoxy, libesmtp, + libfuse3, libgeos, libnss, libodb-boost, libodb-mysql, + libodb-pgsql, libqmi, libqrtr-glib, libuhttpd, libuwsc, + libvirt, ltp-testsuite, luaossl, mongodb, mpd, mupdf, mutt, + network-manager, nginx-naxsi, nodejs, ogre, openzwave, + optee-os, osm2pgsql, pdbg, perl-net-ssh2, php, pipewire, + pistache, pixman, poke, polkit, poppler, postgresql, postkit, + prelink-cross, prosody, protobuf, pulseview, + python-cryptography, python-keyring, python-matplotlib, + python-pymupdf, python-pyopenssl, python-secretstorage, + python-treq, python-txtorcon, python3, qemu, qpdf, qt5base, + refpolicy, ruby, rust-bin, s390-tools, sconeserver, seatd, + shairport-sync, sox, sqlite, sylpheed, sysdig, syslog-ng, + system-config-printer, tar, terminology, tor, tpm2-tools, uhd, + unbound, usbguard, wireshark, xen, xenomai, xlib_libxshmfence, + zstd + + New packages: desktop-file-utils + + Issues resolved (http://bugs.uclibc.org): + + #13586: grub failure with BR2_OPTIMIZE_3 + #13671: openSSH server closes connection before authentication.. + 2021.08-rc1, released August 3rd, 2021 Numerous package updates. @@ -55,6 +92,58 @@ #13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to y as before +2021.05.1, released August 10, 2021 + + Important / security related fixes. + + Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II) + as it is not currently working. + + binutils: fix linker assert failure on OpenRisc, or1k build + issue with gcc < 5 + + gdb: Enable on NIOS II + + utils/scanpypi: Various improvements + + Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip + sam9x60ek mmc_dev: Add missing toolchain/system options + + Updated/fixed packages: arm-trusted-firmware, apache, audit, + avahi, bind, binutils, bird, bluez5_utils, boinc, busybox, + chrony, clamav, connman, cryptsetup, dnsmasq, docker-cli, + docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2, + fail2ban, fb-test-app, feh, fetchmail, ffmpeg, flac, fluxbox, + gawk, gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go, + gptfdisk, gqrx, granite, grub2, guile, hdparm, heirloom-mailx, + htop, ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd, + intel-microcode, iodine, irqbalance, keepalived, kexec-tools, + libass, libconfig, libcurl, libfreeimage, libfuse3, libgcrypt, + libgudev, libhtp, libinput, libjson, libgtk3, libkrb5, + libloki, libmodsecurity, libndp, libnetfilter-log, + libnfnetlink, libnice, libodb, libodb-boost, libodb-mysql, + libodb-pgsql, libpcap, libqmi, libqrtr-glib, libressl, + librsvg, libtasn1, libtirpc, libuci, libxmlrpc, + linux-firmware, linuxptp, lrzsz, lvm2, mariadb, mesa3d, + mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd, + netsnmp, nettle, nmap, nodejs, ntp, openntpd, openpgm, + openswan, pango, pcre2, perl-crypt-openssl-rsa, php, pixman, + postgresql, proxychains-ng, putty, python, + python-dataproperty, python-django, python-pysftp, + python-urllib3, python3, qpdf, redis, ripgrep, rsync, ruby, + samba4, sane-backends, slirp, spice, squid, suricata, tcpdump, + tftpd, thrift, tor, tpm2-tools, trinity, uboot, uboot-tools, + uclibc, vlc, wireless-regdb, wireshark, wolfssl, + xapp_fonttosfnt, xlib_libX11, xlib_libxshmfence, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13586: grub failure with BR2_OPTIMIZE_3 + #13661: host-python2 build fails on aarch64 + #13836: package build failure when target install set to no.. + #13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to.. + 2021.05, released June 6th, 2021 Various fixes. @@ -201,6 +290,57 @@ #13751: libopenssl (static): huge drop in performance in newer .. #13771: package htop has undeclared dependency on host python +2021.02.4, released August 10th, 2021 + + Important / security related fixes. + + Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II) + as it is not currently working. + + binutils: fix linker assert failure on OpenRisc, or1k build + issue with gcc < 5 + + gdb: Enable on NIOS II + + utils/scanpypi: Various improvements + + Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip + sam9x60ek mmc_dev: Add missing toolchain/system options + + Updated/fixed packages: apache, arm-trusted-firmware, audit, + avahi, bind, binutils, bird, bluez5_utils, boinc, busybox, + chrony, clamav, cryptsetup, cwiid, dnsmasq, docker-cli, + docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2, + fail2ban, fb-test-app, feh, fetchmail, flac, fluxbox, gawk, + gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go, gptfdisk, + granite, grub2, gqrx, guile, hdparm, heirloom-mailx, + ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd, intel-microcode, + iodine, irqbalance, keepalived, libass, libconfig, libcurl, + libfreeimage, libfuse3, libgcrypt, libgtk3, libgudev, libhtp, + libjson, libkrb5, libloki, libmodsecurity, libndp, + libnetfilter-log, libnfnetlink, libnice, libodb, libodb-boost, + libodb-mysql, libodb-pgsql, libpcap, libqmi, libressl, + librsvg, libtasn1, libtirpc, libuci, libxmlrpc, + linux-firmware, linuxptp, lrzsz, ltp-testsuite, lvm2, mariadb, + mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd, neard, + netsnmp, nettle, nginx-modsecurity, nmap, nodejs, ntp, + openntpd, openpgm, openswan, pango, pcre2, + perl-crypt-openssl-rsa, php, pixman, polkit, postgresql, + proxychains-ng, putty, python, python-django, + python-dataproperty, python-pysftp, python-urllib3, python3, + qpdf, redis, ripgrep, ruby, samba4, spice, slirp, suricata, + sysdig, tcpdump, tftpd, thrift, tor, tpm2-tools, trinity, + uboot, uboot-tools, uclibc, util-linux, vlc, wireless-regdb, + wireshark, wolfssl, xapp_fonttosfnt, xlib_libX11, + xlib_libxshmfence, xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13586: grub failure with BR2_OPTIMIZE_3 + #13661: host-python2 build fails on aarch64 + #13836: package build failure when target install set to no.. + #13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to.. + 2021.02.3, released June 12th, 2021 Important / security related fixes. diff --git a/Config.in b/Config.in index 2ef5d407e4..3db2c8dcab 100644 --- a/Config.in +++ b/Config.in @@ -853,9 +853,16 @@ 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)" default BR2_FORTIFY_SOURCE_1 + depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_OPTIMIZE_0 help @@ -896,6 +903,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 diff --git a/Config.in.legacy b/Config.in.legacy index 54476acf9a..68c9f3ca49 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,26 @@ endif comment "Legacy options removed in 2021.08" +config BR2_PACKAGE_LIBMCRYPT + bool "libmcrypt package was removed" + select BR2_LEGACY + help + This package has been removed as "the last update to libmcrypt + was in 2007, despite years of unmerged patches. These facts + have led security experts to declare mcrypt abandonware and + discourage its use in new development" (extract from + https://en.wikipedia.org/wiki/Mcrypt). + +config BR2_PACKAGE_MCRYPT + bool "mcrypt package was removed" + select BR2_LEGACY + help + This package has been removed as "the last update to libmcrypt + was in 2007, despite years of unmerged patches. These facts + have led security experts to declare mcrypt abandonware and + discourage its use in new development" (extract from + https://en.wikipedia.org/wiki/Mcrypt). + config BR2_PACKAGE_PHP_EXT_MCRYPT bool "PHP mcrypt extension removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a102ce4af4..31bcd27747 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1055,6 +1055,8 @@ F: package/xapian/ N: Giulio Benetti F: package/at/ +F: package/binutils/ +F: package/gcc/ F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ @@ -1063,6 +1065,7 @@ F: package/nfs-utils/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ F: package/udisks/ +F: toolchain/ N: Gregory Dymarek F: package/ding-libs/ @@ -1444,7 +1447,6 @@ F: package/python-schedule/ F: package/python-sentry-sdk/ F: package/python-websockets/ F: package/python-xlib/ -F: package/sentry-cli/ F: package/sentry-native/ F: package/unclutter-xfixes/ @@ -1878,36 +1880,6 @@ F: package/postgis/ F: package/protozero/ F: package/timescaledb/ -N: Maxime Hadjinlian -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 F: board/arcturus/ F: configs/arcturus_ucp1020_defconfig @@ -2574,9 +2546,6 @@ F: configs/rock_pi_n10_defconfig F: configs/rockpro64_defconfig F: package/arm-gnu-a-toolchain/ -N: Sven Fischer -F: package/qt5/qt5remoteobjects/ - N: Sven Haardiek F: package/lcdproc/ F: package/python-influxdb/ diff --git a/Makefile b/Makefile index 3923e5875f..71d2e3d02d 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.08-rc1 +export BR2_VERSION := 2021.08-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1628024000 +BR2_VERSION_EPOCH = 1629283000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd deleted file mode 100644 index 44d9239a94..0000000000 --- a/board/olimex/a10_olinuxino/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} -ext4load mmc 0 0x49000000 /boot/${fdtfile} -ext4load mmc 0 0x46000000 /boot/zImage -env set fdt_high ffffffff -bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd new file mode 120000 index 0000000000..612c745500 --- /dev/null +++ b/board/olimex/a10_olinuxino/boot.cmd @@ -0,0 +1 @@ +../a20_olinuxino/boot.cmd \ No newline at end of file diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh deleted file mode 100755 index d3f612f811..0000000000 --- a/board/olimex/a10_olinuxino/post-build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh new file mode 120000 index 0000000000..b346896024 --- /dev/null +++ b/board/olimex/a10_olinuxino/post-build.sh @@ -0,0 +1 @@ +../a20_olinuxino/post-build.sh \ No newline at end of file diff --git a/board/olimex/a20_olinuxino/boot.cmd b/board/olimex/a20_olinuxino/boot.cmd new file mode 100644 index 0000000000..44d9239a94 --- /dev/null +++ b/board/olimex/a20_olinuxino/boot.cmd @@ -0,0 +1,5 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} +ext4load mmc 0 0x49000000 /boot/${fdtfile} +ext4load mmc 0 0x46000000 /boot/zImage +env set fdt_high ffffffff +bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a20_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh new file mode 100755 index 0000000000..d3f612f811 --- /dev/null +++ b/board/olimex/a20_olinuxino/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 20a121c2fc..b1fc03e10b 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -213,7 +213,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 diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index d1eb72e7ae..9d44a5df06 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -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) @@ -169,7 +172,8 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/ ) $(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 diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index f44597bc00..650d3a23c8 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -19,10 +19,10 @@ choice prompt "AT91 Bootstrap 3+ version" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - bool "4.0.0-rc2" + bool "4.0.0" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X - bool "3.10.2" + bool "3.10.3" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" @@ -54,8 +54,8 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string - default "v4.0.0-rc2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - default "v3.10.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X + default "v4.0.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v3.10.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index 8b7453bbd4..e611f163c9 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 33e4ba431af93a4fc2e81c1458cd31901b9f69c583ebe4c74ca78c0846479bfd at91bootstrap3-v3.10.2.tar.gz -sha256 b5d5f042297cad0d091f7d8734e61eb9ec7b6020898e086503fb5f8bc71fb9fc at91bootstrap3-v4.0.0-rc2.tar.gz +sha256 b6ae5bcaacc5a949f400182e036ae053049638444a3ba8b1dd154ec5f7898d8e at91bootstrap3-v3.10.3.tar.gz +sha256 08c5b95df28be7f2e0439fb2b77fe27524f97c499850641e4540c07ea0b2c25d at91bootstrap3-v4.0.0.tar.gz +sha256 5a3809b1c2ba13b7242572322951311c584419f1f8516f665d6c06f0668d78de LICENSES/MIT.txt diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index b253129dfb..1e2a3a44b0 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -19,7 +19,12 @@ else AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION)) endif +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y) +AT91BOOTSTRAP3_LICENSE = MIT +AT91BOOTSTRAP3_LICENSE_FILES = LICENSES/MIT.txt +else ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X),y) AT91BOOTSTRAP3_LICENSE = Atmel License +endif AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 618ef0e756..f8129f3780 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-256m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index e9d74be7c8..e399d4a9ff 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.2" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="acqua-512m" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/acmesystems_aria_g25_128mb_defconfig b/configs/acmesystems_aria_g25_128mb_defconfig index cf62b5b72e..8bc8c4dcef 100644 --- a/configs/acmesystems_aria_g25_128mb_defconfig +++ b/configs/acmesystems_aria_g25_128mb_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-128m" # Tools to build sdcard.img diff --git a/configs/acmesystems_aria_g25_256mb_defconfig b/configs/acmesystems_aria_g25_256mb_defconfig index 496ccd6853..d161b118ae 100644 --- a/configs/acmesystems_aria_g25_256mb_defconfig +++ b/configs/acmesystems_aria_g25_256mb_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-256m" # Tools to build sdcard.img diff --git a/configs/acmesystems_arietta_g25_128mb_defconfig b/configs/acmesystems_arietta_g25_128mb_defconfig index 17ef7e757c..62bcbd44cb 100644 --- a/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/configs/acmesystems_arietta_g25_128mb_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-128m" # Tools to build sdcard.img diff --git a/configs/acmesystems_arietta_g25_256mb_defconfig b/configs/acmesystems_arietta_g25_256mb_defconfig index aa0236bbb3..94258444a2 100644 --- a/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/configs/acmesystems_arietta_g25_256mb_defconfig @@ -29,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-256m" # Tools to build sdcard.img diff --git a/configs/at91sam9260eknf_defconfig b/configs/at91sam9260eknf_defconfig index 807d0294e8..b795ad6eff 100644 --- a/configs/at91sam9260eknf_defconfig +++ b/configs/at91sam9260eknf_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9260eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 7511c96fe9..46626d857a 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9g20eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9g45m10ek_defconfig b/configs/at91sam9g45m10ek_defconfig index c598527f96..bf0771bc14 100644 --- a/configs/at91sam9g45m10ek_defconfig +++ b/configs/at91sam9g45m10ek_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9m10g45eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9rlek_defconfig b/configs/at91sam9rlek_defconfig index ba3a94c08c..5c0fdc5993 100644 --- a/configs/at91sam9rlek_defconfig +++ b/configs/at91sam9rlek_defconfig @@ -22,7 +22,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.10" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9rleknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9x5ek_defconfig b/configs/at91sam9x5ek_defconfig index d544e277a7..70e2d94826 100644 --- a/configs/at91sam9x5ek_defconfig +++ b/configs/at91sam9x5ek_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index 5f777fbc72..bfa8e95941 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -84,7 +84,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 63a537bd9c..79a300a81b 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -26,7 +26,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 698cb9230a..2e1a5c7f59 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -86,7 +86,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index b608bac0c6..e85c38af50 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -71,7 +71,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.2)/at91bootstrap3-v3.9.2.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d2_xplained_mmc_defconfig b/configs/atmel_sama5d2_xplained_mmc_defconfig index 2c73cc4c27..32e9f582e6 100644 --- a/configs/atmel_sama5d2_xplained_mmc_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index 6f641280c8..f71e284ff5 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -88,7 +88,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_defconfig b/configs/atmel_sama5d3_xplained_defconfig index 65304a2e42..b03c0db2c5 100644 --- a/configs/atmel_sama5d3_xplained_defconfig +++ b/configs/atmel_sama5d3_xplained_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index 28efe4cc8f..89c273da33 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -85,7 +85,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_mmc_defconfig b/configs/atmel_sama5d3_xplained_mmc_defconfig index 3fd5f1dde0..8256a5e199 100644 --- a/configs/atmel_sama5d3_xplained_mmc_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index 1f1881f8b7..7c39a5a2d4 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -87,7 +87,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d3xek_defconfig b/configs/atmel_sama5d3xek_defconfig index 63417eae7c..f71e84bf0f 100644 --- a/configs/atmel_sama5d3xek_defconfig +++ b/configs/atmel_sama5d3xek_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.8.10)/at91bootstrap3-v3.8.10.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3xeknf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig index 319f31956d..2a3e91954d 100644 --- a/configs/atmel_sama5d4_xplained_defconfig +++ b/configs/atmel_sama5d4_xplained_defconfig @@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index 71568f7497..6779c04d47 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -89,7 +89,7 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_mmc_defconfig b/configs/atmel_sama5d4_xplained_mmc_defconfig index ed294c35a1..e0b1e5147f 100644 --- a/configs/atmel_sama5d4_xplained_mmc_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index 93a5bd9299..e638e6758a 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -88,7 +88,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/beaglev_defconfig b/configs/beaglev_defconfig index 82a6e9abc4..70459bf3e8 100644 --- a/configs/beaglev_defconfig +++ b/configs/beaglev_defconfig @@ -4,7 +4,7 @@ BR2_RISCV_ISA_CUSTOM_RVM=y BR2_RISCV_ISA_CUSTOM_RVF=y BR2_RISCV_ISA_CUSTOM_RVD=y BR2_RISCV_ISA_CUSTOM_RVC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglev/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglev/genimage.cfg" diff --git a/configs/microchip_sam9x60ek_mmc_defconfig b/configs/microchip_sam9x60ek_mmc_defconfig index b389320e42..081aa16e24 100644 --- a/configs/microchip_sam9x60ek_mmc_defconfig +++ b/configs/microchip_sam9x60ek_mmc_defconfig @@ -14,7 +14,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.0)/at91bootstrap-v3.10.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sam9x60eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 6c3fcc6b3f..a2c4e29822 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -1,6 +1,10 @@ BR2_arm=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_PTHREAD_DEBUG=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/microchip/sam9x60ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y @@ -64,7 +68,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.0)/at91bootstrap-v3.10.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sam9x60eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig index 3bba4f6e3a..cebebaaea6 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index 031a533bc9..f6895dd83b 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -72,7 +72,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap-v3.10.3.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_wlsom1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/microchip_sama5d2_icp_mmc_defconfig b/configs/microchip_sama5d2_icp_mmc_defconfig index 2196555311..e41fdf2d31 100644 --- a/configs/microchip_sama5d2_icp_mmc_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_defconfig @@ -16,7 +16,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.0-rc2)/at91bootstrap-v4.0.0-rc2.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_icpsd_uboot" diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig index 1966d4baf1..50ae0a9ce7 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -59,7 +59,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.0-rc2)/at91bootstrap-v4.0.0-rc2.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_icpsd_uboot" diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index 1c1f7a3666..3290a1dda0 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -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 diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index 984fc8f92f..18d2c477d5 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -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 diff --git a/docs/manual/migrating.txt b/docs/manual/migrating.txt index 92e487c71e..cb1f5eacc9 100644 --- a/docs/manual/migrating.txt +++ b/docs/manual/migrating.txt @@ -8,6 +8,36 @@ Some versions have introduced backward incompatibilities. This section explains those incompatibilities, and for each explains what to do to complete the migration. +[[migrating-approach]] +=== General approach + +To migrate from an older Buildroot version, take the following steps. + +. For all your configurations, do a build in the old Buildroot + environment. Run +make graph-size+. Save + +graphs/file-size-stats.csv+ in a different location. Run +make + clean+ to remove the rest. +. Review the specific migration notes below and make the required + adaptations to external packages and custom build scripts. +. Update Buildroot. +. Run +make menuconfig+ starting from the existing +.config+. +. If anything is enabled in the Legacy menu, check its help text, + unselect it, and save the configuration. +. For more details, review the git commit messages for the packages that + you need. Change into the +packages+ directory and run + +git log .. -- +. +. Build in the new Buildroot environment. +. Fix build issues in external packages (usually due to updated + dependencies). +. Run +make graph-size+. +. Compare the new +file-size-stats.csv+ with the original one, to + check if no required files have disappeared and if no new big unneeded + files have appeared. +. For configuration (and other) files in a custom overlay that overwrite + files created by Buildroot, check if there are changes in the + Buildroot-generated file that need to be propagated to your custom + file. + [[br2-external-converting]] === Migrating to 2016.11 diff --git a/docs/website/download.html b/docs/website/download.html index 86c1e43d20..7eca55196c 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,105 +8,105 @@
Download
-

Latest long term support release: 2021.02.3

+

Latest long term support release: 2021.02.4

- +
- +
-

buildroot-2021.02.3.tar.gz

-

PGP signature

+

buildroot-2021.02.4.tar.gz

+

PGP signature

- +
- +
-

buildroot-2021.02.3.tar.bz2

-

PGP signature

+

buildroot-2021.02.4.tar.bz2

+

PGP signature

-

Latest stable release: 2021.05

+

Latest stable release: 2021.05.1

- +
- +
-

buildroot-2021.05.tar.gz

-

PGP signature

+

buildroot-2021.05.1.tar.gz

+

PGP signature

- +
- +
-

buildroot-2021.05.tar.bz2

-

PGP signature

+

buildroot-2021.05.1.tar.bz2

+

PGP signature

-

Latest release candidate: 2021.08-rc1

+

Latest release candidate: 2021.08-rc2

- +
- +
-

buildroot-2021.08-rc1.tar.gz

-

PGP signature

+

buildroot-2021.08-rc2.tar.gz

+

PGP signature

- +
- +
-

buildroot-2021.08-rc1.tar.bz2

-

PGP signature

+

buildroot-2021.08-rc2.tar.bz2

+

PGP signature

diff --git a/docs/website/news.html b/docs/website/news.html index d8784c7655..69c41dcc7e 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,65 @@

News

    +
  • +
    +
    +
    +

    2021.08-rc2 released

    +

    18 August 2021

    +
    +
    +

    2021.08-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

    Head to the downloads page to pick up the + 2021.08-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2021.02.4 released

    +

    11 August 2021

    +
    +
    +

    The 2021.02.4 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.02.3 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.02.4 release.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2021.05.1 released

    +

    10 August 2021

    +
    +
    +

    The 2021.05.1 bugfix release is out, fixing a number of important / + security related issues discovered since the 2021.05 release. See the + CHANGES + file for more details, read the + announcement + and go to the downloads page to pick up the + 2021.05.1 release.

    +
    +
    +
    • +
  • diff --git a/docs/website/support.html b/docs/website/support.html index 97ca296836..90231f601c 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -59,11 +59,8 @@ list, since there is a good chance someone else has asked the same question before.

    -
    - - - - + +
    diff --git a/linux/Config.in b/linux/Config.in index 6ace3f5ea4..3f00680a09 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.13)" 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.13.2" 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.13.9" 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 diff --git a/linux/linux.hash b/linux/linux.hash index 6ca09fee4b..ee5946e61f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,17 +1,17 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c3940d09cfb629f8c140b7b098cf6356d60cd8043df6b17c1f004077269ca937 linux-5.13.2.tar.xz -sha256 c8d499fc53ed14838994ec2f51591ae40d64cce68559cd897be8acbeeee7630f linux-5.12.10.tar.xz +sha256 72fe7cc1f0363523061659a21e24754697b27f405cb88a41a63038629636159a linux-5.13.9.tar.xz +sha256 e9381cd3525a02f5b895f74147e2440be443ecd45484c6c64075046bc6f94c73 linux-5.12.19.tar.xz sha256 11027c6114eb916edbcc37897226fb6263b2931911d2d5093550473ce1a57600 linux-5.11.22.tar.xz -sha256 83b81e433ba2f8ee143064fb163699ee857e26dd789006bc1e9edf1ccd0bd403 linux-5.10.43.tar.xz -sha256 17ee750a4aeb1c883d721e730d1f7e2855124585e2f47766864a1359a7ebe33c linux-5.4.125.tar.xz +sha256 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d linux-5.10.57.tar.xz +sha256 0471d0ccb7953cdae7d235192588ac5d72344851969962676d1703e69084a37f linux-5.4.139.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 d13fa552be602825c443fcca90d6bdd72f4ebef809889ef015dba4593d3224ab linux-4.4.272.tar.xz -sha256 f8bf0c390ae40ca736e104f10f744446bc534bf87ba1b6dbb2b7c9a8bece1058 linux-4.9.272.tar.xz -sha256 e4eae297a6fefefd8ce4781d98178a7c1ee51ca0a4c8a7e46e61b121fbab8b2a linux-4.14.236.tar.xz -sha256 aaaebdccf599f77148fe170642fa7dc2452cf994b5cbbb4d39cab9e7f4058896 linux-4.19.194.tar.xz +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 # 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 diff --git a/package/Config.in b/package/Config.in index 1b9a960bf7..2dc105defa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1377,7 +1377,6 @@ menu "Crypto" source "package/libgpgme/Config.in" source "package/libkcapi/Config.in" source "package/libksba/Config.in" - source "package/libmcrypt/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libolm/Config.in" @@ -2066,7 +2065,6 @@ menu "Miscellaneous" source "package/gsettings-desktop-schemas/Config.in" source "package/haveged/Config.in" source "package/linux-syscall-support/Config.in" - source "package/mcrypt/Config.in" source "package/mobile-broadband-provider-info/Config.in" source "package/netdata/Config.in" source "package/proj/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 8d443ea255..551352482e 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -79,7 +79,6 @@ menu "Host utilities" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" source "package/sdbusplus/Config.in.host" - source "package/sentry-cli/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2658c827a0..427280c1e6 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -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 diff --git a/package/belle-sip/belle-sip.mk b/package/belle-sip/belle-sip.mk index 23b60e51f5..11b96f3fd9 100644 --- a/package/belle-sip/belle-sip.mk +++ b/package/belle-sip/belle-sip.mk @@ -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 \ diff --git a/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch b/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch new file mode 100644 index 0000000000..d01bb97d99 --- /dev/null +++ b/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch @@ -0,0 +1,42 @@ +From dd37b97e79aea231ae026ac93c6ca4c7a2667582 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 7 Aug 2021 17:11:24 +0200 +Subject: [PATCH] Extras/VHACD/inc/vhacdMutex.h: fix musl build + +Fix the following build failure on musl (which does not provide +PTHREAD_MUTEX_RECURSIVE_NP): + +In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289, + from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19, + from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18, + from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28: +/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()': +/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h:97:54: error: 'PTHREAD_MUTEX_RECURSIVE_NP' was not declared in this scope; did you mean 'PTHREAD_MUTEX_RECURSIVE'? + 97 | VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/bulletphysics/bullet3/pull/3930] +--- + Extras/VHACD/inc/vhacdMutex.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Extras/VHACD/inc/vhacdMutex.h b/Extras/VHACD/inc/vhacdMutex.h +index 4d1ad2a7d..78c111383 100644 +--- a/Extras/VHACD/inc/vhacdMutex.h ++++ b/Extras/VHACD/inc/vhacdMutex.h +@@ -69,7 +69,7 @@ + #include + #endif + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || !defined(__GLIBC__) + #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE + #endif + +-- +2.30.2 + diff --git a/package/bullet/bullet.mk b/package/bullet/bullet.mk index 01931b58a8..cc72be7c60 100644 --- a/package/bullet/bullet.mk +++ b/package/bullet/bullet.mk @@ -24,7 +24,7 @@ endif BULLET_CXXFLAGS = $(TARGET_CXXFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180)$(BR2_TOOLCHAIN_HAS_GCC_BUG_101952),) BULLET_CXXFLAGS += -O0 endif diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script index c73ad6c2ef..74dc5532b9 100755 --- a/package/busybox/udhcpc.script +++ b/package/busybox/udhcpc.script @@ -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 diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index 5133c15a4f..c39e884cdd 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 fb50a663eefdc76bafa80c82bc045af13b1363e8f45cec8b442007aef6a41343 cjson-1.7.14.tar.gz +sha256 5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 cjson-1.7.15.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index daa498f9ff..ac8db5701f 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = 1.7.14 +CJSON_VERSION = 1.7.15 CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT diff --git a/package/cpio/0002-Rewrite-dynamic-string-support.patch b/package/cpio/0002-Rewrite-dynamic-string-support.patch new file mode 100644 index 0000000000..44282ae3f1 --- /dev/null +++ b/package/cpio/0002-Rewrite-dynamic-string-support.patch @@ -0,0 +1,461 @@ +From dd96882877721703e19272fe25034560b794061b Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +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 +--- + 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 + #endif +- + #include ++#include + #if defined(HAVE_STRING_H) || defined(STDC_HEADERS) + #include + #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 + diff --git a/package/cpio/0003-Fix-previous-commit.patch b/package/cpio/0003-Fix-previous-commit.patch new file mode 100644 index 0000000000..e33a8523d8 --- /dev/null +++ b/package/cpio/0003-Fix-previous-commit.patch @@ -0,0 +1,40 @@ +From dfc801c44a93bed7b3951905b188823d6a0432c8 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +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 +--- + 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 + diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 9ce281dd1c..e95ea742b3 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -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) diff --git a/package/efl/0003-ecore_fb-fix-build-with-tslib.patch b/package/efl/0003-ecore_fb-fix-build-with-tslib.patch new file mode 100644 index 0000000000..8eb159505f --- /dev/null +++ b/package/efl/0003-ecore_fb-fix-build-with-tslib.patch @@ -0,0 +1,35 @@ +From 9a785396a7940ec541cf4793f9c9f92548c99d4c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 10 Jul 2021 22:38:03 +0200 +Subject: [PATCH] ecore_fb: fix build with tslib + +Build with tslib is broken since version 1.25.0 and +https://git.enlightenment.org/core/efl.git/commit/?id=8e3606698eb439eecd7302a885504365aca7e564: + +/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/9.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: src/lib/ecore_fb/libecore_fb.so.1.25.1.p/ecore_fb_ts.c.o: in function `_ecore_fb_ts_fd_handler': +ecore_fb_ts.c:(.text+0x4c): undefined reference to `ts_read_raw' + +Fixes: + - http://autobuild.buildroot.org/results/fa111306b95316eed54771550474dae804fa261e + +Signed-off-by: Fabrice Fontaine +--- + src/lib/ecore_fb/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/ecore_fb/meson.build b/src/lib/ecore_fb/meson.build +index 6d50e0f146..7c7f6786c3 100644 +--- a/src/lib/ecore_fb/meson.build ++++ b/src/lib/ecore_fb/meson.build +@@ -22,7 +22,7 @@ ecore_fb_src = files([ + ecore_fb_lib = library('ecore_fb', + ecore_fb_src, pub_eo_file_target, + c_args : package_c_args, +- dependencies: ecore_fb_pub_deps + ecore_fb_deps, ++ dependencies: ecore_fb_pub_deps + ecore_fb_deps + ecore_fb_ext_deps, + include_directories : config_dir, + install: true, + version : meson.project_version() +-- +2.30.2 + diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk index c9998da357..98e6c61e38 100644 --- a/package/eigen/eigen.mk +++ b/package/eigen/eigen.mk @@ -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)) diff --git a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch new file mode 100644 index 0000000000..dbc19c1cec --- /dev/null +++ b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch @@ -0,0 +1,47 @@ +From 0c288853630b7b4e004774c39945d4a804afcfa8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 6 Aug 2021 09:17:20 +0200 +Subject: [PATCH] configure: add extralibs to extralibs_xxx + +Add extralibs to extralibs_xxx (e.g. extralibs_avformat) to allow +applications such as motion to retrieve ffmpeg dependencies such as +-latomic through pkg-config + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable] +--- + configure | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/configure b/configure +index 0bb3a7cf2b..3bda99e415 100755 +--- a/configure ++++ b/configure +@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") + source_path=${source_path} + LIBPREF=${LIBPREF} + LIBSUF=${LIBSUF} +-extralibs_avutil="$avutil_extralibs" +-extralibs_avcodec="$avcodec_extralibs" +-extralibs_avformat="$avformat_extralibs" +-extralibs_avdevice="$avdevice_extralibs" +-extralibs_avfilter="$avfilter_extralibs" +-extralibs_avresample="$avresample_extralibs" +-extralibs_postproc="$postproc_extralibs" +-extralibs_swscale="$swscale_extralibs" +-extralibs_swresample="$swresample_extralibs" ++extralibs_avutil="$avutil_extralibs $extralibs" ++extralibs_avcodec="$avcodec_extralibs $extralibs" ++extralibs_avformat="$avformat_extralibs $extralibs" ++extralibs_avdevice="$avdevice_extralibs $extralibs" ++extralibs_avfilter="$avfilter_extralibs $extralibs" ++extralibs_avresample="$avresample_extralibs $extralibs" ++extralibs_postproc="$postproc_extralibs $extralibs" ++extralibs_swscale="$swscale_extralibs $extralibs" ++extralibs_swresample="$swresample_extralibs $extralibs" + EOF + + for lib in $LIBRARY_LIST; do +-- +2.30.2 + diff --git a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch new file mode 100644 index 0000000000..b4bc0e12de --- /dev/null +++ b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch @@ -0,0 +1,51 @@ +From 0315cef04a5a8a953072691faa48af9acb6009bd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 10 Aug 2021 13:39:58 +0200 +Subject: [PATCH] include/flatbuffers/base.h: fix build on musl + +Build of applications using flatbuffers such as snort3 are broken on +musl since version 1.11.0 and +https://github.com/google/flatbuffers/commit/5f32f948102e65eaeea461b44f3b43f96c7a7a5a +because strtoll_l (and strtoull_l) are not available on musl. +flatbuffers checks for the availability of strtoull_l in CMakeLists.txt +so flatbuffers builds successfully but for applications using +flatbuffers, the result of this check is not available and +FLATBUFFERS_LOCALE_INDEPENDENT is set to 1 resulting in the following +build failure: + +In file included from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/flexbuffers.h:24, + from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/idl.h:26, + from /tmp/instance-0/output-1/build/snort3-3.1.6.0/src/network_inspectors/perf_monitor/fbs_formatter.cc:29: +/tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/util.h: In function 'void flatbuffers::strtoval_impl(int64_t*, const char*, char**, int)': +/tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/util.h:258:12: error: 'strtoll_l' was not declared in this scope; did you mean 'strcoll_l'? + 258 | *val = __strtoll_impl(str, endptr, base); + | ^~~~~~~~~~~~~~ + +Fix this failure by checking if __GNUC__ is defined before setting +FLATBUFFERS_LOCALE_INDEPENDENT to 1. + +Fixes: + - http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/google/flatbuffers/pull/6773] +--- + include/flatbuffers/base.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h +index de7898dc..101c7598 100644 +--- a/include/flatbuffers/base.h ++++ b/include/flatbuffers/base.h +@@ -266,7 +266,7 @@ namespace flatbuffers { + #ifndef FLATBUFFERS_LOCALE_INDEPENDENT + // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}. + #if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \ +- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) ++ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) + #define FLATBUFFERS_LOCALE_INDEPENDENT 1 + #else + #define FLATBUFFERS_LOCALE_INDEPENDENT 0 +-- +2.30.2 + diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 33218ed639..e34acde534 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -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 diff --git a/package/gcc/11.1.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch b/package/gcc/11.1.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch new file mode 100644 index 0000000000..6e32f953a3 --- /dev/null +++ b/package/gcc/11.1.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch @@ -0,0 +1,200 @@ +From eff8110674ef193481d3657456a262beeb9951ff Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Tue, 6 Apr 2021 05:47:17 +0900 +Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs + +When building libgeos we get an error with: + + linux-uclibc/9.3.0/crtbeginS.o: in function `__do_global_dtors_aux': + crtstuff.c:(.text+0x118): relocation truncated to fit: R_OR1K_GOT16 against symbol `__cxa_finalize' defined in .text section in + /home/shorne/work/openrisc/3eb9f9d0f6d8274b2d19753c006bd83f7d536e3c/output/host/or1k-buildroot-linux-uclibc/sysroot/lib/libc.so. + +This is caused by GOT code having a limit of 64k. In OpenRISC this +looks to be the only relocation code pattern to be limited to 64k. + +This patch allows specifying a new option -mcmodel=large which can be +used to generate 2 more instructions to construct 32-bit addresses for +up to 4G GOTs. + +gcc/ChangeLog: + + PR target/99783 + * config/or1k/or1k-opts.h: New file. + * config/or1k/or1k.c (or1k_legitimize_address_1, print_reloc): + Support generating gotha relocations if -mcmodel=large is + specified. + * config/or1k/or1k.h (TARGET_CMODEL_SMALL, TARGET_CMODEL_LARGE): + New macros. + * config/or1k/or1k.opt (mcmodel=): New option. + * doc/invoke.texi (OpenRISC Options): Document mcmodel. + +Signed-off-by: Giulio Benetti +--- + gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++ + gcc/config/or1k/or1k.c | 11 +++++++++-- + gcc/config/or1k/or1k.h | 7 +++++++ + gcc/config/or1k/or1k.opt | 19 +++++++++++++++++++ + gcc/doc/invoke.texi | 12 +++++++++++- + 5 files changed, 76 insertions(+), 3 deletions(-) + create mode 100644 gcc/config/or1k/or1k-opts.h + +diff --git a/gcc/config/or1k/or1k-opts.h b/gcc/config/or1k/or1k-opts.h +new file mode 100644 +index 00000000000..f791b894fdd +--- /dev/null ++++ b/gcc/config/or1k/or1k-opts.h +@@ -0,0 +1,30 @@ ++/* Definitions for option handling for OpenRISC. ++ Copyright (C) 2021 Free Software Foundation, Inc. ++ Contributed by Stafford Horne. ++ ++ This file is part of GCC. ++ ++ GCC is free software; you can redistribute it and/or modify it ++ under the terms of the GNU General Public License as published ++ by the Free Software Foundation; either version 3, or (at your ++ option) any later version. ++ ++ GCC is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public ++ License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with GCC; see the file COPYING3. If not see ++ . */ ++ ++#ifndef GCC_OR1K_OPTS_H ++#define GCC_OR1K_OPTS_H ++ ++/* The OpenRISC code generation models available. */ ++enum or1k_cmodel_type { ++ CMODEL_SMALL, ++ CMODEL_LARGE ++}; ++ ++#endif /* GCC_OR1K_OPTS_H */ +diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c +index e772a7addea..27d3fa17995 100644 +--- a/gcc/config/or1k/or1k.c ++++ b/gcc/config/or1k/or1k.c +@@ -750,7 +750,14 @@ or1k_legitimize_address_1 (rtx x, rtx scratch) + { + base = gen_sym_unspec (base, UNSPEC_GOT); + crtl->uses_pic_offset_table = 1; +- t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base); ++ if (TARGET_CMODEL_LARGE) ++ { ++ emit_insn (gen_rtx_SET (t1, gen_rtx_HIGH (Pmode, base))); ++ emit_insn (gen_add3_insn (t1, t1, pic_offset_table_rtx)); ++ t2 = gen_rtx_LO_SUM (Pmode, t1, base); ++ } ++ else ++ t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base); + t2 = gen_const_mem (Pmode, t2); + emit_insn (gen_rtx_SET (t1, t2)); + base = t1; +@@ -1089,7 +1096,7 @@ print_reloc (FILE *stream, rtx x, HOST_WIDE_INT add, reloc_kind kind) + no special markup. */ + static const char * const relocs[RKIND_MAX][RTYPE_MAX] = { + { "lo", "got", "gotofflo", "tpofflo", "gottpofflo", "tlsgdlo" }, +- { "ha", NULL, "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" }, ++ { "ha", "gotha", "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" }, + }; + reloc_type type = RTYPE_DIRECT; + +diff --git a/gcc/config/or1k/or1k.h b/gcc/config/or1k/or1k.h +index fe01ab81ead..669907e7e74 100644 +--- a/gcc/config/or1k/or1k.h ++++ b/gcc/config/or1k/or1k.h +@@ -21,6 +21,8 @@ + #ifndef GCC_OR1K_H + #define GCC_OR1K_H + ++#include "config/or1k/or1k-opts.h" ++ + /* Names to predefine in the preprocessor for this target machine. */ + #define TARGET_CPU_CPP_BUILTINS() \ + do \ +@@ -37,6 +39,11 @@ + } \ + while (0) + ++#define TARGET_CMODEL_SMALL \ ++ (or1k_code_model == CMODEL_SMALL) ++#define TARGET_CMODEL_LARGE \ ++ (or1k_code_model == CMODEL_LARGE) ++ + /* Storage layout. */ + + #define DEFAULT_SIGNED_CHAR 1 +diff --git a/gcc/config/or1k/or1k.opt b/gcc/config/or1k/or1k.opt +index 6bd0f3eee6d..cc23e3b8856 100644 +--- a/gcc/config/or1k/or1k.opt ++++ b/gcc/config/or1k/or1k.opt +@@ -21,6 +21,9 @@ + ; See the GCC internals manual (options.texi) for a description of + ; this file's format. + ++HeaderInclude ++config/or1k/or1k-opts.h ++ + mhard-div + Target RejectNegative InverseMask(SOFT_DIV) + Enable generation of hardware divide (l.div, l.divu) instructions. This is the +@@ -63,6 +66,22 @@ When -mhard-float is selected, enables generation of unordered floating point + compare and set flag (lf.sfun*) instructions. By default functions from libgcc + are used to perform unordered floating point compare and set flag operations. + ++mcmodel= ++Target RejectNegative Joined Enum(or1k_cmodel_type) Var(or1k_code_model) Init(CMODEL_SMALL) ++Specify the code model used for accessing memory addresses. Specifying large ++enables generating binaries with large global offset tables. By default the ++value is small. ++ ++Enum ++Name(or1k_cmodel_type) Type(enum or1k_cmodel_type) ++Known code model types (for use with the -mcmodel= option): ++ ++EnumValue ++Enum(or1k_cmodel_type) String(small) Value(CMODEL_SMALL) ++ ++EnumValue ++Enum(or1k_cmodel_type) String(large) Value(CMODEL_LARGE) ++ + mcmov + Target RejectNegative Mask(CMOV) + Enable generation of conditional move (l.cmov) instructions. By default the +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 57b97a0838c..d8a6b0b60c9 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1141,7 +1141,8 @@ Objective-C and Objective-C++ Dialects}. + @gccoptlist{-mboard=@var{name} -mnewlib -mhard-mul -mhard-div @gol + -msoft-mul -msoft-div @gol + -msoft-float -mhard-float -mdouble-float -munordered-float @gol +--mcmov -mror -mrori -msext -msfimm -mshftimm} ++-mcmov -mror -mrori -msext -msfimm -mshftimm @gol ++-mcmodel=@var{code-model}} + + @emph{PDP-11 Options} + @gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol +@@ -26684,6 +26685,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, + @code{l.slli}) instructions. By default extra instructions will be generated + to store the immediate to a register first. + ++@item -mcmodel=small ++@opindex mcmodel=small ++Generate OpenRISC code for the small model: The GOT is limited to 64k. This is ++the default model. ++ ++@item -mcmodel=large ++@opindex mcmodel=large ++Generate OpenRISC code for the large model: The GOT may grow up to 4G in size. ++ + + @end table + +-- +2.25.1 + diff --git a/package/gcc/11.1.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch b/package/gcc/11.1.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch new file mode 100644 index 0000000000..00dd5de2a3 --- /dev/null +++ b/package/gcc/11.1.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch @@ -0,0 +1,60 @@ +From da8a9d695b3c4b9397b5d9a27660bfa48af8d707 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Wed, 21 Apr 2021 05:33:15 +0900 +Subject: [PATCH] or1k: Use cmodel=large when building crtstuff + +When linking gcc runtime objects into large binaries the link may fail +with the below errors. This will happen even if we are building with +-mcmodel=large. + + /home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `deregister_tm_clones': + crtstuff.c:(.text+0x3c): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_deregisterTMCloneTable' + /home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `register_tm_clones': + crtstuff.c:(.text+0xc0): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_registerTMCloneTable' + +This patch builds the gcc crtstuff binaries always with the +-mcmodel=large option to ensure they can be linked into large binaries. + +libgcc/ChangeLog: + + PR target/99783 + * config.host (or1k-*, tmake_file): Add or1k/t-crtstuff. + * config/or1k/t-crtstuff: New file. + +Signed-off-by: Giulio Benetti +--- + libgcc/config.host | 4 ++-- + libgcc/config/or1k/t-crtstuff | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + create mode 100644 libgcc/config/or1k/t-crtstuff + +diff --git a/libgcc/config.host b/libgcc/config.host +index 50f00062232..8ca7a00082a 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -1119,12 +1119,12 @@ nios2-*-*) + extra_parts="$extra_parts crti.o crtn.o" + ;; + or1k-*-linux*) +- tmake_file="$tmake_file or1k/t-or1k" ++ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff" + tmake_file="$tmake_file t-softfp-sfdf t-softfp" + md_unwind_header=or1k/linux-unwind.h + ;; + or1k-*-*) +- tmake_file="$tmake_file or1k/t-or1k" ++ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff" + tmake_file="$tmake_file t-softfp-sfdf t-softfp" + ;; + pdp11-*-*) +diff --git a/libgcc/config/or1k/t-crtstuff b/libgcc/config/or1k/t-crtstuff +new file mode 100644 +index 00000000000..dcae7f3498e +--- /dev/null ++++ b/libgcc/config/or1k/t-crtstuff +@@ -0,0 +1,2 @@ ++# Compile crtbeginS.o and crtendS.o with -mcmodel=large ++CRTSTUFF_T_CFLAGS_S += -mcmodel=large +-- +2.25.1 + diff --git a/package/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch b/package/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch new file mode 100644 index 0000000000..a42bfb402e --- /dev/null +++ b/package/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch @@ -0,0 +1,29 @@ +From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001 +From: maryam ebrahimzadeh +Date: Mon, 19 Jul 2021 10:07:13 +0430 +Subject: [PATCH] fix read out-of-bands in reading tga header file + +[Retrieved from: +https://github.com/libgd/libgd/commit/8b111b2b4a4842179be66db68d84dda91a246032] +Signed-off-by: Fabrice Fontaine +--- + src/gd_tga.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/gd_tga.c b/src/gd_tga.c +index cae9428da..286febb28 100644 +--- a/src/gd_tga.c ++++ b/src/gd_tga.c +@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) + return -1; + } + +- gdGetBuf(tga->ident, tga->identsize, ctx); ++ ++ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) { ++ gd_error("fail to read header ident"); ++ return -1; ++ } + } + + return 1; diff --git a/package/gd/gd.mk b/package/gd/gd.mk index 2df81e6d37..90f966c294 100644 --- a/package/gd/gd.mk +++ b/package/gd/gd.mk @@ -15,6 +15,9 @@ GD_CPE_ID_PRODUCT = libgd GD_CONF_OPTS = --without-x --disable-rpath --disable-werror GD_DEPENDENCIES = host-pkgconf +# 0001-fix-read-out-of-bands-in-reading-tga-header-file.patch +GD_IGNORE_CVES += CVE-2021-38115 + # gd forgets to link utilities with -pthread even though it uses # pthreads, causing linking errors with static linking ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) diff --git a/package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/10.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/10.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/10.1/0003-use-asm-sgidefs.h.patch b/package/gdb/10.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/10.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/10.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/10.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/10.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 9814f3a79b..142bf1458a 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -91,5 +91,14 @@ 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 && !BR2_riscv) - default "10.1" if BR2_GDB_VERSION_10 || (!BR2_PACKAGE_HOST_GDB && BR2_riscv) + default "10.2" if BR2_GDB_VERSION_10 || (!BR2_PACKAGE_HOST_GDB && BR2_riscv) + depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB + +# recent gdb versions (>= 10) have gdbserver moved at the top-level, +# which requires a different build logic. +config BR2_PACKAGE_GDB_TOPLEVEL + bool + default y if BR2_arc + default y if BR2_GDB_VERSION_10 + default y if !BR2_PACKAGE_HOST_GDB && BR2_riscv depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 3b4845d64c..c45ee7329f 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -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 diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 17e10e8b16..f9010019f5 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -8,19 +8,10 @@ GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION)) GDB_SITE = $(BR2_GNU_MIRROR)/gdb GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz -# recent gdb versions (>= 10) have gdbserver moved at the top-level, -# which requires a different build logic. -ifeq ($(BR2_GDB_VERSION_10),y) -GDB_GDBSERVER_TOPLEVEL = y -endif - ifeq ($(BR2_arc),y) GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION)) GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz GDB_FROM_GIT = y -# recent gdb versions (>= 10) have gdbserver moved at the top-level, -# which requires a different build logic. -GDB_GDBSERVER_TOPLEVEL = y endif ifeq ($(BR2_csky),y) @@ -35,7 +26,7 @@ GDB_CPE_ID_VENDOR = gnu # On gdb < 10, if you want to build only gdbserver, you need to # configure only gdb/gdbserver. -ifeq ($(BR2_PACKAGE_GDB_DEBUGGER)$(GDB_GDBSERVER_TOPLEVEL),) +ifeq ($(BR2_PACKAGE_GDB_DEBUGGER)$(BR2_PACKAGE_GDB_TOPLEVEL),) GDB_SUBDIR = gdb/gdbserver # When we want to build the full gdb, or for very recent versions of diff --git a/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash b/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash deleted file mode 100644 index 558591522e..0000000000 --- a/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 c3828224d69a42f5b6982cbec8ae01cf494fe975ce9023e36ff2c10a2fb93e42 glibc-2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 1c8c409878..1eff245588 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -11,13 +11,7 @@ else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -ifeq ($(BR2_RISCV_32),y) -# RISC-V 32-bit (RV32) requires glibc 2.33 or newer -# Until 2.33 is released, just use master -GLIBC_VERSION = 2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99 -else GLIBC_VERSION = 2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f -endif # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index d8138b2e96..81938b14df 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -116,22 +116,22 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS # Gobject-introspection installs Makefile.introspection in # $(STAGING_DIR)/usr/share which is needed for autotools-based programs to - # build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc + # build .gir and .typelib files. Unfortunately, gobject-introspection-1.0.pc # uses $(prefix)/share as the directory, which # causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share. - # Change datarootdir to $(libdir)/../share which will prefix $(STAGING_DIR) + # Change datadir to $(libdir)/../share which will prefix $(STAGING_DIR) # to the correct location. - $(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \ + $(SED) "s%^datadir=.*%datadir=\$${libdir}/../share%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc # By default, girdir and typelibdir use datadir and libdir as their prefix, # of which pkg-config appends the sysroot directory. This results in files # being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files. - # Changing the prefix to exec_prefix prevents this error. - $(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \ + # Changing the prefix to prefix prevents this error. + $(SED) "s%girdir=.*%girdir=\$${prefix}/share/gir-1.0%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc - $(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \ + $(SED) "s%typelibdir=.*%typelibdir=\$${prefix}/lib/girepository-1.0%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc endef GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS diff --git a/package/guile/0004-module-system-base-target.scm-support-riscv32.patch b/package/guile/0004-module-system-base-target.scm-support-riscv32.patch new file mode 100644 index 0000000000..a988d2d995 --- /dev/null +++ b/package/guile/0004-module-system-base-target.scm-support-riscv32.patch @@ -0,0 +1,33 @@ +From 6142350d7c0562b0525462abdd41309ae0faa2eb Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 6 Aug 2021 19:49:37 +0200 +Subject: [PATCH] module/system/base/target.scm: support riscv32 + +Fix the following build failure on riscv32: + +system/base/target.scm:132:16: In procedure triplet-pointer-size: +unknown CPU word size "riscv32" + +Fixes: + - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8 + +Signed-off-by: Fabrice Fontaine +--- + module/system/base/target.scm | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/module/system/base/target.scm b/module/system/base/target.scm +index 2088cd866..dba46664d 100644 +--- a/module/system/base/target.scm ++++ b/module/system/base/target.scm +@@ -116,6 +116,7 @@ + + ((string-match "^x86_64-.*-gnux32" triplet) 4) ; x32 + ++ ((string-match "32$" cpu) 4) + ((string-match "64$" cpu) 8) + ((string-match "64_?[lbe][lbe]$" cpu) 8) + ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2" "m68k" "sh3" "sh4")) 4) +-- +2.30.2 + diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 849d362dc0..9edf5def08 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.2.tar.gz.sha256 -sha256 edf9788f7f3411498e3d7b21777036b4dc14183e95c8e2ce7577baa0ea4ea2aa haproxy-2.4.2.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.3.tar.gz.sha256 +sha256 ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405 haproxy-2.4.3.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 4c02b6d334..85d4fa7e8d 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).2 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).3 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index f327a95eb6..c7f5dfe9d2 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -90,5 +90,9 @@ else HARFBUZZ_CONF_OPTS += -Dicu=disabled endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +HARFBUZZ_CXXFLAGS += $(TARGET_CXXFLAGS) -DHB_NO_MT +endif + $(eval $(meson-package)) $(eval $(host-meson-package)) diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk index b3cece0cfc..e851e1dfcc 100644 --- a/package/heirloom-mailx/heirloom-mailx.mk +++ b/package/heirloom-mailx/heirloom-mailx.mk @@ -20,10 +20,18 @@ define HEIRLOOM_MAILX_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SHELL) ./makeconfig) endef +HEIRLOOM_MAILX_CFLAGS = $(TARGET_CFLAGS) + # -fPIC is needed to build with NIOS2 toolchains. +HEIRLOOM_MAILX_CFLAGS += -fPIC + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101916),y) +HEIRLOOM_MAILX_CFLAGS += -O0 +endif + define HEIRLOOM_MAILX_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" \ + CFLAGS="$(HEIRLOOM_MAILX_CFLAGS)" \ -C $(@D) endef diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index ebb6243651..32d57ea76e 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -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: diff --git a/package/iputils/0001-meson-Make-tests-optional.patch b/package/iputils/0001-meson-Make-tests-optional.patch new file mode 100644 index 0000000000..e9ed1d77e8 --- /dev/null +++ b/package/iputils/0001-meson-Make-tests-optional.patch @@ -0,0 +1,218 @@ +From 3163c49f9f4ad473a00d8a345ee334a028376011 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Fri, 23 Jul 2021 16:32:46 +0200 +Subject: [PATCH] meson: Make tests optional + +Now can be disabled with -DSKIP_TESTS=true. + +It allows to avoid meson error during build when ip isn't installed. + +Closes: #359 + +Reviewed-by: Petr Vorel +Signed-off-by: Heiko Becker +[ pvorel: Rename variable TEST => SKIP_TESTS, default false, adjust +the description ] +Signed-off-by: Petr Vorel + +[Retrieved from: +https://github.com/iputils/iputils/commit/3163c49f9f4ad473a00d8a345ee334a028376011] +Signed-off-by: Fabrice Fontaine +--- + meson_options.txt | 3 ++ + ping/meson.build | 84 ++----------------------------------------- + ping/test/meson.build | 81 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 86 insertions(+), 82 deletions(-) + create mode 100644 ping/test/meson.build + +diff --git a/meson_options.txt b/meson_options.txt +index ac5f5d98..517667f4 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -72,3 +72,6 @@ option('INSTALL_SYSTEMD_UNITS', type: 'boolean', value: false, + + option('USE_GETTEXT', type: 'boolean', value: true, + description: 'Enable I18N') ++ ++option('SKIP_TESTS', type: 'boolean', value: false, ++ description: 'Skip tests during build') +diff --git a/ping/meson.build b/ping/meson.build +index 1e678ec8..83ea353c 100644 +--- a/ping/meson.build ++++ b/ping/meson.build +@@ -27,86 +27,6 @@ if (setcap_ping) + ) + endif + +-##### TESTS ##### +- +-# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_" +- +-# GitHub CI does not have working IPv6 +-# https://github.com/actions/virtual-environments/issues/668 +-ipv6_dst = [] +-ipv6_switch = [] +-r = run_command('ip', '-6', 'a') +-if r.stdout().strip().contains('::1') +- message('IPv6 enabled') +- ipv6_dst = [ '::1' ] +- ipv6_switch = [ '-6' ] +-else +- message('WARNING: IPv6 disabled') ++if not get_option('SKIP_TESTS') ++ subdir('test') + endif +- +-run_as_root = false +-r = run_command('id', '-u') +-if r.stdout().strip().to_int() == 0 +- message('running as root') +- run_as_root = true +-else +- message('running as normal user') +-endif +- +-foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst +- foreach switch : [ '', '-4' ] + ipv6_switch +- args = [ '-c1', dst ] +- should_fail = false +- +- if switch != '' +- args = [switch] + args +- if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1') +- should_fail = true +- endif +- endif +- +- name = 'ping ' + ' '.join(args) +- test(name, ping, args : args, should_fail : should_fail) +- endforeach +-endforeach +- +-ping_tests_opt = [ +- [ '-c1' ], +- [ '-c5', '-i0.1' ], +- [ '-c1', '-I', 'lo' ], +- [ '-c1', '-w1' ], +- [ '-c1', '-W1' ], +- [ '-c1', '-W1.1' ], +-] +-foreach dst : [ '127.0.0.1' ] + ipv6_dst +- foreach args : ping_tests_opt +- args += [ dst ] +- name = 'ping ' + ' '.join(args) +- test(name, ping, args : args) +- endforeach +-endforeach +- +-ping_tests_opt_fail = [ +- [ '-c1.1' ], +- [ '-I', 'nonexisting' ], +- [ '-w0.1' ], +- [ '-w0,1' ], +-] +-foreach dst : [ '127.0.0.1' ] + ipv6_dst +- foreach args : ping_tests_opt_fail +- args += [ dst ] +- name = 'ping ' + ' '.join(args) +- test(name, ping, args : args, should_fail : true) +- endforeach +-endforeach +- +-ping_tests_user_fail = [ +- [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root +-] +-foreach dst : [ '127.0.0.1' ] + ipv6_dst +- foreach args : ping_tests_user_fail +- args += [ dst ] +- name = 'ping ' + ' '.join(args) +- test(name, ping, args : args, should_fail : not run_as_root) +- endforeach +-endforeach +diff --git a/ping/test/meson.build b/ping/test/meson.build +new file mode 100644 +index 00000000..43aed758 +--- /dev/null ++++ b/ping/test/meson.build +@@ -0,0 +1,81 @@ ++# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_" ++ ++# GitHub CI does not have working IPv6 ++# https://github.com/actions/virtual-environments/issues/668 ++ipv6_dst = [] ++ipv6_switch = [] ++r = run_command('ip', '-6', 'a') ++if r.stdout().strip().contains('::1') ++ message('IPv6 enabled') ++ ipv6_dst = [ '::1' ] ++ ipv6_switch = [ '-6' ] ++else ++ message('WARNING: IPv6 disabled') ++endif ++ ++run_as_root = false ++r = run_command('id', '-u') ++if r.stdout().strip().to_int() == 0 ++ message('running as root') ++ run_as_root = true ++else ++ message('running as normal user') ++endif ++ ++foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst ++ foreach switch : [ '', '-4' ] + ipv6_switch ++ args = [ '-c1', dst ] ++ should_fail = false ++ ++ if switch != '' ++ args = [switch] + args ++ if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1') ++ should_fail = true ++ endif ++ endif ++ ++ name = 'ping ' + ' '.join(args) ++ test(name, ping, args : args, should_fail : should_fail) ++ endforeach ++endforeach ++ ++ping_tests_opt = [ ++ [ '-c1' ], ++ [ '-c5', '-i0.1' ], ++ [ '-c1', '-I', 'lo' ], ++ [ '-c1', '-w1' ], ++ [ '-c1', '-W1' ], ++ [ '-c1', '-W1.1' ], ++] ++foreach dst : [ '127.0.0.1' ] + ipv6_dst ++ foreach args : ping_tests_opt ++ args += [ dst ] ++ name = 'ping ' + ' '.join(args) ++ test(name, ping, args : args) ++ endforeach ++endforeach ++ ++ping_tests_opt_fail = [ ++ [ '-c1.1' ], ++ [ '-I', 'nonexisting' ], ++ [ '-w0.1' ], ++ [ '-w0,1' ], ++] ++foreach dst : [ '127.0.0.1' ] + ipv6_dst ++ foreach args : ping_tests_opt_fail ++ args += [ dst ] ++ name = 'ping ' + ' '.join(args) ++ test(name, ping, args : args, should_fail : true) ++ endforeach ++endforeach ++ ++ping_tests_user_fail = [ ++ [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root ++] ++foreach dst : [ '127.0.0.1' ] + ipv6_dst ++ foreach args : ping_tests_user_fail ++ args += [ dst ] ++ name = 'ping ' + ' '.join(args) ++ test(name, ping, args : args, should_fail : not run_as_root) ++ endforeach ++endforeach diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index af93909edf..5721436221 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -23,10 +23,11 @@ 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) + -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ + -DSKIP_TESTS=true # Selectively select the appropriate SELinux refpolicy modules IPUTILS_SELINUX_MODULES = \ diff --git a/package/jszip/0001-fix-Use-a-null-prototype-object-for-this-files.patch b/package/jszip/0001-fix-Use-a-null-prototype-object-for-this-files.patch new file mode 100644 index 0000000000..969db5b403 --- /dev/null +++ b/package/jszip/0001-fix-Use-a-null-prototype-object-for-this-files.patch @@ -0,0 +1,56 @@ +From 22357494f424178cb416cdb7d93b26dd4f824b36 Mon Sep 17 00:00:00 2001 +From: Michael Aquilina +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 +--- + 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 */ + }, + + /** diff --git a/package/jszip/jszip.mk b/package/jszip/jszip.mk index 04bd0a7b34..a93766be11 100644 --- a/package/jszip/jszip.mk +++ b/package/jszip/jszip.mk @@ -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 \ diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch new file mode 100644 index 0000000000..1768c668b7 --- /dev/null +++ b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch @@ -0,0 +1,61 @@ +From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 +From: Thomas Huth +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 +Signed-off-by: Matthew Weber +--- + 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 + diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index bf0d6e4fdd..d31e9f55f4 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -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 diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 9cc69fd45a..eec256ba75 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -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 diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk index 8215f552cd..d033e28f40 100644 --- a/package/libargtable2/libargtable2.mk +++ b/package/libargtable2/libargtable2.mk @@ -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 \ diff --git a/package/libbpf/Config.in b/package/libbpf/Config.in index 9eadf0254a..3aa6679b3a 100644 --- a/package/libbpf/Config.in +++ b/package/libbpf/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_LIBBPF depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_ZLIB @@ -24,8 +25,9 @@ config BR2_PACKAGE_LIBBPF https://github.com/libbpf/libbpf -comment "libbpf needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" +comment "libbpf needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.13" depends on BR2_PACKAGE_LIBBPF_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch b/package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch index 83d1b92051..c7e789c02e 100644 --- a/package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch +++ b/package/libebml/0001-include-appropriate-header-files-for-std-numeric_limits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] include appropriate header files for std::numeric_limits Fixes #80. -[Retrieved from: +[Retrieved (and updated to remove ChangeLog update) from: https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806] Signed-off-by: Fabrice Fontaine --- @@ -14,18 +14,6 @@ Signed-off-by: Fabrice Fontaine src/EbmlUnicodeString.cpp | 1 + 3 files changed, 6 insertions(+) -diff --git a/ChangeLog b/ChangeLog -index 034cf86..e4b13a9 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+2021-02-27 Moritz Bunkus -+ -+ * Fix compilation with g++ 11. Fixes #80. -+ - 2021-02-21 Steve Lhomme - - * Remove Coremake project files diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp index 27e55fd..4c05fcf 100644 --- a/src/EbmlString.cpp diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash index 3457f613f5..376920c3cc 100644 --- a/package/libepoxy/libepoxy.hash +++ b/package/libepoxy/libepoxy.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.8.sha256sum -sha256 cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d libepoxy-1.5.8.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.9.sha256sum +sha256 d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4 libepoxy-1.5.9.tar.xz # Hashes for license files: sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index 04fffe4541..5a71fe5998 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -5,7 +5,7 @@ ################################################################################ LIBEPOXY_VERSION_MAJOR = 1.5 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).8 +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).9 LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES diff --git a/package/libesmtp/Config.in b/package/libesmtp/Config.in index db2dc8ec9c..c631d127e0 100644 --- a/package/libesmtp/Config.in +++ b/package/libesmtp/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_LIBESMTP bool "libesmtp" depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL help Library for sending emails through SMTP. diff --git a/package/libesmtp/libesmtp.hash b/package/libesmtp/libesmtp.hash index 9e1ca22b5b..596ed4eaca 100644 --- a/package/libesmtp/libesmtp.hash +++ b/package/libesmtp/libesmtp.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b libesmtp-1.0.6.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB +sha256 32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3 libesmtp-1.1.0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING.GPL +sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 LICENSE diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk index 1f5cdec191..10fe7bf324 100644 --- a/package/libesmtp/libesmtp.mk +++ b/package/libesmtp/libesmtp.mk @@ -4,14 +4,24 @@ # ################################################################################ -LIBESMTP_VERSION = 1.0.6 -LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2 -LIBESMTP_SITE = http://sources.buildroot.net/libesmtp +LIBESMTP_VERSION = 1.1.0 +LIBESMTP_SITE = $(call github,libesmtp,libESMTP,v$(LIBESMTP_VERSION)) LIBESMTP_INSTALL_STAGING = YES -LIBESMTP_CONFIG_SCRIPTS = libesmtp-config -LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) -LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB +LIBESMTP_LICENSE_FILES = COPYING.GPL LICENSE LIBESMTP_CPE_ID_VENDOR = libesmtp_project -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBESMTP_CONF_OPTS += -Dtls=enabled +LIBESMTP_DEPENDENCIES += openssl +else +LIBESMTP_CONF_OPTS += -Dtls=disabled +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBESMTP_CONF_OPTS += -Dpthreads=enabled +else +LIBESMTP_CONF_OPTS += -Dpthreads=disabled +endif + +$(eval $(meson-package)) diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 0ef2786988..85b4ab5b84 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -13,5 +13,9 @@ LIBFFI_INSTALL_STAGING = YES # We're patching Makefile.am LIBFFI_AUTORECONF = YES +# The static exec trampolines is enabled by default since +# libffi 3.4.2. However it doesn't work with gobject-introspection. +LIBFFI_CONF_OPTS = --disable-exec-static-tramp + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index ab2035c62a..097ad54d03 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -23,6 +23,10 @@ ifeq ($(BR2_arm)$(BR2_armeb),y) LIBGEOS_CONF_OPTS += -DDISABLE_GEOS_INLINE=ON endif +ifeq ($(BR2_or1k),y) +LIBGEOS_CXXFLAGS += -mcmodel=large +endif + LIBGEOS_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(LIBGEOS_CXXFLAGS)" $(eval $(cmake-package)) diff --git a/package/libmcrypt/0001-nocxx.patch b/package/libmcrypt/0001-nocxx.patch deleted file mode 100644 index b1c28713a1..0000000000 --- a/package/libmcrypt/0001-nocxx.patch +++ /dev/null @@ -1,15 +0,0 @@ -libmcrypt doesn't use C++ so remove the check. - -Signed-off-by: Gustavo Zacarias - -diff -Nura libmcrypt-2.5.8.orig/configure.in libmcrypt-2.5.8/configure.in ---- libmcrypt-2.5.8.orig/configure.in 2013-01-07 12:20:44.332200669 -0300 -+++ libmcrypt-2.5.8/configure.in 2013-01-07 12:20:50.405390565 -0300 -@@ -19,7 +19,6 @@ - - AC_PROG_MAKE_SET - --AC_PROG_CXX - AC_PROG_CC - AC_PROG_CPP - AC_PROG_INSTALL diff --git a/package/libmcrypt/Config.in b/package/libmcrypt/Config.in deleted file mode 100644 index 784d2c2af6..0000000000 --- a/package/libmcrypt/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBMCRYPT - bool "libmcrypt" - help - libmcrypt is a library that provides uniform interface to - access several encryption algorithms. - - http://mcrypt.sourceforge.net/ diff --git a/package/libmcrypt/libmcrypt.hash b/package/libmcrypt/libmcrypt.hash deleted file mode 100644 index 30b57522b8..0000000000 --- a/package/libmcrypt/libmcrypt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e libmcrypt-2.5.8.tar.gz -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libmcrypt/libmcrypt.mk b/package/libmcrypt/libmcrypt.mk deleted file mode 100644 index e93f0136b3..0000000000 --- a/package/libmcrypt/libmcrypt.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libmcrypt -# -################################################################################ - -LIBMCRYPT_VERSION = 2.5.8 -LIBMCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$(LIBMCRYPT_VERSION) -LIBMCRYPT_AUTORECONF = YES -LIBMCRYPT_INSTALL_STAGING = YES -LIBMCRYPT_LICENSE = LGPL-2.1 -LIBMCRYPT_LICENSE_FILES = COPYING.LIB -LIBMCRYPT_CONFIG_SCRIPTS = libmcrypt-config - -$(eval $(autotools-package)) diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 66e7e522a1..be46eb6e02 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -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)) diff --git a/package/libnss/0001-lib-freebl-sha512.c-fix-SHA256-redefinition-on-ARM-b.patch b/package/libnss/0001-lib-freebl-sha512.c-fix-SHA256-redefinition-on-ARM-b.patch new file mode 100644 index 0000000000..f925f20051 --- /dev/null +++ b/package/libnss/0001-lib-freebl-sha512.c-fix-SHA256-redefinition-on-ARM-b.patch @@ -0,0 +1,47 @@ +From 434d79c52db5b680accc531572319bd7094fa470 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 7 Aug 2021 23:19:01 +0200 +Subject: [PATCH] lib/freebl/sha512.c: fix SHA256 redefinition on ARM big + endian + +For an unknown reason, SHA256_{Compress,Update}_Native are defined in +lib/freebl/sha512.c if IS_LITTLE_ENDIAN is undefined since version 3.68 +and +https://github.com/nss-dev/nss/commit/e1e00f21f2d73e0d5d27651ad5606efa5714abe4 + +This raises the following build failure on ARM big endian: + +Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/sha256-armv8.o: In function `SHA256_Compress_Native': +sha256-armv8.c:(.text.SHA256_Compress_Native+0x0): multiple definition of `SHA256_Compress_Native' +Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/sha512.o:sha512.c:(.text.SHA256_Compress_Native+0x0): first defined here +Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/sha256-armv8.o: In function `SHA256_Update_Native': +sha256-armv8.c:(.text.SHA256_Update_Native+0x0): multiple definition of `SHA256_Update_Native' +Linux2.6_aarch64_aarch64_be-linux-gnu-gcc_glibc_PTH_64_DBG.OBJ/Linux_SINGLE_SHLIB/sha512.o:sha512.c:(.text.SHA256_Update_Native+0x0): first defined here + +Revert this change as it seems completely unrelated to the commit title +"Bug 1655493 - Support SHA2 HW acceleration using Intel SHA Extension" + +Fixes: + - http://autobuild.buildroot.org/results/237aba0c16a34fec1b0fe50fe08cace438eda1bf + +Signed-off-by: Fabrice Fontaine +--- + nss/lib/freebl/sha512.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/lib/freebl/sha512.c b/nss/lib/freebl/sha512.c +index 946ab9f7f..3ec414b52 100644 +--- a/nss/lib/freebl/sha512.c ++++ b/nss/lib/freebl/sha512.c +@@ -164,7 +164,7 @@ static void SHA256_Compress_Generic(SHA256Context *ctx); + static void SHA256_Update_Generic(SHA256Context *ctx, const unsigned char *input, + unsigned int inputLen); + +-#if !defined(USE_HW_SHA2) || !defined(IS_LITTLE_ENDIAN) ++#if !defined(USE_HW_SHA2) + void + SHA256_Compress_Native(SHA256Context *ctx) + { +-- +2.30.2 + diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 585486ffbe..93c688d9dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -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 diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 389a0a8b32..f139213315 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -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 diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 35a41e5bd0..7b1d76a0c1 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -16,6 +16,13 @@ LIBQMI_DEPENDENCIES = libglib2 LIBQMI_CONF_OPTS = --disable-Werror +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBQMI_DEPENDENCIES += gobject-introspection +LIBQMI_CONF_OPTS += --enable-introspection +else +LIBQMI_CONF_OPTS += --disable-introspection +endif + # if libgudev available, request udev support for a better # qmi-firmware-update experience ifeq ($(BR2_PACKAGE_LIBGUDEV),y) diff --git a/package/libqrtr-glib/libqrtr-glib.mk b/package/libqrtr-glib/libqrtr-glib.mk index b9fc5cf3ba..6ab8335417 100644 --- a/package/libqrtr-glib/libqrtr-glib.mk +++ b/package/libqrtr-glib/libqrtr-glib.mk @@ -12,4 +12,11 @@ LIBQRTR_GLIB_LICENSE_FILES = COPYING.LIB LIBQRTR_GLIB_INSTALL_STAGING = YES LIBQRTR_GLIB_DEPENDENCIES = libglib2 +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBQRTR_GLIB_CONF_OPTS += --enable-introspection +LIBQRTR_GLIB_DEPENDENCIES += gobject-introspection +else +LIBQRTR_GLIB_CONF_OPTS += --disable-introspection +endif + $(eval $(autotools-package)) diff --git a/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch new file mode 100644 index 0000000000..f34ae85834 --- /dev/null +++ b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch @@ -0,0 +1,37 @@ +always expose SSL_OP_NO_TLSv1_3 + +like in OpenSSL, see https://github.com/openssl/openssl/blob/master/include/openssl/ssl.h.in#L399 + +like SSL_OP_NO_DTLSv1_2, see commit "Expose various DTLSv1.2 specific functions and defines" + +this change fixes the compilation of vsftpd 3.0.4 & 3.0.5, which fails with the following error: +``` +ssl.c: In function 'ssl_init': +ssl.c:98:18: error: 'SSL_OP_NO_TLSv1_3' undeclared (first use in this function); did you mean 'SSL_OP_NO_TLSv1_1'? +``` + +Signed-off-by: Francois Perrad +Fetched from: https://github.com/libressl-portable/openbsd/pull/124 +--- + include/openssl/ssl.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h +index 46f24b2ea..4048a6e63 100644 +--- a/include/openssl/ssl.h ++++ b/include/openssl/ssl.h +@@ -516,11 +516,7 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, + #define SSL_OP_NO_TLSv1 0x04000000L + #define SSL_OP_NO_TLSv1_2 0x08000000L + #define SSL_OP_NO_TLSv1_1 0x10000000L +- +-#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) + #define SSL_OP_NO_TLSv1_3 0x20000000L +-#endif +- + #define SSL_OP_NO_DTLSv1 0x40000000L + #define SSL_OP_NO_DTLSv1_2 0x80000000L + +-- +2.30.2 + diff --git a/package/libshout/libshout.mk b/package/libshout/libshout.mk index 57d26390c5..4afb762de6 100644 --- a/package/libshout/libshout.mk +++ b/package/libshout/libshout.mk @@ -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 diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 2f191882cc..8c3021242a 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -5,15 +5,18 @@ config BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_USE_MMU # fork() -comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12" +comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12 (4.11 for AArch64)" depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || !BR2_USE_MMU || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) config BR2_PACKAGE_LIBVIRT bool "libvirt" depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index a0fd5af951..1b420771f5 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -10,8 +10,21 @@ LIBVIRT_SOURCE = libvirt-$(LIBVIRT_VERSION).tar.xz LIBVIRT_LICENSE = LGPL-2.1+ LIBVIRT_LICENSE_FILES = COPYING LIBVIRT_CPE_ID_VENDOR = redhat -LIBVIRT_DEPENDENCIES = host-nfs-utils host-pkgconf host-python-docutils \ - gnutls libglib2 libpciaccess libtirpc libxml2 udev zlib +LIBVIRT_DEPENDENCIES = \ + host-libxslt \ + host-nfs-utils \ + host-pkgconf \ + host-python-docutils \ + gnutls \ + libglib2 \ + libpciaccess \ + libtirpc \ + libxml2 \ + udev \ + zlib \ + $(TARGET_NLS_DEPENDENCIES) + +LIBVIRT_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBVIRT_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" \ @@ -39,6 +52,7 @@ LIBVIRT_CONF_OPTS = \ -Dinit_script=$(if $(BR2_INIT_SYSTEMD),systemd,none) \ -Dlogin_shell=disabled \ -Dnetcf=disabled \ + -Dnls=$(if $(BR2_SYSTEM_ENABLE_NLS),enabled,disabled) \ -Dnumad=disabled \ -Dopenwsman=disabled \ -Dpciaccess=enabled \ @@ -53,6 +67,13 @@ LIBVIRT_CONF_OPTS = \ -Dudev=enabled \ -Dwireshark_dissector=disabled +# warning_level should only drive the level of warnings during the +# compilation of C code. However, libvirt misuses that to also +# enable SSP when warning_level == 2 +# Force warning_level=1 to disable SSP, and let our toolchain wrapper +# handle it. +LIBVIRT_CONF_OPTS += -Dwarning_level=1 + ifeq ($(BR2_PACKAGE_ATTR),y) LIBVIRT_CONF_OPTS += -Dattr=enabled LIBVIRT_DEPENDENCIES += attr @@ -170,8 +191,8 @@ else LIBVIRT_CONF_OPTS += -Dlibssh=disabled endif -# Can't build nss plugin without network -ifeq ($(BR2_PACKAGE_LIBNSS),y) +# Can't build nss plugin without network or yajl +ifeq ($(BR2_PACKAGE_LIBNSS)$(BR2_PACKAGE_YAJL),yy) LIBVIRT_CONF_OPTS += -Dnss=enabled LIBVIRT_DEPENDENCIES += libnss else diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a15fed5a4f..18f51b93be 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -370,15 +370,15 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.272" if BR2_KERNEL_HEADERS_4_4 - default "4.9.272" if BR2_KERNEL_HEADERS_4_9 - default "4.14.236" if BR2_KERNEL_HEADERS_4_14 - default "4.19.194" if BR2_KERNEL_HEADERS_4_19 - default "5.4.125" if BR2_KERNEL_HEADERS_5_4 - default "5.10.43" if BR2_KERNEL_HEADERS_5_10 + 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 "5.11.22" if BR2_KERNEL_HEADERS_5_11 - default "5.12.10" if BR2_KERNEL_HEADERS_5_12 - default "5.13.2" if BR2_KERNEL_HEADERS_5_13 + default "5.12.19" if BR2_KERNEL_HEADERS_5_12 + default "5.13.9" if BR2_KERNEL_HEADERS_5_13 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/package/linux-pam/0001-configure-test-a-o-is-not-POSIX.patch b/package/linux-pam/0001-configure-test-a-o-is-not-POSIX.patch new file mode 100644 index 0000000000..ac16455956 --- /dev/null +++ b/package/linux-pam/0001-configure-test-a-o-is-not-POSIX.patch @@ -0,0 +1,75 @@ +From 7c54428db5b639f05093459b1ba3b77456c5a548 Mon Sep 17 00:00:00 2001 +From: "Issam E. Maghni" +Date: Wed, 16 Dec 2020 18:48:28 -0500 +Subject: [PATCH] configure: test -a|o is not POSIX + +Fixes `test: too many arguments` when building Linux-PAM using sbase. +This is due to a non-POSIX syntax test ... -a ... and test ... -o .... + +> The XSI extensions specifying the -a and -o binary primaries and the +> '(' and ')' operators have been marked obsolescent. + +See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html + +[Retrieved from: +https://github.com/linux-pam/linux-pam/commit/7c54428db5b639f05093459b1ba3b77456c5a548] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5eade7cd3..e325bdd3c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -346,7 +346,7 @@ if test x"$WITH_LIBAUDIT" != xno ; then + [HAVE_AUDIT_TTY_STATUS=""], + [#include ])] + ) +- if test -n "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then ++ if test -n "$LIBAUDIT" && test "$ac_cv_header_libaudit_h" != "no" ; then + AC_DEFINE([HAVE_LIBAUDIT], 1, [Define to 1 if audit support should be compiled in.]) + fi + if test -n "$HAVE_AUDIT_TTY_STATUS" ; then +@@ -373,12 +373,12 @@ esac + AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) + LIBS=$BACKUP_LIBS + AC_SUBST(LIBCRYPT) +-if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then ++if test "$LIBCRYPT" = "-lxcrypt" && test "$ac_cv_header_xcrypt_h" = "yes" ; then + AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.]) + fi + + AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes|no)],[use specified random device instead of /dev/urandom or 'no' to disable]), opt_randomdev=$withval) +-if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then ++if test "$opt_randomdev" = yes || test -z "$opt_randomdev"; then + opt_randomdev="/dev/urandom" + elif test "$opt_randomdev" = no; then + opt_randomdev= +@@ -395,7 +395,7 @@ AC_ARG_ENABLE([db], + AC_ARG_WITH([db-uniquename], + AS_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.])) + if test x"$WITH_DB" != xno ; then +- if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then ++ if test x"$WITH_DB" = xyes || test x"$WITH_DB" = xdb ; then + old_libs=$LIBS + LIBS="$LIBS -ldb$with_db_uniquename" + AC_CHECK_FUNCS([db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store], +@@ -572,7 +572,7 @@ fi + + AC_PATH_PROG([FO2PDF], [fop]) + +-AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno -a x$enable_doc != xno) ++AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno && test x$enable_doc != xno) + AM_CONDITIONAL(ENABLE_GENERATE_PDF, test -n "$FO2PDF") + + +@@ -625,7 +625,7 @@ esac + AM_CONDITIONAL([COND_BUILD_PAM_KEYINIT], [test "$have_key_syscalls" = 1]) + AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes]) + AM_CONDITIONAL([COND_BUILD_PAM_NAMESPACE], [test "$ac_cv_func_unshare" = yes]) +-AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) ++AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes || test "$ac_cv_func_ruserok" = yes]) + AM_CONDITIONAL([COND_BUILD_PAM_SELINUX], [test -n "$LIBSELINUX"]) + AM_CONDITIONAL([COND_BUILD_PAM_SEPERMIT], [test -n "$LIBSELINUX"]) + AM_CONDITIONAL([COND_BUILD_PAM_SETQUOTA], [test "$ac_cv_func_quotactl" = yes]) diff --git a/package/linux-pam/0002-Remove-support-for-legacy-xcrypt.patch b/package/linux-pam/0002-Remove-support-for-legacy-xcrypt.patch new file mode 100644 index 0000000000..9f4e8bcde0 --- /dev/null +++ b/package/linux-pam/0002-Remove-support-for-legacy-xcrypt.patch @@ -0,0 +1,149 @@ +From 530c9f9e2d746e1d168c6b17863debda7664ac7c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Fri, 28 Feb 2020 15:47:52 +0100 +Subject: [PATCH] Remove support for legacy xcrypt + +Since many distributions are shipping a version of libxcrypt >= 4.0.0 +as a replacement for glibc's libcrypt now, older versions of xcrypt, +which could be installed in parallel, are not relevant anymore. + +* configure.ac (AC_CHECK_HEADERS): Remove xcrypt.h. +(AC_SEARCH_LIBS): Remove xcrypt. +(AC_CHECK_FUNCS): Remove crypt_gensalt_r. +(AC_DEFINE): Remove HAVE_LIBXCRYPT. +* modules/pam_pwhistory/opasswd.c [HAVE_LIBXCRYPT]: Remove. +* modules/pam_unix/bigcrypt.c [HAVE_LIBXCRYPT]: Likewise. +* modules/pam_userdb/pam_userdb.c [HAVE_LIBXCRYPT]: Likewise. +* modules/pam_unix/passverify.c [HAVE_LIBXCRYPT]: Likewise. +(create_password_hash) [HAVE_LIBXCRYPT]: Likewise. + +[Retrieved from: +https://github.com/linux-pam/linux-pam/commit/530c9f9e2d746e1d168c6b17863debda7664ac7c] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 12 +++--------- + modules/pam_pwhistory/opasswd.c | 4 +--- + modules/pam_unix/bigcrypt.c | 4 +--- + modules/pam_unix/passverify.c | 24 +++++------------------- + modules/pam_userdb/pam_userdb.c | 4 +--- + 5 files changed, 11 insertions(+), 37 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8e5d0ff7c..100565552 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -359,23 +359,17 @@ else + fi + AC_SUBST(LIBAUDIT) + +-AC_CHECK_HEADERS(xcrypt.h crypt.h) +-AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], +- [crypt_libs="xcrypt crypt"], +- [crypt_libs="crypt"]) ++AC_CHECK_HEADERS(crypt.h) + + BACKUP_LIBS=$LIBS +-AC_SEARCH_LIBS([crypt],[$crypt_libs]) ++AC_SEARCH_LIBS([crypt],[crypt]) + case "$ac_cv_search_crypt" in + -l*) LIBCRYPT="$ac_cv_search_crypt" ;; + *) LIBCRYPT="" ;; + esac +-AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) ++AC_CHECK_FUNCS([crypt_r]) + LIBS=$BACKUP_LIBS + AC_SUBST(LIBCRYPT) +-if test "$LIBCRYPT" = "-lxcrypt" && test "$ac_cv_header_xcrypt_h" = "yes" ; then +- AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.]) +-fi + + AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes|no)],[use specified random device instead of /dev/urandom or 'no' to disable]), opt_randomdev=$withval) + if test "$opt_randomdev" = yes || test -z "$opt_randomdev"; then +diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c +index 40296d590..a6cd3d2a3 100644 +--- a/modules/pam_pwhistory/opasswd.c ++++ b/modules/pam_pwhistory/opasswd.c +@@ -54,9 +54,7 @@ + #endif + #include + +-#if defined HAVE_LIBXCRYPT +-#include +-#elif defined (HAVE_CRYPT_H) ++#ifdef HAVE_CRYPT_H + #include + #endif + +diff --git a/modules/pam_unix/bigcrypt.c b/modules/pam_unix/bigcrypt.c +index 31be2f7b0..d8d61a4b0 100644 +--- a/modules/pam_unix/bigcrypt.c ++++ b/modules/pam_unix/bigcrypt.c +@@ -29,9 +29,7 @@ + #include + #include + #include +-#ifdef HAVE_LIBXCRYPT +-#include +-#elif defined(HAVE_CRYPT_H) ++#ifdef HAVE_CRYPT_H + #include + #endif + +diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c +index 5a19ed856..e833402c1 100644 +--- a/modules/pam_unix/passverify.c ++++ b/modules/pam_unix/passverify.c +@@ -19,9 +19,7 @@ + #include + #include + #include +-#ifdef HAVE_LIBXCRYPT +-#include +-#elif defined(HAVE_CRYPT_H) ++#ifdef HAVE_CRYPT_H + #include + #endif + +@@ -467,23 +465,11 @@ PAMH_ARG_DECL(char * create_password_hash, + */ + sp = crypt_gensalt_rn(algoid, rounds, NULL, 0, salt, sizeof(salt)); + #else +-#ifdef HAVE_CRYPT_GENSALT_R +- if (on(UNIX_BLOWFISH_PASS, ctrl)) { +- char entropy[17]; +- crypt_make_salt(entropy, sizeof(entropy) - 1); +- sp = crypt_gensalt_r (algoid, rounds, +- entropy, sizeof(entropy), +- salt, sizeof(salt)); +- } else { +-#endif +- sp = stpcpy(salt, algoid); +- if (on(UNIX_ALGO_ROUNDS, ctrl)) { +- sp += snprintf(sp, sizeof(salt) - (16 + 1 + (sp - salt)), "rounds=%u$", rounds); +- } +- crypt_make_salt(sp, 16); +-#ifdef HAVE_CRYPT_GENSALT_R ++ sp = stpcpy(salt, algoid); ++ if (on(UNIX_ALGO_ROUNDS, ctrl)) { ++ sp += snprintf(sp, sizeof(salt) - (16 + 1 + (sp - salt)), "rounds=%u$", rounds); + } +-#endif ++ crypt_make_salt(sp, 16); + #endif /* CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY */ + #ifdef HAVE_CRYPT_R + sp = NULL; +diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c +index d59801bfd..f467ea4c8 100644 +--- a/modules/pam_userdb/pam_userdb.c ++++ b/modules/pam_userdb/pam_userdb.c +@@ -17,9 +17,7 @@ + #include + #include + #include +-#ifdef HAVE_LIBXCRYPT +-#include +-#elif defined(HAVE_CRYPT_H) ++#ifdef HAVE_CRYPT_H + #include + #endif + diff --git a/package/linux-pam/0003-configure.ac-fix-build-with-libxcrypt-and-uclibc-ng.patch b/package/linux-pam/0003-configure.ac-fix-build-with-libxcrypt-and-uclibc-ng.patch new file mode 100644 index 0000000000..d452aed34d --- /dev/null +++ b/package/linux-pam/0003-configure.ac-fix-build-with-libxcrypt-and-uclibc-ng.patch @@ -0,0 +1,47 @@ +From fe1307512fb8892b5ceb3d884c793af8dbd4c16a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Jun 2021 07:13:56 +0200 +Subject: [PATCH] configure.ac: fix build with libxcrypt and uclibc-ng + +Fix the following build failure with libxcrypt and uclibc-ng: + +ld: unix_chkpwd-passverify.o: in function `verify_pwd_hash': +passverify.c:(.text+0xab4): undefined reference to `crypt_checksalt' + +Fixes: + - http://autobuild.buildroot.org/results/65d68b7c9c7de1c7cb0f941ff9982f93a49a56f8 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/linux-pam/linux-pam/commit/fe1307512fb8892b5ceb3d884c793af8dbd4c16a] +--- + configure.ac | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7a4b2e86..e9c57345 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -362,10 +362,18 @@ AC_SUBST(LIBAUDIT) + AC_CHECK_HEADERS(crypt.h) + + BACKUP_LIBS=$LIBS +-AC_SEARCH_LIBS([crypt],[crypt]) +-case "$ac_cv_search_crypt" in +- -l*) LIBCRYPT="$ac_cv_search_crypt" ;; +- *) LIBCRYPT="" ;; ++LIBCRYPT="" ++AC_SEARCH_LIBS([crypt_gensalt_rn],[crypt]) ++case "$ac_cv_search_crypt_gensalt_rn" in ++ -l*) LIBCRYPT="$ac_cv_search_crypt_gensalt_rn" ;; ++ no) AC_SEARCH_LIBS([crypt_r],[crypt]) ++ case "$ac_cv_search_crypt_r" in ++ -l*) LIBCRYPT="$ac_cv_search_crypt_r" ;; ++ no ) AC_SEARCH_LIBS([crypt],[crypt]) ++ case "$ac_cv_search_crypt" in ++ -l*) LIBCRYPT="$ac_cv_search_crypt" ;; ++ esac ;; ++ esac ;; + esac + AC_CHECK_FUNCS([crypt_r]) + LIBS=$BACKUP_LIBS diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 9c0815db24..389d32a9a8 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -17,11 +17,14 @@ LINUX_PAM_CONF_OPTS = \ --enable-securedir=/lib/security \ --libdir=/lib LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE_FILES = Copyright LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) LINUX_PAM_CPE_ID_VENDOR = linux-pam +# We're patching configure.ac +LINUX_PAM_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBSELINUX),y) LINUX_PAM_CONF_OPTS += --enable-selinux diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk index 2f3b19b5f8..b0f99ff106 100644 --- a/package/lmbench/lmbench.mk +++ b/package/lmbench/lmbench.mk @@ -18,6 +18,10 @@ LMBENCH_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` LMBENCH_LDLIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101915),y) +LMBENCH_CFLAGS += -O0 +endif + LMBENCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK define LMBENCH_CONFIGURE_CMDS diff --git a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch b/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch deleted file mode 100644 index 888d27fe4a..0000000000 --- a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0003-Fix-GCC-11-Warray-parameter-warning-for-__sigsetjmp-.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 44f1469daff3a0bfe67fb5839243f114ace3bad8 Mon Sep 17 00:00:00 2001 -From: Joseph Myers -Date: Mon, 5 Oct 2020 16:46:46 +0000 -Subject: [PATCH 3/4] Fix GCC 11 -Warray-parameter warning for __sigsetjmp (bug - 26647) - -This patch fixes part of bug 26647 (-Werror=array-parameter error -building with GCC 11 because of __sigsetjmp being declared using an -array parameter in one header and a pointer parameter in another). - -The fix is to split the struct __jmp_buf_tag definition out to a -separate bits/types/ header so it can be included in pthread.h, so -that pthread.h can declare __sigsetjmp with the type contents visible, -so can use an array (as in setjmp.h) rather than a pointer in the -declaration. - -Note that several other build failures with GCC 11 remain. This does -not fix the jmp_buf-related -Wstringop-overflow errors (also discussed -in bug 26647), or -Warray-parameter errors for other functions (bug -26686), or -Warray-bounds errors (bug 26687). - -Tested, with older compilers, natively for x86_64 and with -build-many-glibc.py for aarch64-linux-gnu. Tested with -build-many-glibcs.py with GCC mainline for aarch64-linux-gnu that this -gets past the -Warray-parameter issue for __sigsetjmp (with the next -build failure being the other one discussed in bug 26647). - -[Upstream: https://github.com/bminor/glibc/commit/19302b27bdacfe87e861ff46fc0fbad60dd6602d.patch] -Signed-off-by: Peter Seiderer ---- - include/bits/types/struct___jmp_buf_tag.h | 1 + - setjmp/Makefile | 3 +- - setjmp/bits/types/struct___jmp_buf_tag.h | 37 +++++++++++++++++++++++ - setjmp/setjmp.h | 15 +-------- - sysdeps/nptl/pthread.h | 5 +-- - 5 files changed, 44 insertions(+), 17 deletions(-) - create mode 100644 include/bits/types/struct___jmp_buf_tag.h - create mode 100644 setjmp/bits/types/struct___jmp_buf_tag.h - -diff --git a/include/bits/types/struct___jmp_buf_tag.h b/include/bits/types/struct___jmp_buf_tag.h -new file mode 100644 -index 00000000..e3250150 ---- /dev/null -+++ b/include/bits/types/struct___jmp_buf_tag.h -@@ -0,0 +1 @@ -+#include -diff --git a/setjmp/Makefile b/setjmp/Makefile -index dcac5693..603f61d7 100644 ---- a/setjmp/Makefile -+++ b/setjmp/Makefile -@@ -22,7 +22,8 @@ subdir := setjmp - - include ../Makeconfig - --headers := setjmp.h bits/setjmp.h bits/setjmp2.h -+headers := setjmp.h bits/setjmp.h bits/setjmp2.h \ -+ bits/types/struct___jmp_buf_tag.h - - routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \ - longjmp __longjmp jmp-unwind -diff --git a/setjmp/bits/types/struct___jmp_buf_tag.h b/setjmp/bits/types/struct___jmp_buf_tag.h -new file mode 100644 -index 00000000..9d8634f1 ---- /dev/null -+++ b/setjmp/bits/types/struct___jmp_buf_tag.h -@@ -0,0 +1,37 @@ -+/* Define struct __jmp_buf_tag. -+ Copyright (C) 1991-2020 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ -+#ifndef __jmp_buf_tag_defined -+#define __jmp_buf_tag_defined 1 -+ -+#include /* Get `__jmp_buf'. */ -+#include -+ -+/* Calling environment, plus possibly a saved signal mask. */ -+struct __jmp_buf_tag -+ { -+ /* NOTE: The machine-dependent definitions of `__sigsetjmp' -+ assume that a `jmp_buf' begins with a `__jmp_buf' and that -+ `__mask_was_saved' follows it. Do not move these members -+ or add others before it. */ -+ __jmp_buf __jmpbuf; /* Calling environment. */ -+ int __mask_was_saved; /* Saved the signal mask? */ -+ __sigset_t __saved_mask; /* Saved signal mask. */ -+ }; -+ -+#endif -diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h -index 4e3443c3..c6c59f40 100644 ---- a/setjmp/setjmp.h -+++ b/setjmp/setjmp.h -@@ -27,20 +27,7 @@ - __BEGIN_DECLS - - #include /* Get `__jmp_buf'. */ --#include -- --/* Calling environment, plus possibly a saved signal mask. */ --struct __jmp_buf_tag -- { -- /* NOTE: The machine-dependent definitions of `__sigsetjmp' -- assume that a `jmp_buf' begins with a `__jmp_buf' and that -- `__mask_was_saved' follows it. Do not move these members -- or add others before it. */ -- __jmp_buf __jmpbuf; /* Calling environment. */ -- int __mask_was_saved; /* Saved the signal mask? */ -- __sigset_t __saved_mask; /* Saved signal mask. */ -- }; -- -+#include - - typedef struct __jmp_buf_tag jmp_buf[1]; - -diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h -index 8a403cbf..d4194da7 100644 ---- a/sysdeps/nptl/pthread.h -+++ b/sysdeps/nptl/pthread.h -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - - /* Detach state. */ -@@ -730,8 +731,8 @@ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf) - #endif - - /* Function used in the macros. */ --struct __jmp_buf_tag; --extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROWNL; -+extern int __sigsetjmp (struct __jmp_buf_tag __env[1], -+ int __savemask) __THROWNL; - - - /* Mutex handling. */ --- -2.31.1 - diff --git a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch b/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch deleted file mode 100644 index 83f3f15eb6..0000000000 --- a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0004-Avoid-Wstringop-overflow-warning-in-pthread_cleanup_.patch +++ /dev/null @@ -1,125 +0,0 @@ -From ea50889c35fb73ed9e140d800303aae9148c2888 Mon Sep 17 00:00:00 2001 -From: Joseph Myers -Date: Fri, 30 Oct 2020 22:25:42 +0000 -Subject: [PATCH 4/4] Avoid -Wstringop-overflow warning in pthread_cleanup_push - macros - -GCC 11 introduces a -Wstringop-overflow warning for calls to functions -with an array argument passed as a pointer to memory not large enough -for that array. This includes the __sigsetjmp calls from -pthread_cleanup_push macros, because those use a structure in -__pthread_unwind_buf_t, which has a common initial subsequence with -jmp_buf but does not include the saved signal mask; this is OK in this -case because the second argument to __sigsetjmp is 0 so the signal -mask is not accessed. - -To avoid this warning, use a function alias __sigsetjmp_cancel with -first argument an array of exactly the type used in the calls to the -function, if using GCC 11 or later. With older compilers, continue to -use __sigsetjmp with a cast, to avoid any issues with compilers -predating the returns_twice attribute not applying the same special -handling to __sigsetjmp_cancel as to __sigsetjmp. - -Tested with build-many-glibcs.py for arm-linux-gnueabi that this fixes -the testsuite build failures. - -[Upstream: https://github.com/bminor/glibc/commit/548f467fa14ffe7d955beeb31b30e2aeae4467e0.patch] -Signed-off-by: Peter Seiderer ---- - misc/sys/cdefs.h | 8 ++++++++ - sysdeps/nptl/pthread.h | 37 +++++++++++++++++++++++++++---------- - 2 files changed, 35 insertions(+), 10 deletions(-) - -diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h -index 38221d0b..ce877487 100644 ---- a/misc/sys/cdefs.h -+++ b/misc/sys/cdefs.h -@@ -556,4 +556,12 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf - # define __attr_access(x) - #endif - -+/* Specify that a function such as setjmp or vfork may return -+ twice. */ -+#if __GNUC_PREREQ (4, 1) -+# define __attribute_returns_twice__ __attribute__ ((__returns_twice__)) -+#else -+# define __attribute_returns_twice__ /* Ignore. */ -+#endif -+ - #endif /* sys/cdefs.h */ -diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h -index d4194da7..3a34d823 100644 ---- a/sysdeps/nptl/pthread.h -+++ b/sysdeps/nptl/pthread.h -@@ -512,13 +512,15 @@ extern void pthread_testcancel (void); - - /* Cancellation handling with integration into exception handling. */ - -+struct __cancel_jmp_buf_tag -+{ -+ __jmp_buf __cancel_jmp_buf; -+ int __mask_was_saved; -+}; -+ - typedef struct - { -- struct -- { -- __jmp_buf __cancel_jmp_buf; -- int __mask_was_saved; -- } __cancel_jmp_buf[1]; -+ struct __cancel_jmp_buf_tag __cancel_jmp_buf[1]; - void *__pad[4]; - } __pthread_unwind_buf_t __attribute__ ((__aligned__)); - -@@ -658,8 +660,8 @@ __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame) - __pthread_unwind_buf_t __cancel_buf; \ - void (*__cancel_routine) (void *) = (routine); \ - void *__cancel_arg = (arg); \ -- int __not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *) \ -- __cancel_buf.__cancel_jmp_buf, 0); \ -+ int __not_first_call = __sigsetjmp_cancel (__cancel_buf.__cancel_jmp_buf, \ -+ 0); \ - if (__glibc_unlikely (__not_first_call)) \ - { \ - __cancel_routine (__cancel_arg); \ -@@ -693,8 +695,8 @@ extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf) - __pthread_unwind_buf_t __cancel_buf; \ - void (*__cancel_routine) (void *) = (routine); \ - void *__cancel_arg = (arg); \ -- int __not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *) \ -- __cancel_buf.__cancel_jmp_buf, 0); \ -+ int __not_first_call = __sigsetjmp_cancel (__cancel_buf.__cancel_jmp_buf, \ -+ 0); \ - if (__glibc_unlikely (__not_first_call)) \ - { \ - __cancel_routine (__cancel_arg); \ -@@ -730,9 +732,24 @@ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf) - ; - #endif - --/* Function used in the macros. */ -+/* Function used in the macros. Calling __sigsetjmp, with its first -+ argument declared as an array, results in a -Wstringop-overflow -+ warning from GCC 11 because struct pthread_unwind_buf is smaller -+ than jmp_buf. The calls from the macros have __SAVEMASK set to 0, -+ so nothing beyond the common prefix is used and this warning is a -+ false positive. Use an alias with its first argument declared to -+ use the type in the macros if possible to avoid this warning. */ -+#if __GNUC_PREREQ (11, 0) -+extern int __REDIRECT_NTHNL (__sigsetjmp_cancel, -+ (struct __cancel_jmp_buf_tag __env[1], -+ int __savemask), -+ __sigsetjmp) __attribute_returns_twice__; -+#else -+# define __sigsetjmp_cancel(env, savemask) \ -+ __sigsetjmp ((struct __jmp_buf_tag *) (void *) (env), (savemask)) - extern int __sigsetjmp (struct __jmp_buf_tag __env[1], - int __savemask) __THROWNL; -+#endif - - - /* Mutex handling. */ --- -2.31.1 - diff --git a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch similarity index 88% rename from package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch index d327008c1d..0dcecc1a70 100644 --- a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0001-HACK-only-build-and-install-localedef.patch +++ b/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 942f45364e7db805f0390c808ef656faa577a419 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 21 May 2018 16:45:02 +0200 Subject: [PATCH] HACK: only build and install localedef @@ -13,10 +13,10 @@ Signed-off-by: Peter Seiderer 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Rules b/Rules -index 16afa6acaa..6c208db788 100644 +index 082625bb71..2603c96734 100644 --- a/Rules +++ b/Rules -@@ -190,10 +190,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ +@@ -212,10 +212,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ $(binaries-all-notests)) ifneq "$(strip $(binaries-shared-notests))" "" @@ -38,10 +38,10 @@ index 16afa6acaa..6c208db788 100644 ifneq "$(strip $(binaries-shared-tests))" "" diff --git a/locale/Makefile b/locale/Makefile -index 764e751c36..c28322d71f 100644 +index b7c60681fa..de4cf4003f 100644 --- a/locale/Makefile +++ b/locale/Makefile -@@ -32,15 +32,15 @@ categories = ctype messages monetary numeric time paper name \ +@@ -33,15 +33,15 @@ categories = ctype messages monetary numeric time paper name \ address telephone measurement identification collate aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ xlocale localename global-locale coll-lookup @@ -61,5 +61,5 @@ index 764e751c36..c28322d71f 100644 libBrokenLocale-routines = broken_cur_max -- -2.21.0 +2.31.1 diff --git a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 90% rename from package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch index a6e87cc317..54c45650d5 100644 --- a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +++ b/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -1,4 +1,4 @@ -From 313e04bfbd281f9b46fdde097aacb59d501820a3 Mon Sep 17 00:00:00 2001 +From ec4ebe89a7636da63ccff349d0f0c9f38ac3e3e1 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 6 Feb 2020 14:36:21 -0600 Subject: [PATCH] relax dependency on GCC to 4.8 and binutils to 2.24 @@ -29,10 +29,10 @@ Signed-off-by: Matthew Weber 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 6d26b824..9ac2e5e9 100755 +index 1dc3af60b4..e3ee4e9fd7 100755 --- a/configure +++ b/configure -@@ -4601,7 +4601,7 @@ $as_echo_n "checking version of $AS... " >&6; } +@@ -4587,7 +4587,7 @@ $as_echo_n "checking version of $AS... " >&6; } ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -41,7 +41,7 @@ index 6d26b824..9ac2e5e9 100755 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -@@ -4731,7 +4731,7 @@ $as_echo_n "checking version of $LD... " >&6; } +@@ -4717,7 +4717,7 @@ $as_echo_n "checking version of $LD... " >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -50,7 +50,7 @@ index 6d26b824..9ac2e5e9 100755 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; -@@ -5140,7 +5140,7 @@ int +@@ -5126,7 +5126,7 @@ int main () { @@ -60,5 +60,5 @@ index 6d26b824..9ac2e5e9 100755 #endif ; -- -2.18.0 +2.31.1 diff --git a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/localedef.hash b/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash similarity index 70% rename from package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/localedef.hash rename to package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash index b1d5243fcc..4b8d8297ec 100644 --- a/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/localedef.hash +++ b/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 f4710e9a435a7b83e1d23dd75434f0d36b898eba9b4249c946c32b467d852fd4 glibc-2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2.tar.gz +sha256 3e2004b16ec6b79a19a88ed4736719ef9e419f9d8e7013faced654c0339e23dc glibc-2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 57ab5a3458..d8dfdffaa2 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -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.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch similarity index 100% rename from package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch rename to package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch diff --git a/package/lua-lunix/0003-fix-sysctl-detection.patch b/package/lua-lunix/0003-fix-sysctl-detection.patch new file mode 100644 index 0000000000..18656b1921 --- /dev/null +++ b/package/lua-lunix/0003-fix-sysctl-detection.patch @@ -0,0 +1,24 @@ +sys/sysctl.h was removed with glibc 2.32 + +Fetched from: https://github.com/wahern/lunix/pull/20/files +Signed-off-by: Francois Perrad +--- + lunix-rel-20170920/src/unix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c +index 272820a..fa00876 100644 +--- a/lunix-rel-20170920/src/unix.c ++++ b/lunix-rel-20170920/src/unix.c +@@ -165,7 +165,7 @@ + #endif + + #ifndef HAVE_SYS_SYSCTL_H /* missing on musl libc */ +-#define HAVE_SYS_SYSCTL_H (defined BSD || GLIBC_PREREQ(0,0) || UCLIBC_PREREQ(0,0,0)) ++#define HAVE_SYS_SYSCTL_H (defined BSD || (__GLIBC__ && !GLIBC_PREREQ(2,32)) || UCLIBC_PREREQ(0,0,0)) + #endif + + #ifndef HAVE_STRUCT_IN_PKTINFO +-- +2.30.2 + diff --git a/package/mcrypt/0001-CVE-2012-4409.patch b/package/mcrypt/0001-CVE-2012-4409.patch deleted file mode 100644 index 97c658bb2d..0000000000 --- a/package/mcrypt/0001-CVE-2012-4409.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sat, 22 Dec 2012 22:37:06 +0200 -Subject: [PATCH] cleanup: buffer overflow - ---- - src/extra.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/extra.c b/src/extra.c -index 3082f82..c7a1ac0 100644 ---- a/src/extra.c -+++ b/src/extra.c -@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode, - if (m_getbit(6, flags) == 1) { /* if the salt bit is set */ - if (m_getbit(0, sflag) != 0) { /* if the first bit is set */ - *salt_size = m_setbit(0, sflag, 0); -+ if (*salt_size > sizeof(tmp_buf)) -+ err_quit(_("Salt is too long\n")); - if (*salt_size > 0) { - fread(tmp_buf, 1, *salt_size, - fstream); --- -1.7.8.6 - diff --git a/package/mcrypt/0002-CVE-2012-4426.patch b/package/mcrypt/0002-CVE-2012-4426.patch deleted file mode 100644 index 708d4a579e..0000000000 --- a/package/mcrypt/0002-CVE-2012-4426.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch taken from gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/src/errors.c -+++ b/src/errors.c -@@ -25,24 +25,24 @@ - - void err_quit(char *errmsg) - { -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - exit(-1); - } - - void err_warn(char *errmsg) - { - if (quiet <= 1) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_info(char *errmsg) - { - if (quiet == 0) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_crit(char *errmsg) - { - if (quiet <= 2) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } diff --git a/package/mcrypt/0003-CVE-2012-4527.patch b/package/mcrypt/0003-CVE-2012-4527.patch deleted file mode 100644 index a8cf6f449a..0000000000 --- a/package/mcrypt/0003-CVE-2012-4527.patch +++ /dev/null @@ -1,99 +0,0 @@ -Fix for CVE-2012-4527. -Authored by Attila Bogar and Jean-Michel Vourgère - -Signed-off-by: Gustavo Zacarias - -diff -Nura mcrypt-2.6.8.orig/src/mcrypt.c mcrypt-2.6.8/src/mcrypt.c ---- mcrypt-2.6.8.orig/src/mcrypt.c 2013-01-14 19:15:49.465925072 -0300 -+++ mcrypt-2.6.8/src/mcrypt.c 2013-01-14 19:28:13.711478000 -0300 -@@ -44,7 +44,9 @@ - static char rcsid[] = - "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $"; - --char tmperr[128]; -+/* Temporary error message can contain one file name and 1k of text */ -+#define ERRWIDTH ((PATH_MAX)+1024) -+char tmperr[ERRWIDTH]; - unsigned int stream_flag = FALSE; - char *keymode = NULL; - char *mode = NULL; -@@ -482,7 +484,7 @@ - #ifdef HAVE_STAT - if (stream_flag == FALSE) { - if (is_normal_file(file[i]) == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: %s is not a regular file. Skipping...\n"), - program_name, file[i]); -@@ -501,7 +503,7 @@ - dinfile = file[i]; - if ((isatty(fileno((FILE *) (stdin))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be read from a terminal.\n"), - program_name); -@@ -520,7 +522,7 @@ - einfile = file[i]; - if ((isatty(fileno((FILE *) (stdout))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be written to a terminal.\n"), - program_name); -@@ -544,7 +546,7 @@ - strcpy(outfile, einfile); - /* if file has already the .nc ignore it */ - if (strstr(outfile, ".nc") != NULL) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: file %s has the .nc suffix... skipping...\n"), - program_name, outfile); -@@ -590,10 +592,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was decrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -610,7 +612,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT decrypted successfully.\n"), - dinfile); -@@ -636,10 +638,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was encrypted.\n"), einfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was encrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -655,7 +657,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT encrypted successfully.\n"), - einfile); diff --git a/package/mcrypt/0004-no-rpath.patch b/package/mcrypt/0004-no-rpath.patch deleted file mode 100644 index a0813bcf00..0000000000 --- a/package/mcrypt/0004-no-rpath.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch out rpath hardcoding since it completely ignores --disable-rpath -and other configure ways. - -Signed-off-by: Gustavo Zacarias - -diff -Nura mcrypt-2.6.8.orig/config.rpath mcrypt-2.6.8/config.rpath ---- mcrypt-2.6.8.orig/config.rpath 2013-01-07 13:05:22.626883480 -0300 -+++ mcrypt-2.6.8/config.rpath 2013-01-07 13:12:47.196090608 -0300 -@@ -153,7 +153,7 @@ - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec= - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken diff --git a/package/mcrypt/Config.in b/package/mcrypt/Config.in deleted file mode 100644 index e3b9541f04..0000000000 --- a/package/mcrypt/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_MCRYPT - bool "mcrypt" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBMCRYPT - select BR2_PACKAGE_LIBMHASH - help - MCrypt is a replacement for the old crypt() package and - crypt(1) command, with extensions. - It allows developers to use a wide range of encryption - functions, without making drastic changes to their code. - - http://mcrypt.sourceforge.net/ diff --git a/package/mcrypt/mcrypt.hash b/package/mcrypt/mcrypt.hash deleted file mode 100644 index c6c8871f4f..0000000000 --- a/package/mcrypt/mcrypt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 mcrypt-2.6.8.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mcrypt/mcrypt.mk b/package/mcrypt/mcrypt.mk deleted file mode 100644 index a04b973750..0000000000 --- a/package/mcrypt/mcrypt.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# mcrypt -# -################################################################################ - -MCRYPT_VERSION = 2.6.8 -MCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/MCrypt/$(MCRYPT_VERSION) -MCRYPT_DEPENDENCIES = libmcrypt libmhash \ - $(if $(BR2_PACKAGE_ZLIB),zlib) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - $(TARGET_NLS_DEPENDENCIES) -MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr -MCRYPT_LICENSE = GPL-3.0 -MCRYPT_LICENSE_FILES = COPYING - -# 0001-CVE-2012-4409.patch -MCRYPT_IGNORE_CVES += CVE-2012-4409 -# 0002-CVE-2012-4426.patch -MCRYPT_IGNORE_CVES += CVE-2012-4426 -# 0003-CVE-2012-4527.patch -MCRYPT_IGNORE_CVES += CVE-2012-4527 - -$(eval $(autotools-package)) diff --git a/package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch b/package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch new file mode 100644 index 0000000000..b01db8a4b4 --- /dev/null +++ b/package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch @@ -0,0 +1,43 @@ +From e501b7c17ada9c694d3f8302622b78d733485b38 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +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 +[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 + #include + ++#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 + diff --git a/package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch b/package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch new file mode 100644 index 0000000000..e96a65252c --- /dev/null +++ b/package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch @@ -0,0 +1,44 @@ +From 0941e560850d54160c24778fa66b605714fd5012 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 9 Aug 2021 21:18:50 +0200 +Subject: [PATCH] src/mongo/db/exec/plan_stats.h: fix build with gcc + 11 + +Fix the following build failure with gcc 11: + +In file included from src/mongo/db/query/plan_cache.h:36, + from src/mongo/db/catalog/collection_info_cache.h:33, + from src/mongo/db/catalog/collection.h:42, + from src/mongo/db/exec/requires_collection_stage.h:32, + from src/mongo/db/exec/delete.h:32, + from src/mongo/db/query/internal_plans.h:33, + from src/mongo/db/query/internal_plans.cpp:32: +src/mongo/db/exec/plan_stats.h:214:10: error: 'optional' in namespace 'std' does not name a template type + 214 | std::optional replanReason; + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8c0875fa413923504515a83d8b679366418c2444 + +Signed-off-by: Fabrice Fontaine +[Upstream status: already fixed by +https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0] +--- + src/mongo/db/exec/plan_stats.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h +index 43053e27be..813e4edc9e 100644 +--- a/src/mongo/db/exec/plan_stats.h ++++ b/src/mongo/db/exec/plan_stats.h +@@ -31,6 +31,7 @@ + + #include + #include ++#include + #include + #include + +-- +2.30.2 + diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 9748c7d0a5..7a2597558b 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 - depends on BR2_HOST_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -403,5 +403,5 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - !BR2_HOST_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 98a7328c83..acda93f381 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -149,6 +149,9 @@ MPV_DEPENDENCIES += libgl else ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MPV_CONF_OPTS += --enable-gl MPV_DEPENDENCIES += libgles +else ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +MPV_CONF_OPTS += --enable-gl +MPV_DEPENDENCIES += libegl else MPV_CONF_OPTS += --disable-gl endif @@ -182,7 +185,7 @@ endif ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MPV_SUPPORTS_VAAPI),yy) MPV_CONF_OPTS += --enable-vaapi MPV_DEPENDENCIES += libva -ifeq ($(BR2_PACKAGE_LIBDRM),y) +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) MPV_CONF_OPTS += --enable-vaapi-drm else MPV_CONF_OPTS += --disable-vaapi-drm diff --git a/package/mtd/Config.in b/package/mtd/Config.in index abfe806661..57ad01971d 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -147,6 +147,7 @@ config BR2_PACKAGE_MTD_UBIHEALTHD bool "ubihealthd" default y depends on BR2_PACKAGE_MTD_UBIFS_UTILS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # getrandom() config BR2_PACKAGE_MTD_UBIMKVOL bool "ubimkvol" diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index a8734855f8..66616f032c 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -12,6 +12,10 @@ MUTT_CPE_ID_VENDOR = mutt MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +MUTT_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv MUTT_CONF_OPTS += --enable-iconv diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 38ab43740f..43987451b6 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # Tested with 3.2, but may even work with earlier versions - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 @@ -62,10 +62,10 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS endif -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads, gcc >= 4.9" +comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 || \ !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/nginx-naxsi/0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch b/package/nginx-naxsi/0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch new file mode 100644 index 0000000000..238a01923d --- /dev/null +++ b/package/nginx-naxsi/0001-naxsi_src-naxsi_runtime.c-fix-build-without-x_forwar.patch @@ -0,0 +1,63 @@ +From 8ea5218b07f715e9616a846bf305633ef1b3aa2a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 14 Aug 2021 11:46:08 +0200 +Subject: [PATCH] naxsi_src/naxsi_runtime.c: fix build without x_forwarded_for + +x_forwarded_for is not available if realip, geo, geoip or proxy modules +aren't enabled resulting in the following build failure since version +1.1a and +https://github.com/nbs-system/naxsi/commit/07a056ccd36bc3c5c40dc17991db226cb8cf6241: + +/home/buildroot/autobuild/instance-3/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_naxsi_data_parse': +/home/buildroot/autobuild/instance-3/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:2846:20: error: 'ngx_http_headers_in_t' has no member named 'x_forwarded_for' + if (r->headers_in.x_forwarded_for.nelts >= 1) { + ^ + +Fixes: + - http://autobuild.buildroot.org/results/cdbc1536f6b5de3d4c836efa2f0dcaf0cdbb1462 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/nbs-system/naxsi/pull/568] +--- + naxsi_src/naxsi_runtime.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c +index 28e0b29..6a723d2 100644 +--- a/naxsi_src/naxsi_runtime.c ++++ b/naxsi_src/naxsi_runtime.c +@@ -2842,10 +2842,12 @@ ngx_http_naxsi_data_parse(ngx_http_request_ctx_t* ctx, ngx_http_request_t* r) + unsigned int n = 0; + ngx_table_elt_t** h = NULL; + ngx_array_t a; ++#if (NGX_HTTP_X_FORWARDED_FOR) + if (r->headers_in.x_forwarded_for.nelts >= 1) { + a = r->headers_in.x_forwarded_for; + n = a.nelts; + } ++#endif + if (n >= 1) + h = a.elts; + if (n >= 1) { +@@ -2879,6 +2881,7 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t* ctx, + + /*cr, sc, cf, ctx*/ + if (cf->check_rules && ctx->special_scores) { ++#if (NGX_HTTP_X_FORWARDED_FOR) + if (r->headers_in.x_forwarded_for.nelts >= 1) { + a = r->headers_in.x_forwarded_for; + n = a.nelts; +@@ -2896,7 +2899,9 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t* ctx, + memcpy(ip.data, h[0]->value.data, ip.len); + ignore = nx_can_ignore_ip(&ip, cf) || nx_can_ignore_cidr(&ip, cf); + } +- } else { ++ } else ++#endif ++ { + ngx_str_t* ip = &r->connection->addr_text; + NX_DEBUG(_debug_whitelist_ignore, + NGX_LOG_DEBUG_HTTP, +-- +2.30.2 + diff --git a/package/nodejs/0002-Fix-build-with-ICU-68.patch b/package/nodejs/0002-Fix-build-with-ICU-68.patch deleted file mode 100644 index 2d6ac010d2..0000000000 --- a/package/nodejs/0002-Fix-build-with-ICU-68.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 1504de672ec44080d08a97c479a23727a9c31d8b Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Mon, 19 Jul 2021 03:35:30 -0600 -Subject: [PATCH] Fix build with ICU >= 68. - -Adapted from: -https://chromium-review.googlesource.com/c/v8/v8/+/2477751 - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/nodejs/node/pull/39440] ---- - deps/v8/src/objects/js-list-format.cc | 32 +++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/deps/v8/src/objects/js-list-format.cc b/deps/v8/src/objects/js-list-format.cc -index 4f303b1874..2101f8e507 100644 ---- a/deps/v8/src/objects/js-list-format.cc -+++ b/deps/v8/src/objects/js-list-format.cc -@@ -29,6 +29,7 @@ namespace v8 { - namespace internal { - - namespace { -+#if U_ICU_VERSION_MAJOR_NUM < 68 - const char* kStandard = "standard"; - const char* kOr = "or"; - const char* kUnit = "unit"; -@@ -41,8 +42,24 @@ const char* kUnitNarrow = "unit-narrow"; - - const char* GetIcuStyleString(JSListFormat::Style style, - JSListFormat::Type type) { -+#else -+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { -+ switch (style) { -+ case JSListFormat::Style::LONG: -+ return ULISTFMT_WIDTH_WIDE; -+ case JSListFormat::Style::SHORT: -+ return ULISTFMT_WIDTH_SHORT; -+ case JSListFormat::Style::NARROW: -+ return ULISTFMT_WIDTH_NARROW; -+ } -+ UNREACHABLE(); -+} -+ -+UListFormatterType GetIcuType(JSListFormat::Type type) { -+#endif - switch (type) { - case JSListFormat::Type::CONJUNCTION: -+#if U_ICU_VERSION_MAJOR_NUM < 68 - switch (style) { - case JSListFormat::Style::LONG: - return kStandard; -@@ -51,7 +68,11 @@ const char* GetIcuStyleString(JSListFormat::Style style, - case JSListFormat::Style::NARROW: - return kStandardNarrow; - } -+#else -+ return ULISTFMT_TYPE_AND; -+#endif - case JSListFormat::Type::DISJUNCTION: -+#if U_ICU_VERSION_MAJOR_NUM < 68 - switch (style) { - case JSListFormat::Style::LONG: - return kOr; -@@ -60,7 +81,11 @@ const char* GetIcuStyleString(JSListFormat::Style style, - case JSListFormat::Style::NARROW: - return kOrNarrow; - } -+#else -+ return ULISTFMT_TYPE_OR; -+#endif - case JSListFormat::Type::UNIT: -+#if U_ICU_VERSION_MAJOR_NUM < 68 - switch (style) { - case JSListFormat::Style::LONG: - return kUnit; -@@ -69,6 +94,9 @@ const char* GetIcuStyleString(JSListFormat::Style style, - case JSListFormat::Style::NARROW: - return kUnitNarrow; - } -+#else -+ return ULISTFMT_TYPE_UNITS; -+#endif - } - UNREACHABLE(); - } -@@ -170,7 +198,11 @@ MaybeHandle JSListFormat::New(Isolate* isolate, Handle map, - icu::Locale icu_locale = r.icu_locale; - UErrorCode status = U_ZERO_ERROR; - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( -+#if U_ICU_VERSION_MAJOR_NUM < 68 - icu_locale, GetIcuStyleString(style_enum, type_enum), status); -+#else -+ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); -+#endif - if (U_FAILURE(status)) { - delete formatter; - FATAL("Failed to create ICU list formatter, are ICU data files missing?"); --- -2.25.1 - diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index d94942e7c0..7d11a8d104 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.22.3/SHASUMS256.txt -sha256 350211fae3a688f41889680c8efcf689353a2e36b62b9dc2b408340986857190 node-v12.22.3.tar.xz +# From https://nodejs.org/dist/v12.22.4/SHASUMS256.txt +sha256 44cd4eab131e5282fc923e9e720d983a0b44c12e4aa4f6c3598dc97ae1e4cd4c node-v12.22.4.tar.xz # Hash for license file sha256 221417a7ca275112a5ac54639b36ee3c5184e74631ea1e1b01b701293b655190 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 2731a7c667..08d2f6d7c1 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 12.22.3 +NODEJS_VERSION = 12.22.4 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 7e89c1ab01..54c2aa46d8 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -96,6 +96,12 @@ NVIDIA_DRIVER_LIBS += \ nvidia_drv.so:xorg/modules/drivers/ \ libglx.so.$(NVIDIA_DRIVER_VERSION):xorg/modules/extensions/ +# libglx needs a symlink according to the driver README. It has no SONAME +define NVIDIA_DRIVER_SYMLINK_LIBGLX + ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \ + $(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so +endef + endif # X drivers ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y) @@ -187,12 +193,6 @@ define NVIDIA_DRIVER_INSTALL_STAGING_CMDS $(NVIDIA_DRIVER_INSTALL_GL_DEV) endef -# libglx needs a symlink according to the driver README. It has no SONAME -define NVIDIA_DRIVER_SYMLINK_LIBGLX - ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \ - $(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so -endef - # For target, install libraries and X.org modules define NVIDIA_DRIVER_INSTALL_TARGET_CMDS $(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR)) diff --git a/package/ogre/0002-Checks-for-strtol_l-function.patch b/package/ogre/0002-Checks-for-strtol_l-function.patch new file mode 100644 index 0000000000..540530ee9e --- /dev/null +++ b/package/ogre/0002-Checks-for-strtol_l-function.patch @@ -0,0 +1,71 @@ +From 3f182b7e743662ec3fa63e1c7f213171d99485ba Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +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 +[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) diff --git a/package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch b/package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch new file mode 100644 index 0000000000..dbe2c29a2b --- /dev/null +++ b/package/openvmtools/0012-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch @@ -0,0 +1,80 @@ +From 3f0580f2546de8be7acf1bc78a55a257bc638ebe Mon Sep 17 00:00:00 2001 +From: Bartosz Brachaczek +Date: Tue, 12 Nov 2019 14:31:08 +0100 +Subject: [PATCH] Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386 + +I verified that this function behaves as expected on x86_64, i386 with +32-bit time_t, and i386 with 64-bit time_t for the following values of +ntTtime: + +UNIX_EPOCH-1, UNIX_EPOCH, UNIX_EPOCH+1, UNIX_S32_MAX-1, UNIX_S32_MAX, +UNIX_S32_MAX+1, UNIX_S32_MAX*2+1 + +I did not verify whether the use of Div643264 is optimal, performance +wise. + +Signed-off-by: Giulio Benetti +--- + lib/hgfs/hgfsUtil.c | 34 +++++++++++++++++++--------------- + 1 file changed, 19 insertions(+), 15 deletions(-) + +diff --git a/lib/hgfs/hgfsUtil.c b/lib/hgfs/hgfsUtil.c +index cc580ab8..49b10040 100644 +--- a/lib/hgfs/hgfsUtil.c ++++ b/lib/hgfs/hgfsUtil.c +@@ -110,23 +110,21 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format + uint64 ntTime) // IN: Time in Windows NT format + { + #ifdef __i386__ +- uint32 sec; +- uint32 nsec; ++ uint64 sec64; ++ uint32 sec32, nsec; ++#endif + + ASSERT(unixTime); +- /* We assume that time_t is 32bit */ +- ASSERT_ON_COMPILE(sizeof (unixTime->tv_sec) == 4); + +- /* Cap NT time values that are outside of Unix time's range */ ++ if (sizeof (unixTime->tv_sec) == 4) { ++ /* Cap NT time values that are outside of Unix time's range */ + +- if (ntTime >= UNIX_S32_MAX) { +- unixTime->tv_sec = 0x7FFFFFFF; +- unixTime->tv_nsec = 0; +- return 1; ++ if (ntTime >= UNIX_S32_MAX) { ++ unixTime->tv_sec = 0x7FFFFFFF; ++ unixTime->tv_nsec = 0; ++ return 1; ++ } + } +-#else +- ASSERT(unixTime); +-#endif + + if (ntTime < UNIX_EPOCH) { + unixTime->tv_sec = 0; +@@ -135,9 +133,15 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format + } + + #ifdef __i386__ +- Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec); +- unixTime->tv_sec = sec; +- unixTime->tv_nsec = nsec * 100; ++ if (sizeof (unixTime->tv_sec) == 4) { ++ Div643232(ntTime - UNIX_EPOCH, 10000000, &sec32, &nsec); ++ unixTime->tv_sec = sec32; ++ unixTime->tv_nsec = nsec * 100; ++ } else { ++ Div643264(ntTime - UNIX_EPOCH, 10000000, &sec64, &nsec); ++ unixTime->tv_sec = sec64; ++ unixTime->tv_nsec = nsec * 100; ++ } + #else + unixTime->tv_sec = (ntTime - UNIX_EPOCH) / 10000000; + unixTime->tv_nsec = ((ntTime - UNIX_EPOCH) % 10000000) * 100; +-- +2.25.1 + diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 70d59e6c6f..d31191b3a7 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_OSM2PGSQL depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_WCHAR # boost, fmt, libosmium + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM @@ -26,3 +27,6 @@ comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS + +comment "osm2pgsql needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/perl-net-ssh2/perl-net-ssh2.mk b/package/perl-net-ssh2/perl-net-ssh2.mk index 5572e23257..20e45b6287 100644 --- a/package/perl-net-ssh2/perl-net-ssh2.mk +++ b/package/perl-net-ssh2/perl-net-ssh2.mk @@ -18,7 +18,7 @@ PERL_NET_SSH2_CONF_OPTS += \ inc="$(STAGING_DIR)/usr/include" ifeq ($(BR2_PACKAGE_LIBSSH2_LIBGCRYPT),y) -PERL_NET_SSH2_CONF_OPTS += gcrypt +PERL_NET_SSH2_CONF_OPTS += crypto_backend=gcrypt endif $(eval $(perl-package)) diff --git a/package/poke/0004-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0004-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch new file mode 100644 index 0000000000..757dc3f760 --- /dev/null +++ b/package/poke/0004-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -0,0 +1,72 @@ +From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 1 Apr 2021 07:49:46 +0200 +Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 + +Fix the following build failure with uclibc < 1.0.35 which is raised +since the addition of getrandom module in +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=682cc4e678aceff32dea2a84b6e5147bdf5a20a7: + +In file included from ./sys/random.h:40, + from getrandom.c:22: +/tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name 'size_t' + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~ +/tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? + 7 | #include + +++ |+#include + 8 | + +This patch is not upstreamable as it is only a workaround for +uclibc < 1.0.35, upstream uclibc has been patched with +https://github.com/wbx-github/uclibc-ng/commit/00972c02c2b6e0a95d5def4a71bdfb188e091782 + +Fixes: + - http://autobuild.buildroot.org/results/30105094e39374ec6d4e47e2fb5e99696f7f7981 + +Signed-off-by: Fabrice Fontaine +--- + jitter/gnulib-local/getrandom.c | 1 + + gl/getrandom.c | 1 + + gl-libpoke/getrandom.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c +index 41212fb32..0ad3f9648 100644 +--- a/jitter/gnulib-local/getrandom.c ++++ b/jitter/gnulib-local/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +diff --git a/gl/getrandom.c b/gl/getrandom.c +index 41212fb32..0ad3f9648 100644 +--- a/gl/getrandom.c ++++ b/gl/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c +index 41212fb32..0ad3f9648 100644 +--- a/gl-libpoke/getrandom.c ++++ b/gl-libpoke/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +-- +2.30.2 + diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index d5b3955ddb..3a8c442dbb 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -41,6 +41,16 @@ else POLKIT_CONF_OPTS += --with-authfw=shadow endif +# polkit.{its,loc} are needed for gvfs and must be installed in $(HOST_DIR) +# and not $(STAGING_DIR) +define POLKIT_INSTALL_ITS + $(INSTALL) -D -m 644 $(@D)/data/polkit.its \ + $(HOST_DIR)/share/gettext/its/polkit.its + $(INSTALL) -D -m 644 $(@D)/data/polkit.loc \ + $(HOST_DIR)/share/gettext/its/polkit.loc +endef +POLKIT_POST_INSTALL_TARGET_HOOKS += POLKIT_INSTALL_ITS + define POLKIT_USERS polkitd -1 polkitd -1 * - - - Polkit Daemon endef diff --git a/package/poppler/0001-glib-poppler-private.h-fix-build-with-gcc-11.patch b/package/poppler/0001-glib-poppler-private.h-fix-build-with-gcc-11.patch new file mode 100644 index 0000000000..afa887ff8c --- /dev/null +++ b/package/poppler/0001-glib-poppler-private.h-fix-build-with-gcc-11.patch @@ -0,0 +1,48 @@ +From 1ae5ff981ae0484383c4733c56b72e56a3a37584 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 14 Aug 2021 10:43:13 +0200 +Subject: [PATCH] glib/poppler-private.h: fix build with gcc 11 + +Fix the following build failure with gcc 11: + +In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib/gthread.h:32, + from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib/gasyncqueue.h:32, + from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib.h:32, + from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/gobject/gbinding.h:28, + from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib-object.h:22, + from /tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler.h:22, + from /tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc:19: +/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc: In function 'GType poppler_dest_get_type()': +/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-private.h:155:13: error: argument 2 of '__atomic_load' must not be a pointer to a 'volatile' type + 155 | if (g_once_init_enter (&g_define_type_id__volatile)) { \ + | ^~~~~~~~~~~~~~~~~ +/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc:28:1: note: in expansion of macro 'POPPLER_DEFINE_BOXED_TYPE' + 28 | POPPLER_DEFINE_BOXED_TYPE (PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free) + | ^~~~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/dfcaac6487aaeb10412c3fe72a23135f8a70fefe + +Signed-off-by: Fabrice Fontaine +[Upstream status: not needed because of +https://gitlab.freedesktop.org/poppler/poppler/-/commit/47de887d7658cfd68df44b3acf710971054f957b] +--- + glib/poppler-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/poppler-private.h b/glib/poppler-private.h +index 86b587fd..ff15eab0 100644 +--- a/glib/poppler-private.h ++++ b/glib/poppler-private.h +@@ -152,7 +152,7 @@ gboolean _poppler_convert_pdf_date_to_gtime (const GooString *date, + GType \ + type_name##_get_type (void) \ + { \ +- static volatile gsize g_define_type_id__volatile = 0; \ ++ static gsize g_define_type_id__volatile = 0; \ + if (g_once_init_enter (&g_define_type_id__volatile)) { \ + GType g_define_type_id = \ + g_boxed_type_register_static (g_intern_static_string (#TypeName), \ +-- +2.30.2 + diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 8a8e47ffcc..15983565b4 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732 postgis-3.1.2.tar.gz +sha256 71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb postgis-3.1.3.tar.gz sha256 55b69f22e1752830dd565852dc7ff242daf289dbd3a6bfede5db43f90d2e28c9 LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index a0acf62e05..b3d97b2774 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.1.2 +POSTGIS_VERSION = 3.1.3 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index caa8a1f5e7..2dcc1823d6 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v13.3/postgresql-13.3.tar.bz2.sha256 -sha256 3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 postgresql-13.3.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v13.4/postgresql-13.4.tar.bz2.sha256 +sha256 ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd postgresql-13.4.tar.bz2 # License file, Locally calculated sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 143bcd895a..3b6c6e21e7 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 13.3 +POSTGRESQL_VERSION = 13.4 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL diff --git a/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch b/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch new file mode 100644 index 0000000000..cea1357d1d --- /dev/null +++ b/package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch @@ -0,0 +1,43 @@ +From 4064f77d2f550762cbf220fec7c26a8ce4219ea4 Mon Sep 17 00:00:00 2001 +From: Alexander Egorenkov +Date: Sun, 8 Aug 2021 11:19:52 +0200 +Subject: [PATCH] src/rtld/dl-tls.c: Fix TLS offsets computation for s390 arch + +rtld_determine_tlsoffsets() didn't handle s390 arch properly by falling +back to the default case. If TLS_TCB_AT_TP is 1, then set offset to -1. + +From glibc's sysdeps/s390/nptl/tls.h: +------------------------------------- +/* The TCB can have any size and the memory following the address the + thread pointer points to is unspecified. Allocate the TCB there. */ +define TLS_TCB_AT_TP 1 +define TLS_DTV_AT_TP 0 + +This lead to the following error: +--------------------------------- +prelink-rtld: error while loading shared libraries: /lib64/libc.so.6: cannot handle TLS data + +Signed-off-by: Alexander Egorenkov +--- + src/rtld/dl-tls.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/rtld/dl-tls.c b/src/rtld/dl-tls.c +index 280cee45f950..29422dcfd25e 100644 +--- a/src/rtld/dl-tls.c ++++ b/src/rtld/dl-tls.c +@@ -143,6 +143,11 @@ rtld_determine_tlsoffsets (int e_machine, struct r_scope_elem *search_list) + tls_tcb_size = 0; + break; + ++ case EM_S390: ++ tls_tcb_at_tp = 1; ++ tls_tcb_size = -1; ++ break; ++ + default: + /* Hope there's no TLS! */ + for (i = 0; i < search_list->r_nlist; i++) +-- +2.31.1 + diff --git a/package/prosody/0001-enable-syslog.patch b/package/prosody/0001-enable-syslog.patch index 16acc89c5a..5f09fa903e 100644 --- a/package/prosody/0001-enable-syslog.patch +++ b/package/prosody/0001-enable-syslog.patch @@ -11,7 +11,7 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index a0fc6c9e..af3cc0e4 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist -@@ -155,7 +155,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week +@@ -166,7 +166,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week log = { info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging error = "prosody.err"; diff --git a/package/prosody/0002-add-pidfile.patch b/package/prosody/0002-add-pidfile.patch index 6221fd0856..0653ed7239 100644 --- a/package/prosody/0002-add-pidfile.patch +++ b/package/prosody/0002-add-pidfile.patch @@ -11,7 +11,7 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index af3cc0e4..675db12f 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist -@@ -176,6 +176,9 @@ log = { +@@ -187,6 +187,9 @@ log = { -- HTTPS currently only supports a single certificate, specify it here: --https_certificate = "certs/localhost.crt" diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 50d5964712..4579545e39 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 be7e1c66c06b0eb4bdce37b67bcc6b51 prosody-0.11.9.tar.gz -sha1 632c2dd7794d344d4edbcea18fc1b5f623da5ca4 prosody-0.11.9.tar.gz -sha256 ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09 prosody-0.11.9.tar.gz -sha512 fabbbbb1acb3de4ff01e3e8c6e9e4dc37cb161259f1649683a1f9d925ed9f1709e052bfc831cba3f1861a9cca599f2b725ee739bfcb57164d6f50ac07011b52a prosody-0.11.9.tar.gz +md5 6130b79fb64141909330caf83a79a131 prosody-0.11.10.tar.gz +sha1 4dc8b2f783b43e7a5e781b1fc8aee48b0e106def prosody-0.11.10.tar.gz +sha256 c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1 prosody-0.11.10.tar.gz +sha512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb prosody-0.11.10.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 92c812ebfa..0eeb32cd3f 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.9 +PROSODY_VERSION = 0.11.10 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 492917c5e8..75791fade2 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -24,6 +24,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) PROTOBUF_CXXFLAGS += -O0 endif +ifeq ($(BR2_or1k),y) +PROTOBUF_CXXFLAGS += -mcmodel=large +endif + PROTOBUF_CONF_ENV = CXXFLAGS="$(PROTOBUF_CXXFLAGS)" ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) diff --git a/package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch b/package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch new file mode 100644 index 0000000000..16d4cfdb00 --- /dev/null +++ b/package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch @@ -0,0 +1,58 @@ +From ed643f0b4ac587204a5243451cda181ee1405d62 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Stefan=20Br=C3=BCns?= +Date: Wed, 28 Apr 2021 02:14:47 +0200 +Subject: [PATCH] Fix broken build due to C++ template behind C linkage + +glib/gatomic.h since 2.68 includes type_traits, which causes a compilation +error: +In file included from /usr/include/glib-2.0/glib/gatomic.h:31, + from /usr/include/glib-2.0/glib/gthread.h:32, + from /usr/include/glib-2.0/glib/gasyncqueue.h:32, + from /usr/include/glib-2.0/glib.h:32, + from /usr/include/libsigrokdecode/libsigrokdecode.h:25, + from /home/abuild/rpmbuild/BUILD/pulseview-0.4.2/pv/data/decode/annotation.cpp:21: +/usr/include/c++/10/type_traits:2308:3: error: template with C linkage +2308 | template + +As libsigrokdecode.h declares extern C linkage itself where necessary, +remove it from pulseviews include statements from the last two occasions. + +[Retrieved from: +https://sigrok.org/gitweb/?p=pulseview.git;a=commit;h=ed643f0b4ac587204a5243451cda181ee1405d62] +Signed-off-by: Fabrice Fontaine +--- + pv/data/decode/annotation.cpp | 2 -- + pv/views/trace/decodetrace.cpp | 2 -- + 2 files changed, 4 deletions(-) + +diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp +index 7f233478..f8a5c47b 100644 +--- a/pv/data/decode/annotation.cpp ++++ b/pv/data/decode/annotation.cpp +@@ -17,9 +17,7 @@ + * along with this program; if not, see . + */ + +-extern "C" { + #include +-} + + #include + #include +diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp +index 409f1d28..888064d0 100644 +--- a/pv/views/trace/decodetrace.cpp ++++ b/pv/views/trace/decodetrace.cpp +@@ -17,9 +17,7 @@ + * along with this program; if not, see . + */ + +-extern "C" { + #include +-} + + #include + #include +-- +2.24.0.rc2 + diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index 5a2e6da900..da4252d6da 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -17,4 +17,5 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY https://cryptography.io comment "python-cryptography needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index 18fad84007..f7bb1ae820 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -11,4 +11,5 @@ config BR2_PACKAGE_PYTHON_KEYRING https://pypi.python.org/pypi/keyring comment "python-keyring needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index e7e2804b4f..afc090856f 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -34,8 +34,6 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB_QT endif -comment "python-matplotlib needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -comment "python-matplotlib needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "python-matplotlib needs a glibc or musl toolchain w/ C++" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index 54714eb3bf..65221d3e51 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF select BR2_PACKAGE_ZLIB @@ -13,10 +14,12 @@ config BR2_PACKAGE_PYTHON_PYMUPDF https://github.com/pymupdf/PyMuPDF comment "python-pymupdf needs Xorg" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_XORG7 comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.8" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 95630f2461..99ea4e9408 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -10,4 +10,5 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL https://github.com/pyca/pyopenssl comment "python-pyopenssl needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch b/package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch new file mode 100644 index 0000000000..ea9ad15df2 --- /dev/null +++ b/package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch @@ -0,0 +1,33 @@ +From d747c4753484aa9b90a094d6bf7ec45e5acfb623 Mon Sep 17 00:00:00 2001 +From: Naor Livne +Date: Wed, 7 Jul 2021 16:25:20 +0300 +Subject: [PATCH] Allow idna 3.x to be installed on Python 3.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: Mickaël Schoentgen +Co-authored-by: Seth Michael Larson +(cherry picked from commit 33cf965f7271ab4978ed551754db37865c4085db) +Signed-off-by: Romain Naour +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7ba4b2a2..83d78665 100755 +--- a/setup.py ++++ b/setup.py +@@ -43,7 +43,8 @@ packages = ['requests'] + + requires = [ + 'chardet>=3.0.2,<5', +- 'idna>=2.5,<3', ++ 'idna>=2.5,<3; python_version < "3"', ++ 'idna>=2.5,<4; python_version >= "3"', + 'urllib3>=1.21.1,<1.27', + 'certifi>=2017.4.17' + +-- +2.31.1 + diff --git a/package/python-secretstorage/Config.in b/package/python-secretstorage/Config.in index 78a0a2ae15..8ae8c2d598 100644 --- a/package/python-secretstorage/Config.in +++ b/package/python-secretstorage/Config.in @@ -9,4 +9,5 @@ config BR2_PACKAGE_PYTHON_SECRETSTORAGE https://github.com/mitya57/secretstorage comment "python-secretstorage needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index cac1c06912..ab012347dc 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -13,4 +13,5 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY https://pypi.python.org/pypi/service_identity comment "python-service-identify needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 47719f92bf..02c26a53f7 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -18,4 +18,5 @@ config BR2_PACKAGE_PYTHON_TREQ https://github.com/twisted/treq comment "python-treq needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index 9677eb4da8..e8a1a233db 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -16,4 +16,5 @@ config BR2_PACKAGE_PYTHON_TXTORCON https://github.com/meejah/txtorcon comment "python-txtorcon needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch b/package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch new file mode 100644 index 0000000000..ea9ad15df2 --- /dev/null +++ b/package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch @@ -0,0 +1,33 @@ +From d747c4753484aa9b90a094d6bf7ec45e5acfb623 Mon Sep 17 00:00:00 2001 +From: Naor Livne +Date: Wed, 7 Jul 2021 16:25:20 +0300 +Subject: [PATCH] Allow idna 3.x to be installed on Python 3.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: Mickaël Schoentgen +Co-authored-by: Seth Michael Larson +(cherry picked from commit 33cf965f7271ab4978ed551754db37865c4085db) +Signed-off-by: Romain Naour +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7ba4b2a2..83d78665 100755 +--- a/setup.py ++++ b/setup.py +@@ -43,7 +43,8 @@ packages = ['requests'] + + requires = [ + 'chardet>=3.0.2,<5', +- 'idna>=2.5,<3', ++ 'idna>=2.5,<3; python_version < "3"', ++ 'idna>=2.5,<4; python_version >= "3"', + 'urllib3>=1.21.1,<1.27', + 'certifi>=2017.4.17' + +-- +2.31.1 + diff --git a/package/qemu/0004-Makefile-ignore-long-options.patch b/package/qemu/0004-Makefile-ignore-long-options.patch new file mode 100644 index 0000000000..2d14b70c03 --- /dev/null +++ b/package/qemu/0004-Makefile-ignore-long-options.patch @@ -0,0 +1,41 @@ +From 14833e24dea49303ebc2464813601054b6cdfcac Mon Sep 17 00:00:00 2001 +From: Alexey Neyman +Date: Wed, 21 Jul 2021 19:08:46 -0700 +Subject: [PATCH] Makefile: ignore long options + +When searching for options like -n in MAKEFLAGS, current code may result +in a false positive match when make is invoked with long options like +--no-print-directory. This has been observed with certain versions of +host make (e.g. 3.82) while building the Qemu package in buildroot. + +Filter out such long options before searching for one-character options. + +Signed-off-by: Alexey Neyman +Message-Id: <20210722020846.3678817-1-stilor@att.net> +Signed-off-by: Paolo Bonzini +--- + Makefile | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 6c36330eef..401c623a65 100644 +--- a/Makefile ++++ b/Makefile +@@ -129,9 +129,11 @@ endif + # 4. Rules to bridge to other makefiles + + ifneq ($(NINJA),) +-MAKE.n = $(findstring n,$(firstword $(MAKEFLAGS))) +-MAKE.k = $(findstring k,$(firstword $(MAKEFLAGS))) +-MAKE.q = $(findstring q,$(firstword $(MAKEFLAGS))) ++# Filter out long options to avoid flags like --no-print-directory which ++# may result in false positive match for MAKE.n ++MAKE.n = $(findstring n,$(firstword $(filter-out --%,$(MAKEFLAGS)))) ++MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS)))) ++MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS)))) + MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) + NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ + $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ +-- +2.27.0 + diff --git a/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch new file mode 100644 index 0000000000..0da6b3ff73 --- /dev/null +++ b/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch @@ -0,0 +1,46 @@ +From 4d5280c066eb46a31556044fb52c2618928b0019 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 9 Aug 2021 10:04:07 +0200 +Subject: [PATCH] block/export/fuse.c: fix musl build + +Fix the following build failure on musl raised since version 6.0.0 and +https://gitlab.com/qemu-project/qemu/-/commit/4ca37a96a75aafe7a37ba51ab1912b09b7190a6b +because musl does not define FALLOC_FL_ZERO_RANGE: + +../block/export/fuse.c: In function 'fuse_fallocate': +../block/export/fuse.c:563:23: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) + 563 | } else if (mode & FALLOC_FL_ZERO_RANGE) { + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/b96e3d364fd1f8bbfb18904a742e73327d308f64 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to qemu-devel@nongnu.org] +--- + block/export/fuse.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/block/export/fuse.c b/block/export/fuse.c +index ada9e263eb..07e31129a6 100644 +--- a/block/export/fuse.c ++++ b/block/export/fuse.c +@@ -635,6 +635,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode, + offset += size; + length -= size; + } while (ret == 0 && length > 0); ++#ifdef FALLOC_FL_ZERO_RANGE + } else if (mode & FALLOC_FL_ZERO_RANGE) { + if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) { + /* No need for zeroes, we are going to write them ourselves */ +@@ -654,6 +655,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode, + offset += size; + length -= size; + } while (ret == 0 && length > 0); ++#endif + } else if (!mode) { + /* We can only fallocate at the EOF with a truncate */ + if (offset < blk_len) { +-- +2.30.2 + diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 470c285f16..88516678d1 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -56,6 +56,12 @@ endif endif +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +QEMU_OPTS += --disable-vhost-user +else +QEMU_OPTS += --enable-vhost-user +endif + ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) QEMU_OPTS += --enable-slirp=system QEMU_DEPENDENCIES += slirp @@ -84,6 +90,19 @@ else QEMU_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_LIBFUSE3),y) +QEMU_OPTS += --enable-fuse +QEMU_DEPENDENCIES += libfuse3 +# musl does not support SEEK_HOLE/SEEK_DATA +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +QEMU_OPTS += --disable-fuse-lseek +else +QEMU_OPTS += --enable-fuse-lseek +endif +else +QEMU_OPTS += --disable-fuse --disable-fuse-lseek +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) QEMU_OPTS += --enable-seccomp QEMU_DEPENDENCIES += libseccomp diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 8b55aa3098..9da3de468a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -277,7 +277,7 @@ QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) # Qt 5.8 needs atomics, which on various architectures are in -latomic define QT5BASE_CONFIGURE_ARCH_CONFIG - printf 'LIBS += -latomic\n' >$(QT5BASE_ARCH_CONFIG_FILE) + printf '!host_build { \n LIBS += -latomic\n }' >$(QT5BASE_ARCH_CONFIG_FILE) endef endif diff --git a/package/refpolicy/0005-policy-modules-services-samba.te-make-crack-optional.patch b/package/refpolicy/0005-policy-modules-services-samba.te-make-crack-optional.patch new file mode 100644 index 0000000000..f5cc356aeb --- /dev/null +++ b/package/refpolicy/0005-policy-modules-services-samba.te-make-crack-optional.patch @@ -0,0 +1,82 @@ +From 7c58f2508efc115dea03e18e1fa611ebf81f6ee6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 4 Aug 2021 11:12:01 +0200 +Subject: [PATCH] policy/modules/services/samba.te: make crack optional + +Make crack optional to avoid the following build failure: + + Compiling targeted policy.31 + env LD_LIBRARY_PATH="/tmp/instance-5/output-1/host/lib:/tmp/instance-5/output-1/host/usr/lib" /tmp/instance-5/output-1/host/usr/bin/checkpolicy -c 31 -U deny -S -O -E policy.conf -o policy.31 + policy/modules/services/samba.te:399:ERROR 'type crack_db_t is not within scope' at token ';' on line 360232: + allow smbd_t crack_db_t:dir { getattr search open }; + #line 399 + checkpolicy: error(s) encountered while parsing configuration + +Fixes: + - http://autobuild.buildroot.org/results/ab7098948d1920e42fa587e07f0513f23ba7fc74 + +Signed-off-by: Fabrice Fontaine +--- + policy/modules/services/samba.te | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te +index 9d4665ae6..6c37625a9 100644 +--- a/policy/modules/services/samba.te ++++ b/policy/modules/services/samba.te +@@ -396,8 +396,6 @@ userdom_signal_all_users(smbd_t) + userdom_home_filetrans_user_home_dir(smbd_t) + userdom_user_home_dir_filetrans_user_home_content(smbd_t, { dir file lnk_file sock_file fifo_file }) + +-usermanage_read_crack_db(smbd_t) +- + ifdef(`hide_broken_symptoms',` + files_dontaudit_getattr_default_dirs(smbd_t) + files_dontaudit_getattr_boot_dirs(smbd_t) +@@ -413,18 +411,6 @@ tunable_policy(`samba_create_home_dirs',` + userdom_create_user_home_dirs(smbd_t) + ') + +-tunable_policy(`samba_domain_controller',` +- gen_require(` +- class passwd passwd; +- ') +- +- usermanage_domtrans_passwd(smbd_t) +- usermanage_kill_passwd(smbd_t) +- usermanage_domtrans_useradd(smbd_t) +- usermanage_domtrans_groupadd(smbd_t) +- allow smbd_t self:passwd passwd; +-') +- + tunable_policy(`samba_enable_home_dirs',` + userdom_manage_user_home_content_dirs(smbd_t) + userdom_manage_user_home_content_files(smbd_t) +@@ -505,6 +491,24 @@ optional_policy(` + seutil_sigchld_newrole(smbd_t) + ') + ++optional_policy(` ++ usermanage_read_crack_db(smbd_t) ++') ++ ++optional_policy(` ++ tunable_policy(`samba_domain_controller',` ++ gen_require(` ++ class passwd passwd; ++ ') ++ ++ usermanage_domtrans_passwd(smbd_t) ++ usermanage_kill_passwd(smbd_t) ++ usermanage_domtrans_useradd(smbd_t) ++ usermanage_domtrans_groupadd(smbd_t) ++ allow smbd_t self:passwd passwd; ++ ') ++') ++ + ######################################## + # + # Nmbd Local policy +-- +2.30.2 + diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index b79596e57a..e3510cc97e 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2021/04/05/ruby-3-0-1-released/ -sha512 97d2e883656060846b304368d9d836e2f3ef39859c36171c9398a0573818e4ed75bfd7460f901a9553f7f53518c505327a66e74f83704a881469f5ac61fe13d7 ruby-3.0.1.tar.xz +# https://www.ruby-lang.org/en/news/2021/07/07/ruby-3-0-2-released/ +sha512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4 ruby-3.0.2.tar.xz # License files, Locally calculated sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index a71ca3a8a2..2434ce946b 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,8 +5,8 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.0 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 -RUBY_VERSION_EXT = 3.0.1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION_EXT = 3.0.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz RUBY_DEPENDENCIES = host-pkgconf host-ruby diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 136ff79764..bdb1f07fcc 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -9,7 +9,7 @@ sha256 9fb4a22b74120b81a4d896326b02d121d5f996b3288580c346ea55a52d8946a9 rust-1 sha256 a1a77737d218087eb7d3613adcde2c9e383d758cdf128646a0ee63396145270b rust-std-1.54.0-aarch64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9a7ff8e4cd160f6a58c3b5c7e679b7acdc427c2440ecc70a31a5dc71bbecd0c8 rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz +sha256 9a7ff8e4cd160f6a58c3b5c7e679b7acdc427c2440ecc70a31a5dc71bbecd0c8 rust-std-1.54.0-aarch64-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc sha256 c87dc1681756c9c275eba690c6a05bcdd2ac3bd04a70ae039869dc85fff18b69 rust-std-1.54.0-arm-unknown-linux-gnueabi.tar.xz @@ -18,55 +18,58 @@ sha256 c87dc1681756c9c275eba690c6a05bcdd2ac3bd04a70ae039869dc85fff18b69 rust-s sha256 74c9f120ad8a443798ebec74302b5166a0880b13b1d8c43dde0c8ba70d9e4b2d rust-std-1.54.0-arm-unknown-linux-gnueabihf.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 2a19d96cf9e863448b21ff989550da54080312ce99272128cc0eb3b1fe5c73cc rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz +sha256 2a19d96cf9e863448b21ff989550da54080312ce99272128cc0eb3b1fe5c73cc rust-std-1.54.0-arm-unknown-linux-musleabihf.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 481192a6906c44501f910a35fc49ed9b1b271925c4569a52f45d9efbc2058ae2 rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz +sha256 481192a6906c44501f910a35fc49ed9b1b271925c4569a52f45d9efbc2058ae2 rust-std-1.54.0-arm-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 2716f587d0da1dd26fc64251303f5705230f5b86e47e9af35e11622d01ceb963 rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz +sha256 2716f587d0da1dd26fc64251303f5705230f5b86e47e9af35e11622d01ceb963 rust-std-1.54.0-armv5te-unknown-linux-gnueabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 b1f25af230f3b6fd930452024bd0cc9f4599bfb15f09f802cdb756effa516bbf rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz +sha256 b1f25af230f3b6fd930452024bd0cc9f4599bfb15f09f802cdb756effa516bbf rust-std-1.54.0-armv5te-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc sha256 86549aca1b65188cedf3f1c8fce5af3d7f817450418367049d4bbe8c69ba1da0 rust-std-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 7823b95fc3fcd7cc47ba767e2e917c9efbafed2d5ad0b74e7c087600bd72e54f rust-std-1.54.0-armv7-unknown-linux-gnueabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 f9a650a3970dbc321e8979dd87ed02fd8f9d03901c3fb1a87724f3c214eb6e57 rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz +sha256 f9a650a3970dbc321e8979dd87ed02fd8f9d03901c3fb1a87724f3c214eb6e57 rust-std-1.54.0-armv7-unknown-linux-musleabihf.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 19a80cfaf18c15eaa1c112312c0cb0ccfd14179407118b35735cdcfc1cc4c60f rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz +sha256 19a80cfaf18c15eaa1c112312c0cb0ccfd14179407118b35735cdcfc1cc4c60f rust-std-1.54.0-armv7-unknown-linux-musleabi.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz.asc sha256 7c747dea305f5d4b1c6a23d064fbb41e24bb56f2917867020bb57cb064878dc4 rust-std-1.54.0-i586-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b52dd3d4ae465037ed2987e23457d30e1a75fd16c2c421613ec52c250947a5f8 rust-std-1.54.0-i586-unknown-linux-musl.tar.xz +sha256 b52dd3d4ae465037ed2987e23457d30e1a75fd16c2c421613ec52c250947a5f8 rust-std-1.54.0-i586-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz.asc sha256 e88269a37ebfbff52fcd07746c53fc0bfa2570531f10f226800d5783ce735e3f rust-std-1.54.0-i686-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-i686-unknown-linux-musl.tar.xz.asc -sha256 947054afa4d6e37c64e484c704b5f09043783b83aafbf7a00e6959442b1fc14f rust-std-1.54.0-i686-unknown-linux-musl.tar.xz +sha256 947054afa4d6e37c64e484c704b5f09043783b83aafbf7a00e6959442b1fc14f rust-std-1.54.0-i686-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz.asc sha256 59c0bd07976f9e18e05e328e2f0acd9e99b736ea0330a03b313842e5c5816e13 rust-std-1.54.0-mips-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips-unknown-linux-musl.tar.xz.asc -sha256 02611ec7a6d510572803b4bd9948f0790e9f0ae8e3047ff7fa465300346e3b74 rust-std-1.54.0-mips-unknown-linux-musl.tar.xz +sha256 02611ec7a6d510572803b4bd9948f0790e9f0ae8e3047ff7fa465300346e3b74 rust-std-1.54.0-mips-unknown-linux-musl.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc sha256 dba582de46b7f97ba85b2d75662482df67214e71e0b9cea3c9c153c9d371a00f rust-std-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2e94aedf59369d81524dfe8027e6e4fb0fe338d2ee7869bd96e5cef24974cf0e rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz +sha256 2e94aedf59369d81524dfe8027e6e4fb0fe338d2ee7869bd96e5cef24974cf0e rust-std-1.54.0-mips64-unknown-linux-muslabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc sha256 d1d32bc202b026470ec2c37826fef92bd91f46b08ed1e2620a50eadba03d7095 rust-std-1.54.0-mips64el-unknown-linux-gnuabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 25d0c06fb445e16d7aac3b5370b43e72600a2aee41fa06605f64a3b8a8ed0e4b rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz +sha256 25d0c06fb445e16d7aac3b5370b43e72600a2aee41fa06605f64a3b8a8ed0e4b rust-std-1.54.0-mips64el-unknown-linux-muslabi64.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc sha256 626b4255d31c35fa77669471c15ec63b0e88726115538e598a6ef6e814d83bae rust-std-1.54.0-mipsel-unknown-linux-gnu.tar.xz @@ -84,16 +87,16 @@ sha256 f0329a9d6c96eeb1db5cb7969dbadbab58768b8bff48a1ffc89103031945126e rust-s sha256 c08b7df82a30acacb3afcdad34b3384e77a9f35ce6bef10d43f29f129fab35e1 rust-std-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 8b9ac3e1947036d6f2a3939edd279631fc1b0a260507343a8b3e9ecd448fe738 rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz +sha256 8b9ac3e1947036d6f2a3939edd279631fc1b0a260507343a8b3e9ecd448fe738 rust-std-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 6ce101e3c5b1bae6006c61a18dcb5685fe0ff57ea8c00a36e6bf95f748abe5f6 rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz +sha256 6ce101e3c5b1bae6006c61a18dcb5685fe0ff57ea8c00a36e6bf95f748abe5f6 rust-std-1.54.0-sparc64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc sha256 a22e19859b3c5032daac1633637546a986c51bdfa3ad0db6e394e6cc461f466b rust-std-1.54.0-x86_64-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 c2de24eb3e524c0fdd1e8116f578c103035da1ece1e4c06efab67999180eefe8 rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz +sha256 c2de24eb3e524c0fdd1e8116f578c103035da1ece1e4c06efab67999180eefe8 rust-std-1.54.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index c5f64fd3c6..90ea56f626 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -36,11 +36,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS # mips-unknown-linux-gnu default y if BR2_mips && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-gnuabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # mipsel-unknown-linux-gnu default y if BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 # mips64el-unknown-linux-gnuabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # powerpc-unknown-linux-gnu default y if BR2_powerpc && BR2_TOOLCHAIN_USES_GLIBC # powerpc64-unknown-linux-gnu @@ -84,9 +84,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS # mips-unknown-linux-musl default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-muslabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # mips64el-unknown-linux-muslabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # mipsel-unknown-linux-musl default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # sparc64-unknown-linux-gnu diff --git a/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch b/package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch similarity index 59% rename from package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch rename to package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch index 2f6ea5a11c..4ac0b8b029 100644 --- a/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch +++ b/package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch @@ -1,7 +1,7 @@ -From 49cd01dc97740b299119f32c822ccfd989ea7ec9 Mon Sep 17 00:00:00 2001 +From c2c310e93a5af148d37323f8d873e5656dea8b64 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Aug 2021 21:50:21 +0200 -Subject: [PATCH] libkmipclient/Makefile: add {CURL,XML2}_CONFIG +Subject: [PATCH] Makefile: add {CURL,XML2}_CONFIG Add CURL_CONFIG and XML2_CONFIG to allow the user to configure the binaries used in check-dep-libkmipclient @@ -20,11 +20,47 @@ Fixes: Signed-off-by: Fabrice Fontaine [Upstream status: https://github.com/ibm-s390-linux/s390-tools/pull/121] --- + libekmfweb/Makefile | 10 ++++++---- libkmipclient/Makefile | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) + 2 files changed, 14 insertions(+), 9 deletions(-) +diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile +index 8e12fb56..1c776996 100644 +--- a/libekmfweb/Makefile ++++ b/libekmfweb/Makefile +@@ -47,6 +47,8 @@ detect-openssl-version.dep: + echo "}" >> $(TMPFILE) + mv $(TMPFILE) $@ + ++CURL_CONFIG ?= curl-config ++ + check-dep-libekmfweb: detect-openssl-version.dep + $(call check_dep, \ + "libekmfweb", \ +@@ -64,8 +66,8 @@ check-dep-libekmfweb: detect-openssl-version.dep + "curl/curl.h", \ + "libcurl-devel", \ + "HAVE_LIBCURL=0" \ +- `curl-config --cflags` `curl-config --libs`) +- curl-config --ssl-backends | grep OpenSSL >/dev/null 2>&1 || { echo "Error: libcurl is not built with the OpenSSL backend"; exit 1; } ++ `$(CURL_CONFIG) --cflags` `$(CURL_CONFIG) --libs`) ++ $(CURL_CONFIG) --ssl-backends | grep OpenSSL >/dev/null 2>&1 || { echo "Error: libcurl is not built with the OpenSSL backend"; exit 1; } + touch check-dep-libekmfweb + + skip-libekmfweb-openssl: +@@ -83,8 +85,8 @@ ekmfweb.o: check-dep-libekmfweb ekmfweb.c utilities.h cca.h $(rootdir)include/ek + utilities.o: check-dep-libekmfweb utilities.c utilities.h $(rootdir)include/ekmfweb/ekmfweb.h + cca.o: check-dep-libekmfweb cca.c cca.h utilities.h $(rootdir)include/ekmfweb/ekmfweb.h + +-libekmfweb.so.$(VERSION): ALL_CFLAGS += -fPIC `curl-config --cflags` +-libekmfweb.so.$(VERSION): LDLIBS = -ljson-c -lcrypto -lssl `curl-config --libs` -ldl ++libekmfweb.so.$(VERSION): ALL_CFLAGS += -fPIC `$(CURL_CONFIG) --cflags` ++libekmfweb.so.$(VERSION): LDLIBS = -ljson-c -lcrypto -lssl `$(CURL_CONFIG) --libs` -ldl + libekmfweb.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libekmfweb.map \ + -Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM) + libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o $(libs) diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile -index 36efecb..addd096 100644 +index 36efecb4..addd0965 100644 --- a/libkmipclient/Makefile +++ b/libkmipclient/Makefile @@ -50,6 +50,9 @@ detect-openssl-version.dep: @@ -66,6 +102,3 @@ index 36efecb..addd096 100644 libkmipclient.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libkmipclient.map \ -Wl,-z,defs,-Bsymbolic -Wl,-soname,libkmipclient.so.$(VERM) libkmipclient.so.$(VERSION): kmip.o request.o response.o attribute.o key.o ttlv.o json.o \ --- -2.30.2 - diff --git a/package/sconeserver/0001-sconex-Descriptor.cpp-fix-build-with-gcc-11.patch b/package/sconeserver/0001-sconex-Descriptor.cpp-fix-build-with-gcc-11.patch new file mode 100644 index 0000000000..335be82f7d --- /dev/null +++ b/package/sconeserver/0001-sconex-Descriptor.cpp-fix-build-with-gcc-11.patch @@ -0,0 +1,54 @@ +From 5e4cb613d9bb287e9f54da86f99a51d0338b1faa Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 10 Aug 2021 10:36:53 +0200 +Subject: [PATCH] sconex/Descriptor.cpp: fix build with gcc 11 + +Fix the following build failure with gcc 11: + +In file included from ../sconex/sconex.h:229, + from ../sconex/Descriptor.h:63, + from Descriptor.cpp:22: +Descriptor.cpp: In member function 'void scx::Descriptor::add_stream(scx::Stream*)': +Descriptor.cpp:150:22: error: ordered comparison of pointer with integer zero ('scx::Stream*' and 'int') + 150 | DEBUG_ASSERT(stream>=0,"add_stream() Invalid stream"); + | ~~~~~~^~~ + | ^~~~ +Descriptor.cpp: In member function 'bool scx::Descriptor::remove_stream(scx::Stream*)': +Descriptor.cpp:204:22: error: ordered comparison of pointer with integer zero ('scx::Stream*' and 'int') + 204 | DEBUG_ASSERT(stream>=0,"remove_stream() Invalid stream"); + | ~~~~~~^~~ + +Fixes: + - http://autobuild.buildroot.org/results/ccc9562e83fd2bd312d21b3124be42dfe4b7e850 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/sconemad/sconeserver/pull/4] +--- + sconex/Descriptor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sconex/Descriptor.cpp b/sconex/Descriptor.cpp +index 590adba..4adfd86 100644 +--- a/sconex/Descriptor.cpp ++++ b/sconex/Descriptor.cpp +@@ -147,7 +147,7 @@ bool Descriptor::dup(int d) + //============================================================================= + void Descriptor::add_stream(Stream* stream) + { +- DEBUG_ASSERT(stream>=0,"add_stream() Invalid stream"); ++ DEBUG_ASSERT(stream!=0,"add_stream() Invalid stream"); + + m_streams.push_back(stream); + stream->set_endpoint(this); +@@ -201,7 +201,7 @@ void Descriptor::add_stream_after(Stream* stream,const Stream* after) + //============================================================================= + bool Descriptor::remove_stream(Stream* stream) + { +- DEBUG_ASSERT(stream>=0,"remove_stream() Invalid stream"); ++ DEBUG_ASSERT(stream!=0,"remove_stream() Invalid stream"); + + std::list::iterator it = m_streams.begin(); + while (it != m_streams.end()) { +-- +2.30.2 + diff --git a/package/sdl2/0001-Buildsystem-Add-guards-for-not-building-with-KMSDRM-support-if-EGL.patch b/package/sdl2/0001-Buildsystem-Add-guards-for-not-building-with-KMSDRM-support-if-EGL.patch new file mode 100644 index 0000000000..b58c989f13 --- /dev/null +++ b/package/sdl2/0001-Buildsystem-Add-guards-for-not-building-with-KMSDRM-support-if-EGL.patch @@ -0,0 +1,433 @@ +From 2fc987c28f14668a9ce360331f591e32e20c3906 Mon Sep 17 00:00:00 2001 +From: Manuel Alfayate Corchete +Date: Tue, 22 Dec 2020 14:15:33 +0100 +Subject: [PATCH] [Buildsystem] Add guards for not building with KMSDRM support + if EGL is not available. + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/libsdl-org/SDL/commit/2fc987c28f14668a9ce360331f591e32e20c3906] +--- + configure.ac | 29 ++++++++++++++++++- + src/video/kmsdrm/SDL_kmsdrmopengles.c | 4 +-- + src/video/kmsdrm/SDL_kmsdrmopengles.h | 4 +-- + src/video/kmsdrm/SDL_kmsdrmvideo.c | 22 +++++--------- + src/video/kmsdrm/SDL_kmsdrmvideo.h | 8 ----- + .../SDL_kmsdrm_legacy_opengles.c | 4 +-- + .../SDL_kmsdrm_legacy_opengles.h | 4 +-- + .../kmsdrm_legacy/SDL_kmsdrm_legacy_video.c | 20 ++----------- + .../kmsdrm_legacy/SDL_kmsdrm_legacy_video.h | 6 ++-- + 9 files changed, 47 insertions(+), 54 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b7e519b8f..acff858ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2236,7 +2236,10 @@ CheckKMSDRM() + AS_HELP_STRING([--enable-video-kmsdrm], [use KMSDRM video driver [[default=no]]]), + , enable_video_kmsdrm=no) + +- if test x$enable_video = xyes -a x$enable_video_kmsdrm = xyes; then ++ if test x$enable_video = xyes && \ ++ test x$enable_video_kmsdrm = xyes && \ ++ test x$video_opengl_egl = xyes; then ++ + video_kmsdrm=no + + PKG_CHECK_MODULES([LIBDRM], [libdrm >= 1.4.82], libdrm_avail=yes, libdrm_avail=no) +@@ -2418,6 +2421,28 @@ CheckOpenGLESX11() + fi + } + ++dnl Find EGL ++CheckEGLKMSDRM() ++{ ++ AC_MSG_CHECKING(for EGL support) ++ video_opengl_egl=no ++ AC_TRY_COMPILE([ ++ #define LINUX ++ #define EGL_API_FB ++ #define MESA_EGL_NO_X11_HEADERS ++ #define EGL_NO_X11 ++ #include ++ #include ++ ],[ ++ ],[ ++ video_opengl_egl=yes ++ ]) ++ AC_MSG_RESULT($video_opengl_egl) ++ if test x$video_opengl_egl = xyes; then ++ AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ]) ++ fi ++} ++ + dnl Check for Windows OpenGL + CheckWINDOWSGL() + { +@@ -3555,6 +3580,8 @@ case "$host" in + CheckRPI + CheckX11 + CheckDirectFB ++ # Need to check for EGL first because KMSDRM depends on it. ++ CheckEGLKMSDRM + CheckKMSDRM + CheckOpenGLX11 + CheckOpenGLESX11 +diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c +index c9ec554b4..664621d2b 100644 +--- a/src/video/kmsdrm/SDL_kmsdrmopengles.c ++++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c +@@ -22,7 +22,7 @@ + + #include "../../SDL_internal.h" + +-#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL ++#if SDL_VIDEO_DRIVER_KMSDRM + + #include "SDL_kmsdrmvideo.h" + #include "SDL_kmsdrmopengles.h" +@@ -376,6 +376,6 @@ KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window) + + SDL_EGL_MakeCurrent_impl(KMSDRM) + +-#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ ++#endif /* SDL_VIDEO_DRIVER_KMSDRM */ + + /* vi: set ts=4 sw=4 expandtab: */ +diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.h b/src/video/kmsdrm/SDL_kmsdrmopengles.h +index f81b0c3dc..c8db7da86 100644 +--- a/src/video/kmsdrm/SDL_kmsdrmopengles.h ++++ b/src/video/kmsdrm/SDL_kmsdrmopengles.h +@@ -24,7 +24,7 @@ + #ifndef SDL_kmsdrmopengles_h_ + #define SDL_kmsdrmopengles_h_ + +-#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL ++#if SDL_VIDEO_DRIVER_KMSDRM + + #include "../SDL_sysvideo.h" + #include "../SDL_egl_c.h" +@@ -42,7 +42,7 @@ extern SDL_GLContext KMSDRM_GLES_CreateContext(_THIS, SDL_Window * window); + extern int KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window); + extern int KMSDRM_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); + +-#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ ++#endif /* SDL_VIDEO_DRIVER_KMSDRM */ + + #endif /* SDL_kmsdrmopengles_h_ */ + +diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c +index e84bd5ebc..663bc2170 100644 +--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c ++++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c +@@ -846,7 +846,6 @@ KMSDRM_CreateDevice(int devindex) + device->SetWindowGrab = KMSDRM_SetWindowGrab; + device->DestroyWindow = KMSDRM_DestroyWindow; + device->GetWindowWMInfo = KMSDRM_GetWindowWMInfo; +-#if SDL_VIDEO_OPENGL_EGL + device->GL_DefaultProfileConfig = KMSDRM_GLES_DefaultProfileConfig; + device->GL_LoadLibrary = KMSDRM_GLES_LoadLibrary; + device->GL_GetProcAddress = KMSDRM_GLES_GetProcAddress; +@@ -857,9 +856,7 @@ KMSDRM_CreateDevice(int devindex) + device->GL_GetSwapInterval = KMSDRM_GLES_GetSwapInterval; + device->GL_SwapWindow = KMSDRM_GLES_SwapWindow; + device->GL_DeleteContext = KMSDRM_GLES_DeleteContext; +-#endif +- device->PumpEvents = KMSDRM_PumpEvents; +- device->free = KMSDRM_DeleteDevice; ++ + #if SDL_VIDEO_VULKAN + device->Vulkan_LoadLibrary = KMSDRM_Vulkan_LoadLibrary; + device->Vulkan_UnloadLibrary = KMSDRM_Vulkan_UnloadLibrary; +@@ -867,6 +864,10 @@ KMSDRM_CreateDevice(int devindex) + device->Vulkan_CreateSurface = KMSDRM_Vulkan_CreateSurface; + device->Vulkan_GetDrawableSize = KMSDRM_Vulkan_GetDrawableSize; + #endif ++ ++ device->PumpEvents = KMSDRM_PumpEvents; ++ device->free = KMSDRM_DeleteDevice; ++ + return device; + + cleanup: +@@ -1327,9 +1328,7 @@ KMSDRM_DestroySurfaces(_THIS, SDL_Window *window) + SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0); + KMSDRM_PlaneInfo plane_info = {0}; + +-#if SDL_VIDEO_OPENGL_EGL + EGLContext egl_context; +-#endif + + /********************************************************************/ + /* BLOCK 1: protect the PRIMARY PLANE before destroying the buffers */ +@@ -1380,7 +1379,6 @@ KMSDRM_DestroySurfaces(_THIS, SDL_Window *window) + /* will get wrong info and we will be in trouble. */ + /***************************************************************************/ + +-#if SDL_VIDEO_OPENGL_EGL + egl_context = (EGLContext)SDL_GL_GetCurrentContext(); + SDL_EGL_MakeCurrent(_this, EGL_NO_SURFACE, egl_context); + +@@ -1388,7 +1386,6 @@ KMSDRM_DestroySurfaces(_THIS, SDL_Window *window) + SDL_EGL_DestroySurface(_this, windata->egl_surface); + windata->egl_surface = EGL_NO_SURFACE; + } +-#endif + + if (windata->gs) { + KMSDRM_gbm_surface_destroy(windata->gs); +@@ -1431,7 +1428,6 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window) + return SDL_SetError("Could not create GBM surface"); + } + +-#if SDL_VIDEO_OPENGL_EGL + /* We can't get the EGL context yet because SDL_CreateRenderer has not been called, + but we need an EGL surface NOW, or GL won't be able to render into any surface + and we won't see the first frame. */ +@@ -1448,8 +1444,6 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window) + egl_context = (EGLContext)SDL_GL_GetCurrentContext(); + ret = SDL_EGL_MakeCurrent(_this, windata->egl_surface, egl_context); + +-#endif +- + cleanup: + + if (ret) { +@@ -1478,11 +1472,11 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *window) + + if (!is_vulkan) { + KMSDRM_DestroySurfaces(_this, window); +-#if SDL_VIDEO_OPENGL_EGL ++ + if (_this->egl_data) { + SDL_EGL_UnloadLibrary(_this); + } +-#endif ++ + if (dispdata->gbm_init) { + KMSDRM_DeinitMouse(_this); + KMSDRM_GBMDeinit(_this, dispdata); +@@ -1754,7 +1748,6 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window) + goto cleanup; + } + +-#if SDL_VIDEO_OPENGL_EGL + /* Manually load the EGL library. KMSDRM_EGL_LoadLibrary() has already + been called by SDL_CreateWindow() but we don't do anything there, + precisely to be able to load it here. +@@ -1766,7 +1759,6 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window) + goto cleanup; + } + } +-#endif + + /* Can't init mouse stuff sooner because cursor plane is not ready. */ + KMSDRM_InitMouse(_this); +diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/video/kmsdrm/SDL_kmsdrmvideo.h +index 2cf34522b..e58c922a8 100644 +--- a/src/video/kmsdrm/SDL_kmsdrmvideo.h ++++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h +@@ -34,10 +34,8 @@ + + #include + #include +-#if SDL_VIDEO_OPENGL_EGL + #include + #include +-#endif + + /****************************************************************************************/ + /* Driverdata pointers are void struct* used to store backend-specific variables */ +@@ -101,10 +99,6 @@ typedef struct SDL_DisplayData + EGLSyncKHR kms_fence; + EGLSyncKHR gpu_fence; + +-#if SDL_VIDEO_OPENGL_EGL +- EGLSurface old_egl_surface; +-#endif +- + SDL_bool modeset_pending; + SDL_bool gbm_init; + +@@ -129,9 +123,7 @@ typedef struct SDL_WindowData + struct gbm_bo *bo; + struct gbm_bo *next_bo; + +-#if SDL_VIDEO_OPENGL_EGL + EGLSurface egl_surface; +-#endif + + /* For scaling and AR correction. */ + int32_t src_w; +diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c +index 890801891..a886eb326 100644 +--- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c ++++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c +@@ -21,7 +21,7 @@ + + #include "../../SDL_internal.h" + +-#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL ++#if SDL_VIDEO_DRIVER_KMSDRM + + #include "SDL_log.h" + +@@ -147,6 +147,6 @@ KMSDRM_LEGACY_GLES_SwapWindow(_THIS, SDL_Window * window) { + + SDL_EGL_MakeCurrent_impl(KMSDRM_LEGACY) + +-#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ ++#endif /* SDL_VIDEO_DRIVER_KMSDRM */ + + /* vi: set ts=4 sw=4 expandtab: */ +diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h +index 5e5ba96dc..2926cbe58 100644 +--- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h ++++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h +@@ -23,7 +23,7 @@ + #ifndef SDL_kmsdrmopengles_h_ + #define SDL_kmsdrmopengles_h_ + +-#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL ++#if SDL_VIDEO_DRIVER_KMSDRM + + #include "../SDL_sysvideo.h" + #include "../SDL_egl_c.h" +@@ -41,7 +41,7 @@ extern SDL_GLContext KMSDRM_LEGACY_GLES_CreateContext(_THIS, SDL_Window * window + extern int KMSDRM_LEGACY_GLES_SwapWindow(_THIS, SDL_Window * window); + extern int KMSDRM_LEGACY_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); + +-#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ ++#endif /* SDL_VIDEO_DRIVER_KMSDRM */ + + #endif /* SDL_kmsdrmopengles_h_ */ + +diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c +index 36b1899bd..acddfc29a 100644 +--- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c ++++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c +@@ -213,7 +213,7 @@ KMSDRM_LEGACY_CreateDevice(int devindex) + device->SetWindowGrab = KMSDRM_LEGACY_SetWindowGrab; + device->DestroyWindow = KMSDRM_LEGACY_DestroyWindow; + device->GetWindowWMInfo = KMSDRM_LEGACY_GetWindowWMInfo; +-#if SDL_VIDEO_OPENGL_EGL ++ + device->GL_LoadLibrary = KMSDRM_LEGACY_GLES_LoadLibrary; + device->GL_GetProcAddress = KMSDRM_LEGACY_GLES_GetProcAddress; + device->GL_UnloadLibrary = KMSDRM_LEGACY_GLES_UnloadLibrary; +@@ -223,7 +223,7 @@ KMSDRM_LEGACY_CreateDevice(int devindex) + device->GL_GetSwapInterval = KMSDRM_LEGACY_GLES_GetSwapInterval; + device->GL_SwapWindow = KMSDRM_LEGACY_GLES_SwapWindow; + device->GL_DeleteContext = KMSDRM_LEGACY_GLES_DeleteContext; +-#endif ++ + device->PumpEvents = KMSDRM_LEGACY_PumpEvents; + device->free = KMSDRM_LEGACY_DeleteDevice; + +@@ -369,14 +369,12 @@ KMSDRM_LEGACY_DestroySurfaces(_THIS, SDL_Window * window) + windata->next_bo = NULL; + } + +-#if SDL_VIDEO_OPENGL_EGL + SDL_EGL_MakeCurrent(_this, EGL_NO_SURFACE, EGL_NO_CONTEXT); + + if (windata->egl_surface != EGL_NO_SURFACE) { + SDL_EGL_DestroySurface(_this, windata->egl_surface); + windata->egl_surface = EGL_NO_SURFACE; + } +-#endif + + if (windata->gs) { + KMSDRM_LEGACY_gbm_surface_destroy(windata->gs); +@@ -394,18 +392,14 @@ KMSDRM_LEGACY_CreateSurfaces(_THIS, SDL_Window * window) + Uint32 height = dispdata->mode.vdisplay; + Uint32 surface_fmt = GBM_FORMAT_XRGB8888; + Uint32 surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING; +-#if SDL_VIDEO_OPENGL_EGL + EGLContext egl_context; +-#endif + + if (!KMSDRM_LEGACY_gbm_device_is_format_supported(viddata->gbm, surface_fmt, surface_flags)) { + SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "GBM surface format not supported. Trying anyway."); + } + +-#if SDL_VIDEO_OPENGL_EGL + SDL_EGL_SetRequiredVisualId(_this, surface_fmt); + egl_context = (EGLContext)SDL_GL_GetCurrentContext(); +-#endif + + KMSDRM_LEGACY_DestroySurfaces(_this, window); + +@@ -415,7 +409,6 @@ KMSDRM_LEGACY_CreateSurfaces(_THIS, SDL_Window * window) + return SDL_SetError("Could not create GBM surface"); + } + +-#if SDL_VIDEO_OPENGL_EGL + windata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType)windata->gs); + + if (windata->egl_surface == EGL_NO_SURFACE) { +@@ -425,7 +418,6 @@ KMSDRM_LEGACY_CreateSurfaces(_THIS, SDL_Window * window) + SDL_EGL_MakeCurrent(_this, windata->egl_surface, egl_context); + + windata->egl_surface_dirty = 0; +-#endif + + return 0; + } +@@ -734,15 +726,9 @@ KMSDRM_LEGACY_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode + SDL_Window *window = viddata->windows[i]; + SDL_WindowData *windata = (SDL_WindowData *)window->driverdata; + +-#if SDL_VIDEO_OPENGL_EGL + /* Can't recreate EGL surfaces right now, need to wait until SwapWindow + so the correct thread-local surface and context state are available */ + windata->egl_surface_dirty = 1; +-#else +- if (KMSDRM_LEGACY_CreateSurfaces(_this, window)) { +- return -1; +- } +-#endif + + /* Tell app about the resize */ + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, mode->w, mode->h); +@@ -758,13 +744,11 @@ KMSDRM_LEGACY_CreateWindow(_THIS, SDL_Window * window) + SDL_WindowData *windata; + SDL_VideoDisplay *display; + +-#if SDL_VIDEO_OPENGL_EGL + if (!_this->egl_data) { + if (SDL_GL_LoadLibrary(NULL) < 0) { + goto error; + } + } +-#endif + + /* Allocate window internal data */ + windata = (SDL_WindowData *)SDL_calloc(1, sizeof(SDL_WindowData)); +diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h +index 28e1bc4fe..9df2bcfa3 100644 +--- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h ++++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h +@@ -31,9 +31,7 @@ + #include + #include + #include +-#if SDL_VIDEO_OPENGL_EGL + #include +-#endif + + typedef struct SDL_VideoData + { +@@ -71,10 +69,10 @@ typedef struct SDL_WindowData + struct gbm_bo *crtc_bo; + SDL_bool waiting_for_flip; + SDL_bool double_buffer; +-#if SDL_VIDEO_OPENGL_EGL ++ + int egl_surface_dirty; + EGLSurface egl_surface; +-#endif ++ + } SDL_WindowData; + + typedef struct KMSDRM_LEGACY_FBInfo diff --git a/package/sdl2/0001-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch b/package/sdl2/0001-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch deleted file mode 100644 index 47a13300eb..0000000000 --- a/package/sdl2/0001-src-video-kmsdrm-SDL_kmsdrmvideo.c-fix-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d265b1ee94aa4faf5fa405f14cc731a25d7a00ab Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 24 Mar 2020 14:11:14 +0100 -Subject: [PATCH] src/video/kmsdrm/SDL_kmsdrmvideo.c: fix build - -Build is broken without EGL since version 2.0.12 and -https://hg.libsdl.org/SDL/rev/9761858bd6a3: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/build/sdl2-2.0.12/src/video/kmsdrm/SDL_kmsdrmvideo.c: In function 'KMSDRM_CreateSurfaces': -/home/giuliobenetti/autobuild/run/instance-1/output-1/build/sdl2-2.0.12/src/video/kmsdrm/SDL_kmsdrmvideo.c:394:5: error: unknown type name 'EGLContext' - EGLContext egl_context; - ^ - -Fixes: - - http://autobuild.buildroot.org/results/fafd20a01591032662f9ca025fcea3478239cf3c - -Signed-off-by: Fabrice Fontaine - -[Upstream: https://hg.libsdl.org/SDL/rev/389ce8cfa2a3] - - -Fixes: - - Update patch to version 2.0.14 - -Signed-off-by: Michael Fischer - -diff -purN a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c 2021-01-08 09:56:44.028217792 +0100 -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c 2021-01-08 09:55:52.295932111 +0100 -@@ -1407,7 +1407,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window - uint32_t surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING; - uint32_t width, height; - -+#if SDL_VIDEO_OPENGL_EGL - EGLContext egl_context; -+#endif - - int ret = 0; - diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index f29b3c7c38..07de75a4d5 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -32,10 +32,15 @@ comment "X11 video driver needs X.org" config BR2_PACKAGE_SDL2_KMSDRM bool "KMS/DRM video driver" depends on BR2_PACKAGE_LIBDRM + # requires libgbm from mesa3d + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL comment "KMS/DRM video driver needs libdrm" depends on !BR2_PACKAGE_LIBDRM +comment "KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + config BR2_PACKAGE_SDL2_OPENGL bool "OpenGL (GLX)" depends on BR2_PACKAGE_HAS_LIBGL diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 103dc107d2..f93c3fa879 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -22,6 +22,14 @@ SDL2_CONF_OPTS += \ --disable-pulseaudio \ --disable-video-wayland +# We're patching configure.ac but autoreconf breaks the build +# The script only uses autoconf, not automake or libtool +SDL2_DEPENDENCIES += host-autoconf +define SDL2_RUN_AUTOGEN + cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef +SDL2_PRE_CONFIGURE_HOOKS += SDL2_RUN_AUTOGEN + # We are using autotools build system for sdl2, so the sdl2-config.cmake # include path are not resolved like for sdl2-config script. # Change the absolute /usr path to resolve relatively to the sdl2-config.cmake location. @@ -152,7 +160,7 @@ SDL2_CONF_OPTS += --disable-alsa endif ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y) -SDL2_DEPENDENCIES += libdrm +SDL2_DEPENDENCIES += libdrm mesa3d SDL2_CONF_OPTS += --enable-video-kmsdrm else SDL2_CONF_OPTS += --disable-video-kmsdrm diff --git a/package/seatd/0003-meson.build-fix-build-with-gcc-7.patch b/package/seatd/0003-meson.build-fix-build-with-gcc-7.patch new file mode 100644 index 0000000000..0e9f437cc3 --- /dev/null +++ b/package/seatd/0003-meson.build-fix-build-with-gcc-7.patch @@ -0,0 +1,48 @@ +From 0b32c33978fbe8772df6d185c9b9d646c442dc5d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Aug 2021 19:00:35 +0200 +Subject: [PATCH] meson.build: fix build with gcc < 7 + +Test if -Wimplicit-fallthrough is available before using it as it has +been added only since gcc 7.1 and +https://github.com/gcc-mirror/gcc/commit/81fea426da8c4687bb32e6894dc26f00ae211822 +and so it will raise the following build failure with gcc < 7: + +arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough' + +Fixes: + - http://autobuild.buildroot.org/results/0ee6816a7cceebdafd07612677a594bdf68e0790 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/kennylevinsen/seatd/pull/1] +--- + meson.build | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1131b4b..c366a59 100644 +--- a/meson.build ++++ b/meson.build +@@ -31,7 +31,6 @@ add_project_arguments( + '-Wold-style-definition', # nop + '-Wpointer-arith', + '-Wstrict-prototypes', +- '-Wimplicit-fallthrough', + '-Wmissing-prototypes', + '-Wno-unknown-warning-option', + '-Wno-unused-command-line-argument', +@@ -45,6 +44,11 @@ add_project_arguments( + language: 'c', + ) + ++cc = meson.get_compiler('c') ++if cc.has_argument('-Wimplicit-fallthrough') ++ add_project_arguments('-Wimplicit-fallthrough' , language : 'c') ++endif ++ + if ['debugoptimized', 'release', 'minsize'].contains(get_option('buildtype')) + add_project_arguments('-D_FORTIFY_SOURCE=2', language: 'c') + endif +-- +2.30.2 + diff --git a/package/sentry-cli/Config.in.host b/package/sentry-cli/Config.in.host deleted file mode 100644 index 3124015367..0000000000 --- a/package/sentry-cli/Config.in.host +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_HOST_SENTRY_CLI - bool "host sentry-cli" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_RUSTC - help - Official Sentry command line interface - - For managing debug information files and source maps. - - https://docs.sentry.io/cli/ diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash deleted file mode 100644 index 3b0733a276..0000000000 --- a/package/sentry-cli/sentry-cli.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally calculated -sha256 5d0f7acf6a139d1c1716b9a8ff76c8bfaab09104ba663c957bb9a5dba2ffbabd sentry-cli-1.57.0.tar.gz -sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk deleted file mode 100644 index 7e53f16026..0000000000 --- a/package/sentry-cli/sentry-cli.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# sentry-cli -# -################################################################################ - -SENTRY_CLI_VERSION = 1.57.0 -SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) -SENTRY_CLI_LICENSE = BSD-3-clause -SENTRY_CLI_LICENSE_FILES = LICENSE - -HOST_SENTRY_CLI_DEPENDENCIES = host-rustc host-zlib - -HOST_SENTRY_CLI_CARGO_ENV = \ - CARGO_HOME=$(HOST_DIR)/share/cargo \ - RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" - -HOST_SENTRY_CLI_CARGO_OPTS = \ - --release \ - --manifest-path=$(@D)/Cargo.toml - -define HOST_SENTRY_CLI_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_SENTRY_CLI_CARGO_ENV) \ - cargo build $(HOST_SENTRY_CLI_CARGO_OPTS) -endef - -define HOST_SENTRY_CLI_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/target/release/sentry-cli \ - $(HOST_DIR)/bin/sentry-cli -endef - -$(eval $(host-generic-package)) diff --git a/package/snort3/snort3.mk b/package/snort3/snort3.mk index aabc89e165..7495ab9b0f 100644 --- a/package/snort3/snort3.mk +++ b/package/snort3/snort3.mk @@ -54,4 +54,9 @@ else SNORT3_CONF_OPTS += -DHAVE_LZMA=OFF endif +# Uses __atomic_load_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SNORT3_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 8e864ba2e5..0c2f27f127 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -SQLITE_VERSION = 3350500 -SQLITE_CPE_ID_VERSION = 3.35.5 -SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz +SQLITE_VERSION = 3.35.5 +SQLITE_TAR_VERSION = 3350500 +SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2021 SQLITE_LICENSE = Public domain SQLITE_LICENSE_FILES = tea/license.terms diff --git a/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch new file mode 100644 index 0000000000..fe3375bc91 --- /dev/null +++ b/package/sylpheed/0001-harden-link-checker-before-accepting-click.patch @@ -0,0 +1,37 @@ +From ac286a71ed78429e16c612161251b9ea90ccd431 Mon Sep 17 00:00:00 2001 +From: Paul +Date: Sun, 23 May 2021 12:16:40 +0100 +Subject: [PATCH] harden link checker before accepting click + +[Retrieved from: +https://git.claws-mail.org/?p=claws.git;a=commit;h=ac286a71ed78429e16c612161251b9ea90ccd431] +Signed-off-by: Fabrice Fontaine +--- + src/textview.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/textview.c b/src/textview.c +index 62ad46eaf..3cdf5d911 100644 +--- a/src/textview.c ++++ b/src/textview.c +@@ -2885,7 +2885,7 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri) + gboolean retval = TRUE; + + if (is_uri_string(uri->uri) == FALSE) +- return TRUE; ++ return FALSE; + + visible_str = textview_get_visible_uri(textview, uri); + if (visible_str == NULL) +@@ -2922,6 +2922,8 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri) + if (aval == G_ALERTALTERNATE) + retval = TRUE; + } ++ if (strlen(uri->uri) > get_uri_len(uri->uri)) ++ retval = FALSE; + + g_free(visible_str); + +-- +2.25.1 + diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk index 0453fba521..a7c7adade3 100644 --- a/package/sylpheed/sylpheed.mk +++ b/package/sylpheed/sylpheed.mk @@ -10,9 +10,13 @@ SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR) SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin) SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB +SYLPHEED_CPE_ID_VENDOR = sylpheed_project SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2 +# 0001-harden-link-checker-before-accepting-click.patch +SYLPHEED_IGNORE_CVES += CVE-2021-37746 + # Remove the -I$(includedir) from the Makefiles # because it refers to the host /usr/include. define SYLPHEED_PRECONFIGURE diff --git a/package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch new file mode 100644 index 0000000000..fe55e4eb4d --- /dev/null +++ b/package/tar/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -0,0 +1,46 @@ +From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 1 Apr 2021 07:49:46 +0200 +Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 + +Fix the following build failure with uclibc < 1.0.35 which is raised +since the addition of getrandom module in +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=682cc4e678aceff32dea2a84b6e5147bdf5a20a7: + +In file included from ./sys/random.h:40, + from getrandom.c:22: +/tmp/instance-0/output-1/per-package/tar/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name 'size_t' + 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) + | ^~~~~~ +/tmp/instance-0/output-1/per-package/tar/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? + 7 | #include + +++ |+#include + 8 | + +This patch is not upstreamable as it is only a workaround for +uclibc < 1.0.35, upstream uclibc has been patched with +https://github.com/wbx-github/uclibc-ng/commit/00972c02c2b6e0a95d5def4a71bdfb188e091782 + +Fixes: + - http://autobuild.buildroot.org/results/f40e09d621ab5ba66dd97138dec174acfb7fda2a + +Signed-off-by: Fabrice Fontaine +--- + gnu/getrandom.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gnu/getrandom.c b/gnu/getrandom.c +index 41212fb32..0ad3f9648 100644 +--- a/gnu/getrandom.c ++++ b/gnu/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +-- +2.30.2 + diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index c17a6b0771..29b59fb39e 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -12,7 +12,9 @@ TERMINOLOGY_LICENSE_FILES = COPYING TERMINOLOGY_CPE_ID_VENDOR = enlightenment TERMINOLOGY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) efl host-pkgconf -TERMINOLOGY_CONF_OPTS = -Dedje-cc=$(HOST_DIR)/bin/edje_cc +TERMINOLOGY_CONF_OPTS = \ + -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ + -Deet=$(HOST_DIR)/bin/eet ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) TERMINOLOGY_CONF_OPTS += -Dnls=true diff --git a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch index 8385c28972..26ed6fe819 100644 --- a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch +++ b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch @@ -9,7 +9,7 @@ and remove host paths when looking for openssl. [Vincent: - Adapt the patch to make it apply on the new version.] [Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10, - 0.3.4.8, 0.3.5.7, 0.4.4.5 & 0.4.5.6] + 0.3.4.8, 0.3.5.7, 0.4.4.5, 0.4.5.6 & 0.4.6.7] [Fabrice: fix detection of openssl functions in 0.3.5.8] Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls @@ -24,7 +24,7 @@ diff --git a/configure.ac b/configure.ac index 05e1392cf..580befa6b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1056,7 +1056,7 @@ AC_ARG_WITH(ssl-dir, +@@ -1074,7 +1074,7 @@ AC_ARG_WITH(ssl-dir, ]) AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) @@ -33,7 +33,7 @@ index 05e1392cf..580befa6b 100644 [#include char *getenv(const char *);], [struct ssl_cipher_st; -@@ -1086,7 +1086,7 @@ dnl Now check for particular openssl functions. +@@ -1104,7 +1104,7 @@ dnl Now check for particular openssl functions. save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" save_CPPFLAGS="$CPPFLAGS" @@ -46,7 +46,7 @@ diff --git a/src/test/include.am b/src/test/include.am index ecb768957..39a622e88 100644 --- a/src/test/include.am +++ b/src/test/include.am -@@ -404,8 +404,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) +@@ -399,8 +399,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_ntor_cl_LDADD = \ libtor.a \ $(rust_ldadd) \ @@ -57,7 +57,7 @@ index ecb768957..39a622e88 100644 @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ @TOR_TRACE_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ $(AM_CPPFLAGS) -@@ -414,8 +414,8 @@ +@@ -409,8 +409,8 @@ src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_hs_ntor_cl_LDADD = \ libtor.a \ diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 564e0e7ecb..72bdc4a2ee 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3423189ba455372021ed44e0be576d181f2908cbd9bdef202d9c11c950882e12 tor-0.4.6.6.tar.gz +sha256 ff665ce121b2952110bd98b9c8741b5593bf6c01ac09033ad848ed92c2510f9a tor-0.4.6.7.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 30ad34115f..54c8506f46 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.6.6 +TOR_VERSION = 0.4.6.7 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE diff --git a/package/tpm2-tools/0001-configure-make-build-gnu99.patch b/package/tpm2-tools/0001-configure-make-build-gnu99.patch new file mode 100644 index 0000000000..37ca6c5873 --- /dev/null +++ b/package/tpm2-tools/0001-configure-make-build-gnu99.patch @@ -0,0 +1,30 @@ +From 521c3cc506b18c5c84d86e1e90d1daee39849b0c Mon Sep 17 00:00:00 2001 +From: William Roberts +Date: Mon, 8 Feb 2021 11:57:28 -0600 +Subject: [PATCH] configure: make build gnu99 + +Signed-off-by: William Roberts + +[Retrieved from: +https://github.com/tpm2-software/tpm2-tools/commit/521c3cc506b18c5c84d86e1e90d1daee39849b0c +and updated to set gnu99 instead of c99 as done by +https://github.com/tpm2-software/tpm2-tools/commit/5d0267428e96989afce406d096994ec5091ee107] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index dc15b5595..25039a0d9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -287,6 +287,9 @@ AC_DEFUN([add_c_flag], [ + # -D_GNU_SOURCE is required for execvpe() in options.c + add_c_flag([-D_GNU_SOURCE], [AC_MSG_ERROR([Cannot enable -D_GNU_SOURCE])]) + ++# Enable gnu99 mode, since we use some of these features. ++add_c_flag([-std=gnu99], [AC_MSG_ERROR([Cannot enable -std=gnu99])]) ++ + # Best attempt compiler options that are on newer versions of GCC that + # we can't widely enforce without killing other peoples builds. + # Works with gcc only. Needs to be disabled on BSD and clang diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 981a89a737..41f5bcf201 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -11,6 +11,8 @@ TPM2_TOOLS_LICENSE_FILES = doc/LICENSE TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project TPM2_TOOLS_SELINUX_MODULES = tpm2 TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf util-linux +# We're patching configure.ac +TPM2_TOOLS_AUTORECONF = YES # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ec7e940791..3c872aedf5 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.13.1.tar.gz.sha256 -sha256 8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8 unbound-1.13.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.13.2.tar.gz.sha256 +sha256 0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83 unbound-1.13.2.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 140b7d278b..37456db416 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.13.1 +UNBOUND_VERSION = 1.13.2 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index 41f19dc1a0..ca6d52034b 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_USBGUARD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf depends on !BR2_STATIC_LIBS # libqb, protobuf depends on !BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_LIBQB select BR2_PACKAGE_LIBSODIUM if !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_LIBOPENSSL @@ -23,3 +24,7 @@ comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic lib || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +comment "usbguard needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch new file mode 100644 index 0000000000..f0fa89998f --- /dev/null +++ b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch @@ -0,0 +1,47 @@ +From 977171781f5d49e61b46c0241fb67cbb7d666498 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 22 Aug 2021 10:44:48 +0200 +Subject: [PATCH] Don't build po files if NLS is disabled + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ddugovic/uShare/pull/12] +--- + Makefile | 7 +++++-- + configure | 1 + + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index ebd8f91..6686cfd 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,10 +14,13 @@ EXTRADIST = AUTHORS \ + THANKS \ + TODO \ + +-SUBDIRS = po \ +- scripts \ ++SUBDIRS = scripts \ + src \ + ++ifeq ($(NLS),yes) ++SUBDIRS += po ++endif ++ + all: + for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir $@; \ +diff --git a/configure b/configure +index 4a3efe0..162a776 100755 +--- a/configure ++++ b/configure +@@ -723,6 +723,7 @@ append_config "LDFLAGS=$LDFLAGS" + append_config "INSTALL=$INSTALL" + + append_config "DEBUG=$debug" ++append_config "NLS=$nls" + + + echolog "Creating $CONFIG_H ..." +-- +2.32.0 + diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk index a4c9711600..df9da223ec 100644 --- a/package/ushare/ushare.mk +++ b/package/ushare/ushare.mk @@ -18,7 +18,12 @@ USHARE_CONF_OPTS = \ --sysconfdir=/etc \ --disable-strip -ifeq ($(BR2_SYSTEM_ENABLE_NLS),) +USHARE_MAKE_OPTS = LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +USHARE_CONF_OPTS += --enable-nls +USHARE_MAKE_OPTS += GMSGFMT="$(HOST_DIR)/bin/msgfmt" +else USHARE_CONF_OPTS += --disable-nls endif @@ -31,7 +36,7 @@ define USHARE_CONFIGURE_CMDS endef define USHARE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(USHARE_MAKE_OPTS) -C $(@D) endef define USHARE_INSTALL_TARGET_CMDS diff --git a/package/xen/0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch b/package/xen/0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch new file mode 100644 index 0000000000..170d1c22c2 --- /dev/null +++ b/package/xen/0002-libs-foreignmemory-Fix-osdep_xenforeignmemory_map-prototype.patch @@ -0,0 +1,33 @@ +From 5d3e4ebb5c71477d74a0c503438545a0126d3863 Mon Sep 17 00:00:00 2001 +From: Anthony PERARD +Date: Tue, 1 Jun 2021 16:41:47 +0100 +Subject: [PATCH] libs/foreignmemory: Fix osdep_xenforeignmemory_map prototype + +Commit cf8c4d3d13b8 made some preparation to have one day +variable-length-array argument, but didn't declare the array in the +function prototype the same way as in the function definition. And now +GCC 11 complains about it. + +Fixes: cf8c4d3d13b8 ("tools/libs/foreignmemory: pull array length argument to map forward") +Signed-off-by: Anthony PERARD +Reviewed-by: Jan Beulich +[Retrieved from: +https://github.com/xen-project/xen/commit/5d3e4ebb5c71477d74a0c503438545a0126d3863] +Signed-off-by: Fabrice Fontaine +--- + tools/libs/foreignmemory/private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/libs/foreignmemory/private.h b/tools/libs/foreignmemory/private.h +index 1ee3626dd278..5bb0cefb0987 100644 +--- a/tools/libs/foreignmemory/private.h ++++ b/tools/libs/foreignmemory/private.h +@@ -32,7 +32,7 @@ int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem); + void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, + uint32_t dom, void *addr, + int prot, int flags, size_t num, +- const xen_pfn_t arr[num], int err[num]); ++ const xen_pfn_t arr[/*num*/], int err[/*num*/]); + int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, + void *addr, size_t num); + diff --git a/package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch b/package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch new file mode 100644 index 0000000000..0a817503b6 --- /dev/null +++ b/package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch @@ -0,0 +1,94 @@ +From 702697cafcec735e55f075594a2990204c8ea17d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 10 Aug 2021 18:01:48 +0200 +Subject: [PATCH] Add --disable-{demo,testsuite} options +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Allow the user to disable demo and testsuite to avoid the following +build failures on arc and riscv32: + +latency.c: In function 'display': +latency.c:326:21: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'time_t' {aka 'long long int'} [-Werror=format=] + 326 | ("RTT| %.2ld:%.2ld:%.2ld (%s, %Ld us period, " + | ~~~~^ + | | + | long int + | %.2lld + 327 | "priority %d)\n", dt / 3600, + | ~~~~~~~~~ + | | + | time_t {aka long long int} + +altency.c: In function ‘display’: +altency.c:262:21: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘time_t’ {aka ‘long long int’} [-Werror=format=] + 262 | ("RTT| %.2ld:%.2ld:%.2ld (%s, %Ld us period, " + | ~~~~^ + | | + | long int + | %.2lld + 263 | "priority %d)\n", dt / 3600, + | ~~~~~~~~~ + | | + | time_t {aka long long int} + +Fixes: + - http://autobuild.buildroot.org/results/448efe22e8fe058a1b354a3c124874e30b9ce138 + +Signed-off-by: Fabrice Fontaine +--- + Makefile.am | 12 ++++++++++-- + configure.ac | 12 ++++++++++++ + 2 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 891e53f66..604644277 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,9 +6,17 @@ SUBDIRS = \ + config \ + include \ + scripts \ +- testsuite \ +- utils \ ++ utils ++ ++if XENO_ENABLE_DEMO ++SUBDIRS += \ + demo ++endif ++ ++if XENO_ENABLE_TESTSUITE ++SUBDIRS += \ ++ testsuite ++endif + + EXTRA_DIST = kernel debian + +diff --git a/configure.ac b/configure.ac +index bd5fd5ba9..29dfd16e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -200,6 +200,18 @@ test \! x$debug_mode = x && AC_DEFINE(CONFIG_XENO_DEBUG,1,[config]) + AM_CONDITIONAL(XENO_DEBUG_FULL,[test x$debug_mode = xfull]) + test x$debug_mode = xfull && AC_DEFINE(CONFIG_XENO_DEBUG_FULL,1,[config]) + ++dnl Demo (default: on) ++ ++AC_ARG_ENABLE(demo, ++ AS_HELP_STRING([--disable-demo], [Disable demo])) ++AM_CONDITIONAL(XENO_ENABLE_DEMO,[test x$enable_demo != xno]) ++ ++dnl Testsuite (default: on) ++ ++AC_ARG_ENABLE(testsuite, ++ AS_HELP_STRING([--disable-testsuite], [Disable testsuite])) ++AM_CONDITIONAL(XENO_ENABLE_TESTSUITE,[test x$enable_testsuite != xno]) ++ + dnl Low resolution clock (default: off) + + unset lores_clock +-- +2.30.2 + diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index 7e3b130085..c1ad0c5df6 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -16,6 +16,8 @@ else XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable endif +# We're patching configure.ac +XENOMAI_AUTORECONF = YES # Exclude all from the hash check, but the latest version. ifeq ($(BR2_PACKAGE_XENOMAI)$(BR2_PACKAGE_XENOMAI_LATEST_VERSION),y) @@ -37,7 +39,10 @@ XENOMAI_INSTALL_STAGING = YES XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user -XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ +XENOMAI_CONF_OPTS += \ + --disable-demo \ + --disable-testsuite \ + --includedir=/usr/include/xenomai/ ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y) XENOMAI_CONF_OPTS += --with-core=mercury diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 84803ed250..89726c5f8b 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.05' +RELEASE='2021.05.1' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/testing/tests/init/base.py b/support/testing/tests/init/base.py index 6a85b87783..7f12186b73 100644 --- a/support/testing/tests/init/base.py +++ b/support/testing/tests/init/base.py @@ -42,4 +42,5 @@ class InitSystemBase(infra.basetest.BRTest): def check_network(self, interface, exitCode=0): cmd = "ip addr show {} |grep inet".format(interface) - self.assertRunOk(cmd) + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, exitCode) diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index 142ac95d03..35e659a74d 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -16,7 +16,7 @@ class TestDockerCompose(infra.basetest.BRTest): BR2_ROOTFS_POST_SCRIPT_ARGS="{}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" BR2_PACKAGE_CA_CERTIFICATES=y diff --git a/support/testing/tests/package/test_python_cryptography.py b/support/testing/tests/package/test_python_cryptography.py index 14515fcd2d..62f0ca0def 100644 --- a/support/testing/tests/package/test_python_cryptography.py +++ b/support/testing/tests/package/test_python_cryptography.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Cryptography(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y - """ - sample_scripts = ["tests/package/sample_python_cryptography.py"] - timeout = 40 - - class TestPythonPy3Cryptography(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_service_identity.py b/support/testing/tests/package/test_python_service_identity.py index 6aeb77de8c..09cfbe0a26 100644 --- a/support/testing/tests/package/test_python_service_identity.py +++ b/support/testing/tests/package/test_python_service_identity.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2ServiceIdentity(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y - """ - sample_scripts = ["tests/package/sample_python_service_identity.py"] - timeout = 30 - - class TestPythonPy3ServiceIdentity(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/support/testing/tests/package/test_python_treq.py b/support/testing/tests/package/test_python_treq.py index e24ae845be..d7a23829ea 100644 --- a/support/testing/tests/package/test_python_treq.py +++ b/support/testing/tests/package/test_python_treq.py @@ -12,15 +12,6 @@ class TestPythonTreq(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Treq(TestPythonTreq): - __test__ = True - config = TestPythonTreq.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TREQ=y - """ - - class TestPythonPy3Treq(TestPythonTreq): __test__ = True config = TestPythonTreq.config + \ diff --git a/support/testing/tests/package/test_python_twisted.py b/support/testing/tests/package/test_python_twisted.py index a458ee45dd..e87312db13 100644 --- a/support/testing/tests/package/test_python_twisted.py +++ b/support/testing/tests/package/test_python_twisted.py @@ -21,15 +21,6 @@ class TestPythonTwisted(TestPythonPackageBase): self.assertEqual(exit_code, 0) -class TestPythonPy2Twisted(TestPythonTwisted): - __test__ = True - config = TestPythonTwisted.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TWISTED=y - """ - - class TestPythonPy3Twisted(TestPythonTwisted): __test__ = True config = TestPythonTwisted.config + \ diff --git a/support/testing/tests/package/test_python_txtorcon.py b/support/testing/tests/package/test_python_txtorcon.py index 1ac2f6919a..8e74190ee1 100644 --- a/support/testing/tests/package/test_python_txtorcon.py +++ b/support/testing/tests/package/test_python_txtorcon.py @@ -1,17 +1,6 @@ from tests.package.test_python import TestPythonPackageBase -class TestPythonPy2Txtorcon(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON=y - BR2_PACKAGE_PYTHON_TXTORCON=y - """ - sample_scripts = ["tests/package/sample_python_txtorcon.py"] - timeout = 30 - - class TestPythonPy3Txtorcon(TestPythonPackageBase): __test__ = True config = TestPythonPackageBase.config + \ diff --git a/toolchain/Config.in b/toolchain/Config.in index d5f1176178..c0cfd1a548 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -171,10 +171,13 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410 # Error: branch offset out of range on Nios II. This bug -# no longer exists in gcc >= 8.x. +# no longer exists in gcc 8.x but reappeared on gcc 9.x and has been +# fixed on gcc 10.x. config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 bool - default y if BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 # ICE: SH4 -Os causes internal compiler error. This bug @@ -183,6 +186,27 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_101737 bool default y if BR2_sh4 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101952 +# ICE: on SH4: unaligned opcodes detected in executable segment. +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_101952 + bool + default y if BR2_sh4 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101915 +# ICE: in extract_insn, at recog.c:2294 on microblaze. +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_101915 + bool + default y if BR2_microblaze + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101916 +# ICE: on SH4: Segmentation fault signal terminated program cc1. +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_101916 + bool + default y if BR2_sh4 + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool